Diff of the two buildlogs:

--
--- b1/build.log	2025-01-30 02:02:17.127630286 +0000
+++ b2/build.log	2025-01-30 02:31:20.532937165 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Tue Mar  3 19:52:02 -12 2026
-I: pbuilder-time-stamp: 1772610722
+I: Current time: Thu Jan 30 16:02:39 +14 2025
+I: pbuilder-time-stamp: 1738202559
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz]
 I: copying local configuration
@@ -22,52 +22,84 @@
 dpkg-source: info: unpacking git_2.47.2-0.1.debian.tar.xz
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/256515/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/1572123/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink04-arm64.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Jan 30 02:02 /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/1572123/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/1572123/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='trixie'
-  HOME='/root'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=trixie
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  INVOCATION_ID='525365a1868c4421ac66cc3abf3d998b'
-  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='256515'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=66c773452c6d4e59a1fa67c3051aa348
+  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=1572123
   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.cWXiwyrc/pbuilderrc_JZS1 --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.cWXiwyrc/b1 --logfile b1/build.log git_2.47.2-0.1.dsc'
-  SUDO_GID='109'
-  SUDO_UID='104'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://192.168.101.4:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.cWXiwyrc/pbuilderrc_PQ3Y --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.cWXiwyrc/b2 --logfile b2/build.log git_2.47.2-0.1.dsc'
+  SUDO_GID=109
+  SUDO_UID=104
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://192.168.101.4:3128
 I: uname -a
-  Linux codethink03-arm64 6.1.0-30-cloud-arm64 #1 SMP Debian 6.1.124-1 (2025-01-12) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-30-cloud-arm64 #1 SMP Debian 6.1.124-1 (2025-01-12) aarch64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Nov 22  2024 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/256515/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/1572123/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: 154 http://deb.debian.org/debian trixie/main arm64 tcl arm64 8.6.14 [4032 B]
 Get: 155 http://deb.debian.org/debian trixie/main arm64 unzip arm64 6.0-28+b1 [158 kB]
 Get: 156 http://deb.debian.org/debian trixie/main arm64 xmlto arm64 0.0.28-3.1 [26.9 kB]
-Fetched 60.1 MB in 0s (126 MB/s)
+Fetched 60.1 MB in 1s (113 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package libpython3.13-minimal:arm64.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19964 files and directories currently installed.)
@@ -822,8 +854,8 @@
 Setting up tzdata (2024b-6) ...
 
 Current default time zone: 'Etc/UTC'
-Local time is now:      Wed Mar  4 07:52:42 UTC 2026.
-Universal Time is now:  Wed Mar  4 07:52:42 UTC 2026.
+Local time is now:      Thu Jan 30 02:03:36 UTC 2025.
+Universal Time is now:  Thu Jan 30 02:03:36 UTC 2025.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 Setting up liberror-perl (0.17029-2) ...
@@ -970,7 +1002,11 @@
 fakeroot is already the newest version (1.37-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.47.2/ && 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.47.2-0.1_source.changes
+I: user script /srv/workspace/pbuilder/1572123/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for trixie
+I: user script /srv/workspace/pbuilder/1572123/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/git-2.47.2/ && 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.47.2-0.1_source.changes
 dpkg-buildpackage: info: source package git
 dpkg-buildpackage: info: source version 1:2.47.2-0.1
 dpkg-buildpackage: info: source distribution unstable
@@ -1002,9 +1038,6 @@
 rm -f /build/reproducible-path/git-2.47.2/./*.gcno /build/reproducible-path/git-2.47.2/builtin/*.gcno /build/reproducible-path/git-2.47.2/compat/*.gcno /build/reproducible-path/git-2.47.2/compat/linux/*.gcno /build/reproducible-path/git-2.47.2/compat/simple-ipc/*.gcno /build/reproducible-path/git-2.47.2/ewah/*.gcno /build/reproducible-path/git-2.47.2/negotiator/*.gcno /build/reproducible-path/git-2.47.2/oss-fuzz/*.gcno /build/reproducible-path/git-2.47.2/refs/*.gcno /build/reproducible-path/git-2.47.2/reftable/*.gcno /build/reproducible-path/git-2.47.2/sha1dc/*.gcno /build/reproducible-path/git-2.47.2/sha256/block/*.gcno /build/reproducible-path/git-2.47.2/t/helper/*.gcno /build/reproducible-path/git-2.47.2/t/unit-tests/*.gcno /build/reproducible-path/git-2.47.2/t/unit-tests/clar/*.gcno /build/reproducible-path/git-2.47.2/trace2/*.gcno /build/reproducible-path/git-2.47.2/xdiff/*.gcno
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f GIT-SPATCH-DEFINES
 rm -f -r .build/contrib/coccinelle
 rm -f contrib/coccinelle/*.cocci.patch
@@ -1018,6 +1051,9 @@
 rm -f coverage-test.made
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f ./*.gcno builtin/*.gcno compat/*.gcno compat/linux/*.gcno compat/simple-ipc/*.gcno ewah/*.gcno negotiator/*.gcno oss-fuzz/*.gcno refs/*.gcno reftable/*.gcno sha1dc/*.gcno sha256/block/*.gcno t/helper/*.gcno t/unit-tests/*.gcno t/unit-tests/clar/*.gcno trace2/*.gcno xdiff/*.gcno
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
@@ -1124,148 +1160,145 @@
     * new link flags
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  common-main.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
     * new prefix flags
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  alias.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  common-main.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  alloc.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  advice.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  base85.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  base85.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  advice.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  blob.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  alias.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  abspath.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive-tar.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  blob.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bulk-checkin.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive-tar.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  add-interactive.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive-zip.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bloom.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bulk-checkin.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bloom.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  branch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bundle-uri.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive-zip.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bisect.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  checkout.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  chdir-notify.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  cbtree.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  add-interactive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bundle.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  cbtree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  checkout.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bisect.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  branch.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bundle-uri.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  chunk-format.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/nonblock.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  color.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/obstack.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bundle.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o compat/zlib-uncompress2.o -c -MF compat/.depend/zlib-uncompress2.o.d -MQ compat/zlib-uncompress2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/zlib-uncompress2.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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/nonblock.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  column.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/obstack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/terminal.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  column.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  cache-tree.c
+gcc -o compat/zlib-uncompress2.o -c -MF compat/.depend/zlib-uncompress2.o.d -MQ compat/zlib-uncompress2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/zlib-uncompress2.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  copy.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/terminal.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  connected.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  blame.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  cache-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit-reach.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  copy.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  add-patch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+gcc -o csum-file.o -c -MF ./.depend/csum-file.o.d -MQ csum-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  csum-file.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ctype.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o csum-file.o -c -MF ./.depend/csum-file.o.d -MQ csum-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  csum-file.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  blame.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  connect.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit-reach.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  decorate.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  credential.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  connect.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-merges.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  credential.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-delta.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diagnose.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  combine-diff.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-merges.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-delta.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  date.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  convert.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-break.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  combine-diff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-lib.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  delta-islands.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  convert.c
+gcc -o diffcore-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-pickaxe.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-no-index.c
@@ -1274,25 +1307,28 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-delta.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  delta-islands.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-break.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-order.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-rotate.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  date.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-pickaxe.c
+gcc -o diff-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-lib.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  dir-iterator.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-rotate.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  editor.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit-graph.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  dir-iterator.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/bitmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  environment.c
@@ -1301,34 +1337,34 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_io.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_rlw.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  entry.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_EXEC_PATH="/usr/lib/git-core"' '-DGIT_LOCALE_PATH="share/locale"' '-DBINDIR="bin"' '-DFALLBACK_RUNTIME_PREFIX="/usr"' exec-cmd.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fetch-negotiator.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fetch-negotiator.c
+gcc -o ewah/ewah_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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_rlw.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_bitmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/bitmap.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_EXEC_PATH="/usr/lib/git-core"' '-DGIT_LOCALE_PATH="share/locale"' '-DBINDIR="bin"' '-DFALLBACK_RUNTIME_PREFIX="/usr"' exec-cmd.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  entry.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor-ipc.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor-settings.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit-graph.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor-ipc.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DGIT_LOCALE_PATH='"share/locale"' gettext.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DGIT_LOCALE_PATH='"share/locale"' gettext.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor-settings.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DETC_GITCONFIG='"/etc/gitconfig"' config.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fmt-merge-msg.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  git-zlib.c
@@ -1337,7 +1373,7 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hash-lookup.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DETC_GITCONFIG='"/etc/gitconfig"' config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 /bin/sh ./generate-cmdlist.sh \
@@ -1345,58 +1381,58 @@
 	command-list.txt >command-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  apply.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hash-lookup.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  gpg-interface.c
+gcc -o hashmap.o -c -MF ./.depend/hashmap.o.d -MQ hashmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hashmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-rename.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hex-ll.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hashmap.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hex.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hex-ll.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-rename.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hex.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  gpg-interface.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hook.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsck.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  levenshtein.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fmt-merge-msg.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  json-writer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  levenshtein.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsck.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  graph.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  grep.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ident.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  line-range.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  graph.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  linear-assignment.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  line-range.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  json-writer.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  linear-assignment.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  grep.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  apply.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects-filter-options.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects-filter.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  lockfile.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects.c
@@ -1405,52 +1441,52 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ls-refs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  lockfile.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  loose.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  loose.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects-filter.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fetch-pack.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  dir.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mailmap.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  line-log.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-blobs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  match-trees.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mem-pool.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  dir.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mailmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  line-log.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  match-trees.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mem-pool.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ort-wrappers.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ort-wrappers.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  kwset.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fetch-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  log-tree.c
+gcc -o merge.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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/default.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  kwset.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ll.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/noop.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  log-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ll.c
+gcc -o negotiator/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/noop.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-cache.c
@@ -1462,150 +1498,144 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  name-hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mailinfo.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-utils.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-file-convert.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oid-array.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mailinfo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-merge.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  midx.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidmap.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oid-array.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  midx.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-merge.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o oidtree.o -c -MF ./.depend/oidtree.o.d -MQ oidtree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidtree.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidset.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object.c
+gcc -o oidtree.o -c -MF ./.depend/oidtree.o.d -MQ oidtree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidtree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-mtimes.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-check.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  midx-write.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-check.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidset.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-name.c
+gcc -o pack-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-mtimes.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-objects.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  midx-write.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-bitmap-write.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-revindex.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DPAGER_ENV='"LESS=FRX LV=-c"' pager.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-revindex.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-write.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-write.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse-options-cb.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  patch-ids.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-bitmap-write.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  patch-delta.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-name.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse-options-cb.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parallel-checkout.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parallel-checkout.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  patch-ids.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-file.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  patch-delta.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  preload-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o merge-recursive.o -c -MF ./.depend/merge-recursive.o.d -MQ merge-recursive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-recursive.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-file.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prio-queue.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pathspec.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pkt-line.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  progress.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse-options.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  promisor-remote.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pathspec.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  packfile.c
+gcc -o merge-recursive.o -c -MF ./.depend/merge-recursive.o.d -MQ merge-recursive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-recursive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prompt.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  promisor-remote.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  protocol.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  packfile.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse-options.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  progress.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prune-packed.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prompt.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  protocol-caps.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  path.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rebase-interactive.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prune-packed.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rebase.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  protocol.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reachable.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ort.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-bitmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ort.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rebase.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pseudo-merge.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reachable.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reflog-walk.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rebase-interactive.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  quote.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
@@ -1615,7 +1645,7 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/debug.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  range-diff.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/iterator.c
@@ -1624,6 +1654,15 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pretty.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  range-diff.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pseudo-merge.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refspec.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  replace-object.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
@@ -1633,10 +1672,10 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  repo-settings.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refspec.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reset.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reset.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  resolve-undo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  repository.c
@@ -1645,64 +1684,64 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/packed-backend.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  resolve-undo.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  serve.c
+gcc -o rerere.o -c -MF ./.depend/rerere.o.d -MQ rerere.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rerere.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  send-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rerere.c
+gcc -o serve.o -c -MF ./.depend/serve.o.d -MQ serve.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  serve.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/reftable-backend.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  server-info.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sideband.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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/files-backend.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sigchain.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  run-command.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sideband.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  server-info.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/files-backend.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  stable-qsort.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  stable-qsort.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  statinfo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  read-cache.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  split-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  statinfo.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ref-filter.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  split-index.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  remote.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sparse-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ref-filter.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  run-command.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  streaming.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  remote.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  read-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strmap.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  string-list.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strvec.c
@@ -1714,124 +1753,124 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sub-process.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  string-list.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  thread-utils.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  thread-utils.c
+gcc -o tag.o -c -MF ./.depend/tag.o.d -MQ tag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tag.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  symlinks.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tmp-objdir.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tempfile.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o tag.o -c -MF ./.depend/tag.o.d -MQ tag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tag.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DDEFAULT_GIT_TEMPLATE_DIR='"share/git-core/templates"' setup.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tempfile.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tmp-objdir.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace.c
+gcc -o trace2/tr2_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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_cmd_name.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_ctr.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_cfg.c
+gcc -o trace2/tr2_dst.o -c -MF trace2/.depend/tr2_dst.o.d -MQ trace2/tr2_dst.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_dst.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_cmd_name.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strbuf.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strbuf.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_cfg.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  submodule-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sysenv.c
+gcc -o trace2/tr2_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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sid.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tbuf.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sid.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DDEFAULT_GIT_TEMPLATE_DIR='"share/git-core/templates"' setup.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2.c
+gcc -o trace2/tr2_sysenv.o -c -MF trace2/.depend/tr2_sysenv.o.d -MQ trace2/tr2_sysenv.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sysenv.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  revision.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_normal.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_event.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tmr.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_dst.c
+gcc -o trace2/tr2_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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tls.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tls.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_event.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tmr.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_normal.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_perf.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree-diff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree-walk.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  submodule.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  url.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree-diff.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  transport-helper.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  submodule.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trailer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  userdiff.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  revision.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  varint.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  versioncmp.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  transport.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  usage.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  userdiff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trailer.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  usage.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  transport-helper.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree-walk.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  walker.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  versioncmp.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  urlmatch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wildmatch.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  write-or-die.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wildmatch.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unix-socket.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  transport.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  walker.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  utf8.c
@@ -1840,13 +1879,13 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unix-stream-server.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  upload-pack.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-shared.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-shared.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc_git.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unix-socket.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ws.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wrapper.c
@@ -1855,31 +1894,28 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff-interface.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  worktree.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unpack-trees.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc_git.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  upload-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/linux/procinfo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ws.c
+gcc -o compat/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/fopen.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/strlcpy.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/fopen.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-unix-socket.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/qsort_s.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-unix-socket.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc/ubc_check.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  worktree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xemit.c
@@ -1888,22 +1924,25 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xhistogram.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc/ubc_check.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xpatience.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/error.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/basics.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xprepare.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xmerge.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xprepare.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/basics.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unpack-trees.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha256/block/sha256.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/blocksource.c
@@ -1912,84 +1951,78 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xutils.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xdiffi.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha256/block/sha256.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc -o reftable/publicbasics.o -c -MF reftable/.depend/publicbasics.o.d -MQ reftable/publicbasics.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/publicbasics.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/block.c
+gcc -o reftable/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/pq.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/iter.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc/sha1.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/merged.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/pq.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xdiffi.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sh-i18n--envsubst.c
+gcc -o reftable/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/block.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  shell.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc/sha1.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/writer.c
+gcc -o reftable/reader.o -c -MF reftable/.depend/reader.o.d -MQ reftable/reader.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/reader.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o reftable/reader.o -c -MF reftable/.depend/reader.o.d -MQ reftable/reader.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/reader.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  shell.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-    * new script parameters
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sh-i18n--envsubst.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-    * new perl-specific parameters
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-backend.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-walker.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/writer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/record.c
+    * new perl-specific parameters
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-backend.c
+    * new script parameters
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
     * new Python interpreter location
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-instaweb.sh >git-instaweb+ && \
+chmod +x git-instaweb+ && \
+mv git-instaweb+ git-instaweb
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-fetch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/stack.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wt-status.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-instaweb.sh >git-instaweb+ && \
-chmod +x git-instaweb+ && \
-mv git-instaweb+ git-instaweb
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/record.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  imap-send.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wt-status.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/annotate.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/annotate.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-walker.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/archive.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/stack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/apply.c
@@ -1998,13 +2031,13 @@
 /bin/sh ./generate-hooklist.sh >hook-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bundle.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/archive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/add.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' git.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bundle.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-push.c
@@ -2013,24 +2046,30 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-attr.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-ignore.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-mailmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sequencer.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' git.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-ignore.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-ref-format.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout--worker.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-ref-format.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bisect.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/cat-file.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/blame.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
@@ -2040,88 +2079,85 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/column.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout-index.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit-tree.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/branch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit-graph.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/cat-file.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/branch.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/count-objects.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential-cache--daemon.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/count-objects.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential-store.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential-cache--daemon.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-files.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diagnose.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-files.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clean.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clean.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/am.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-tree.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clone.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clone.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/describe.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sequencer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fmt-merge-msg.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/for-each-repo.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/describe.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch-pack.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fsmonitor--daemon.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/for-each-ref.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/am.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/for-each-repo.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 /bin/sh ./generate-configlist.sh >config-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/config.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fsmonitor--daemon.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/get-tar-commit-id.c
@@ -2130,10 +2166,13 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/difftool.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/hook.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/hash-object.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/hook.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-export.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/interpret-trailers.c
@@ -2142,7 +2181,7 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/init-db.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-export.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-remote.c
@@ -2151,73 +2190,70 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mailinfo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fsck.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-tree.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-base.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mailsplit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-base.c
+gcc -o builtin/merge-index.o -c -MF builtin/.depend/merge-index.o.d -MQ builtin/merge-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-file.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-files.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-index.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-ours.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-recursive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/grep.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-files.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mktag.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mktree.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/multi-pack-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mktree.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/gc.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/grep.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/index-pack.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-refs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-tree.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/gc.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mv.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/name-rev.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune-packed.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-refs.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/name-rev.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/patch-id.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune-packed.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/index-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/range-diff.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune.c
@@ -2226,49 +2262,43 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/notes.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/log.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/range-diff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/read-tree.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-redundant.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote-fd.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/read-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/refs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/log.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pull.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote-fd.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/push.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/reflog.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote-ext.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-redundant.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rerere.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/reflog.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/replace.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-import.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/reset.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pull.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-import.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rerere.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/revert.c
@@ -2277,80 +2307,80 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/replay.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/send-pack.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/reset.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rm.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/replace.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rev-list.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rm.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/shortlog.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rev-list.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/stripspace.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/send-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-ref.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/shortlog.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/stripspace.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/symbolic-ref.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rebase.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/unpack-file.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rev-parse.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-branch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/unpack-file.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-branch.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/sparse-checkout.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/receive-pack.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rev-parse.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/repack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/upload-archive.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/receive-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/sparse-checkout.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-server-info.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-server-info.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/upload-archive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/upload-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/var.c
+gcc -o builtin/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rebase.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/verify-commit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-mergetool--lib.sh >git-mergetool--lib+ && \
-mv git-mergetool--lib+ git-mergetool--lib
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/verify-tag.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/verify-pack.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/var.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/stash.c
+sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-mergetool--lib.sh >git-mergetool--lib+ && \
+mv git-mergetool--lib+ git-mergetool--lib
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-sh-i18n.sh >git-sh-i18n+ && \
@@ -2361,12 +2391,18 @@
 mv git-sh-setup+ git-sh-setup
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/verify-pack.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/write-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/unpack-objects.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-ref.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
@@ -2378,17 +2414,11 @@
 mv git-difftool--helper+ git-difftool--helper
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/tag.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-filter-branch.sh >git-filter-branch+ && \
 chmod +x git-filter-branch+ && \
 mv git-filter-branch+ git-filter-branch
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_VERSION="2.47.2"' '-DGIT_USER_AGENT="git/2.47.2"' '-DGIT_BUILT_FROM_COMMIT=""' version.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-merge-octopus.sh >git-merge-octopus+ && \
 chmod +x git-merge-octopus+ && \
 mv git-merge-octopus+ git-merge-octopus
@@ -2404,6 +2434,9 @@
 mv git-merge-resolve+ git-merge-resolve
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_VERSION="2.47.2"' '-DGIT_USER_AGENT="git/2.47.2"' '-DGIT_BUILT_FROM_COMMIT=""' version.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-mergetool.sh >git-mergetool+ && \
 chmod +x git-mergetool+ && \
 mv git-mergetool+ git-mergetool
@@ -2414,16 +2447,17 @@
 mv git-quiltimport+ git-quiltimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-web--browse.sh >git-web--browse+ && \
-chmod +x git-web--browse+ && \
-mv git-web--browse+ git-web--browse
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-request-pull.sh >git-request-pull+ && \
 chmod +x git-request-pull+ && \
 mv git-request-pull+ git-request-pull
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/tag.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-index.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-submodule.sh >git-submodule+ && \
 chmod +x git-submodule+ && \
 mv git-submodule+ git-submodule
@@ -2442,6 +2476,11 @@
 mv GIT-PERL-HEADER+ GIT-PERL-HEADER
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-web--browse.sh >git-web--browse+ && \
+chmod +x git-web--browse+ && \
+mv git-web--browse+ git-web--browse
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 \
 sed -e '1s|#!.*python|#!/usr/bin/python3|' \
     git-p4.py >git-p4+ && \
@@ -2449,9 +2488,6 @@
 mv git-p4+ git-p4
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-ref.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
@@ -2471,9 +2507,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.47.2/g' \
-    git-cvsexportcommit.perl >git-cvsexportcommit+ && \
-chmod +x git-cvsexportcommit+ && \
-mv git-cvsexportcommit+ git-cvsexportcommit
+    git-cvsimport.perl >git-cvsimport+ && \
+chmod +x git-cvsimport+ && \
+mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 \
@@ -2483,9 +2519,12 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.47.2/g' \
-    git-cvsimport.perl >git-cvsimport+ && \
-chmod +x git-cvsimport+ && \
-mv git-cvsimport+ git-cvsimport
+    git-cvsexportcommit.perl >git-cvsexportcommit+ && \
+chmod +x git-cvsexportcommit+ && \
+mv git-cvsexportcommit+ git-cvsexportcommit
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/stash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 \
@@ -2527,66 +2566,63 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bugreport.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DETC_GITATTRIBUTES='"/etc/gitattributes"' attr.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  scalar.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/worktree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' builtin/help.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DETC_GITATTRIBUTES='"/etc/gitattributes"' attr.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  help.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-objects.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  daemon.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' builtin/help.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-index.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  help.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  scalar.c
+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 compat/nonblock.o compat/obstack.o compat/terminal.o compat/zlib-uncompress2.o config.o connect.o connected.o convert.o copy.o credential.o csum-file.o ctype.o date.o decorate.o delta-islands.o diagnose.o diff-delta.o diff-merges.o diff-lib.o diff-no-index.o diff.o diffcore-break.o diffcore-delta.o diffcore-order.o diffcore-pickaxe.o diffcore-rename.o diffcore-rotate.o dir-iterator.o dir.o editor.o entry.o environment.o ewah/bitmap.o ewah/ewah_bitmap.o ewah/ewah_io.o ewah/ewah_rlw.o exec-cmd.o fetch-negotiator.o fetch-pack.o fmt-merge-msg.o fsck.o fsmonitor.o fsmonitor-ipc.o fsmonitor-settings.o gettext.o git-zlib.o gpg-interface.o graph.o grep.o hash-lookup.o hashmap.o help.o hex.o hex-ll.o hook.o ident.o json-writer.o kwset.o levenshtein.o line-log.o line-range.o linear-assignment.o list-objects-filter-options.o list-objects-filter.o list-objects.o lockfile.o log-tree.o loose.o ls-refs.o mailinfo.o mailmap.o match-trees.o mem-pool.o merge-blobs.o merge-ll.o merge-ort.o merge-ort-wrappers.o merge-recursive.o merge.o midx.o midx-write.o name-hash.o negotiator/default.o negotiator/noop.o negotiator/skipping.o notes-cache.o notes-merge.o notes-utils.o notes.o object-file-convert.o object-file.o object-name.o object.o oid-array.o oidmap.o oidset.o oidtree.o pack-bitmap-write.o pack-bitmap.o pack-check.o pack-mtimes.o pack-objects.o pack-revindex.o pack-write.o packfile.o pager.o parallel-checkout.o parse.o parse-options-cb.o parse-options.o patch-delta.o patch-ids.o path.o 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.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-objects.c
+gcc -o 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  daemon.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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 compat/nonblock.o compat/obstack.o compat/terminal.o compat/zlib-uncompress2.o config.o connect.o connected.o convert.o copy.o credential.o csum-file.o ctype.o date.o decorate.o delta-islands.o diagnose.o diff-delta.o diff-merges.o diff-lib.o diff-no-index.o diff.o diffcore-break.o diffcore-delta.o diffcore-order.o diffcore-pickaxe.o diffcore-rename.o diffcore-rotate.o dir-iterator.o dir.o editor.o entry.o environment.o ewah/bitmap.o ewah/ewah_bitmap.o ewah/ewah_io.o ewah/ewah_rlw.o exec-cmd.o fetch-negotiator.o fetch-pack.o fmt-merge-msg.o fsck.o fsmonitor.o fsmonitor-ipc.o fsmonitor-settings.o gettext.o git-zlib.o gpg-interface.o graph.o grep.o hash-lookup.o hashmap.o help.o hex.o hex-ll.o hook.o ident.o json-writer.o kwset.o levenshtein.o line-log.o line-range.o linear-assignment.o list-objects-filter-options.o list-objects-filter.o list-objects.o lockfile.o log-tree.o loose.o ls-refs.o mailinfo.o mailmap.o match-trees.o mem-pool.o merge-blobs.o merge-ll.o merge-ort.o merge-ort-wrappers.o merge-recursive.o merge.o midx.o midx-write.o name-hash.o negotiator/default.o negotiator/noop.o negotiator/skipping.o notes-cache.o notes-merge.o notes-utils.o notes.o object-file-convert.o object-file.o object-name.o object.o oid-array.o oidmap.o oidset.o oidtree.o pack-bitmap-write.o pack-bitmap.o pack-check.o pack-mtimes.o pack-objects.o pack-revindex.o pack-write.o packfile.o pager.o parallel-checkout.o parse.o parse-options-cb.o parse-options.o patch-delta.o patch-ids.o path.o pathspec.o pkt-line.o preload-index.o pretty.o prio-queue.o progress.o promisor-remote.o prompt.o protocol.o protocol-caps.o prune-packed.o pseudo-merge.o quote.o range-diff.o reachable.o read-cache.o rebase-interactive.o rebase.o ref-filter.o reflog-walk.o reflog.o refs.o refs/debug.o refs/files-backend.o refs/reftable-backend.o refs/iterator.o refs/packed-backend.o refs/ref-cache.o refspec.o remote.o replace-object.o repo-settings.o repository.o rerere.o reset.o resolve-undo.o revision.o run-command.o send-pack.o sequencer.o serve.o server-info.o setup.o shallow.o sideband.o sigchain.o sparse-index.o split-index.o stable-qsort.o statinfo.o strbuf.o streaming.o string-list.o strmap.o strvec.o sub-process.o submodule-config.o submodule.o symlinks.o tag.o tempfile.o thread-utils.o tmp-objdir.o trace.o trace2.o trace2/tr2_cfg.o trace2/tr2_cmd_name.o trace2/tr2_ctr.o trace2/tr2_dst.o trace2/tr2_sid.o trace2/tr2_sysenv.o trace2/tr2_tbuf.o trace2/tr2_tgt_event.o trace2/tr2_tgt_normal.o trace2/tr2_tgt_perf.o trace2/tr2_tls.o trace2/tr2_tmr.o trailer.o transport-helper.o transport.o tree-diff.o tree-walk.o tree.o unpack-trees.o upload-pack.o url.o urlmatch.o usage.o userdiff.o utf8.o varint.o version.o versioncmp.o walker.o wildmatch.o worktree.o wrapper.o write-or-die.o ws.o wt-status.o xdiff-interface.o unix-socket.o unix-stream-server.o compat/simple-ipc/ipc-shared.o compat/simple-ipc/ipc-unix-socket.o sha1dc_git.o sha1dc/sha1.o sha1dc/ubc_check.o sha256/block/sha256.o compat/linux/procinfo.o compat/fopen.o compat/strlcpy.o compat/qsort_s.o
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-shell -Wl,-z,relro   shell.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-backend -Wl,-z,relro   http-backend.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-daemon -Wl,-z,relro   daemon.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o scalar -Wl,-z,relro   \
+	scalar.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-sh-i18n--envsubst -Wl,-z,relro   sh-i18n--envsubst.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-fetch -Wl,-z,relro   http.o http-walker.o http-fetch.o common-main.o \
+	-lcurl libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-imap-send -Wl,-z,relro   imap-send.o http.o common-main.o \
 	-lcurl    libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-shell -Wl,-z,relro   shell.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-daemon -Wl,-z,relro   daemon.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-push -Wl,-z,relro   http.o http-push.o common-main.o \
 	-lcurl -lexpat libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o scalar -Wl,-z,relro   \
-	scalar.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/submodule--helper.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-remote-http -Wl,-z,relro   remote-curl.o http.o http-walker.o common-main.o \
 	-lcurl -lexpat libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-fetch -Wl,-z,relro   http.o http-walker.o http-fetch.o common-main.o \
-	-lcurl libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc -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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/submodule--helper.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-remote-https && \
@@ -2611,18 +2647,18 @@
 	git.o builtin/add.o builtin/am.o builtin/annotate.o builtin/apply.o builtin/archive.o builtin/bisect.o builtin/blame.o builtin/branch.o builtin/bugreport.o builtin/bundle.o builtin/cat-file.o builtin/check-attr.o builtin/check-ignore.o builtin/check-mailmap.o builtin/check-ref-format.o builtin/checkout--worker.o builtin/checkout-index.o builtin/checkout.o builtin/clean.o builtin/clone.o builtin/column.o builtin/commit-graph.o builtin/commit-tree.o builtin/commit.o builtin/config.o builtin/count-objects.o builtin/credential-cache--daemon.o builtin/credential-cache.o builtin/credential-store.o builtin/credential.o builtin/describe.o builtin/diagnose.o builtin/diff-files.o builtin/diff-index.o builtin/diff-tree.o builtin/diff.o builtin/difftool.o builtin/fast-export.o builtin/fast-import.o builtin/fetch-pack.o builtin/fetch.o builtin/fmt-merge-msg.o builtin/for-each-ref.o builtin/for-each-repo.o builtin/fsck.o builtin/fsmonitor--daemon.o builtin/gc.o builtin/get-tar-commit-id.o builtin/grep.o builtin/hash-object.o builtin/help.o builtin/hook.o builtin/index-pack.o builtin/init-db.o builtin/interpret-trailers.o builtin/log.o builtin/ls-files.o builtin/ls-remote.o builtin/ls-tree.o builtin/mailinfo.o builtin/mailsplit.o builtin/merge-base.o builtin/merge-file.o builtin/merge-index.o builtin/merge-ours.o builtin/merge-recursive.o builtin/merge-tree.o builtin/merge.o builtin/mktag.o builtin/mktree.o builtin/multi-pack-index.o builtin/mv.o builtin/name-rev.o builtin/notes.o builtin/pack-objects.o builtin/pack-redundant.o builtin/pack-refs.o builtin/patch-id.o builtin/prune-packed.o builtin/prune.o builtin/pull.o builtin/push.o builtin/range-diff.o builtin/read-tree.o builtin/rebase.o builtin/receive-pack.o builtin/reflog.o builtin/refs.o builtin/remote-ext.o builtin/remote-fd.o builtin/remote.o builtin/repack.o builtin/replace.o builtin/replay.o builtin/rerere.o builtin/reset.o builtin/rev-list.o builtin/rev-parse.o builtin/revert.o builtin/rm.o builtin/send-pack.o builtin/shortlog.o builtin/show-branch.o builtin/show-index.o builtin/show-ref.o builtin/sparse-checkout.o builtin/stash.o builtin/stripspace.o builtin/submodule--helper.o builtin/symbolic-ref.o builtin/tag.o builtin/unpack-file.o builtin/unpack-objects.o builtin/update-index.o builtin/update-ref.o builtin/update-server-info.o builtin/upload-archive.o builtin/upload-pack.o builtin/var.o builtin/verify-commit.o builtin/verify-pack.o builtin/verify-tag.o builtin/worktree.o builtin/write-tree.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-rm -f git-add && \
-ln git git-add 2>/dev/null || \
-ln -s git git-add 2>/dev/null || \
-cp git git-add
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-am && \
 ln git git-am 2>/dev/null || \
 ln -s git git-am 2>/dev/null || \
 cp git git-am
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+rm -f git-add && \
+ln git git-add 2>/dev/null || \
+ln -s git git-add 2>/dev/null || \
+cp git git-add
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-annotate && \
 ln git git-annotate 2>/dev/null || \
 ln -s git git-annotate 2>/dev/null || \
@@ -2635,36 +2671,36 @@
 cp git git-apply
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-bisect && \
 ln git git-bisect 2>/dev/null || \
 ln -s git git-bisect 2>/dev/null || \
 cp git git-bisect
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-bundle && \
 ln git git-bundle 2>/dev/null || \
 ln -s git git-bundle 2>/dev/null || \
@@ -2689,18 +2725,18 @@
 cp git git-check-ignore
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-check-mailmap && \
 ln git git-check-mailmap 2>/dev/null || \
 ln -s git git-check-mailmap 2>/dev/null || \
 cp git git-check-mailmap
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-checkout--worker && \
 ln git git-checkout--worker 2>/dev/null || \
 ln -s git git-checkout--worker 2>/dev/null || \
@@ -2713,12 +2749,6 @@
 cp git git-checkout-index
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-checkout && \
 ln git git-checkout 2>/dev/null || \
 ln -s git git-checkout 2>/dev/null || \
@@ -2731,6 +2761,12 @@
 cp git git-clean
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-column && \
 ln git git-column 2>/dev/null || \
 ln -s git git-column 2>/dev/null || \
@@ -2743,18 +2779,18 @@
 cp git git-commit-graph
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-rm -f git-commit && \
-ln git git-commit 2>/dev/null || \
-ln -s git git-commit 2>/dev/null || \
-cp git git-commit
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-commit-tree && \
 ln git git-commit-tree 2>/dev/null || \
 ln -s git git-commit-tree 2>/dev/null || \
 cp git git-commit-tree
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+rm -f git-commit && \
+ln git git-commit 2>/dev/null || \
+ln -s git git-commit 2>/dev/null || \
+cp git git-commit
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-config && \
 ln git git-config 2>/dev/null || \
 ln -s git git-config 2>/dev/null || \
@@ -2851,18 +2887,18 @@
 cp git git-fetch-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-fetch && \
 ln git git-fetch 2>/dev/null || \
 ln -s git git-fetch 2>/dev/null || \
 cp git git-fetch
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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 || \
@@ -2893,18 +2929,18 @@
 cp git git-gc
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-rm -f git-grep && \
-ln git git-grep 2>/dev/null || \
-ln -s git git-grep 2>/dev/null || \
-cp git git-grep
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-get-tar-commit-id && \
 ln git git-get-tar-commit-id 2>/dev/null || \
 ln -s git git-get-tar-commit-id 2>/dev/null || \
 cp git git-get-tar-commit-id
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+rm -f git-grep && \
+ln git git-grep 2>/dev/null || \
+ln -s git git-grep 2>/dev/null || \
+cp git git-grep
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-hash-object && \
 ln git git-hash-object 2>/dev/null || \
 ln -s git git-hash-object 2>/dev/null || \
@@ -2941,22 +2977,16 @@
 cp git git-interpret-trailers
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-rm -f git-ls-files && \
-ln git git-ls-files 2>/dev/null || \
-ln -s git git-ls-files 2>/dev/null || \
-cp git git-ls-files
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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
+rm -f git-ls-files && \
+ln git git-ls-files 2>/dev/null || \
+ln -s git git-ls-files 2>/dev/null || \
+cp git git-ls-files
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-ls-remote && \
@@ -2965,6 +2995,12 @@
 cp git git-ls-remote
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-mailinfo && \
 ln git git-mailinfo 2>/dev/null || \
 ln -s git git-mailinfo 2>/dev/null || \
@@ -3079,12 +3115,6 @@
 cp git git-patch-id
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-prune-packed && \
 ln git git-prune-packed 2>/dev/null || \
 ln -s git git-prune-packed 2>/dev/null || \
@@ -3097,6 +3127,12 @@
 cp git git-prune
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-push && \
 ln git git-push 2>/dev/null || \
 ln -s git git-push 2>/dev/null || \
@@ -3175,6 +3211,12 @@
 cp git git-replay
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-reset && \
 ln git git-reset 2>/dev/null || \
 ln -s git git-reset 2>/dev/null || \
@@ -3187,12 +3229,6 @@
 cp git git-rev-list
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-rev-parse && \
 ln git git-rev-parse 2>/dev/null || \
 ln -s git git-rev-parse 2>/dev/null || \
@@ -3337,18 +3373,18 @@
 cp git git-verify-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-rm -f git-worktree && \
-ln git git-worktree 2>/dev/null || \
-ln -s git git-worktree 2>/dev/null || \
-cp git git-worktree
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-verify-tag && \
 ln git git-verify-tag 2>/dev/null || \
 ln -s git git-verify-tag 2>/dev/null || \
 cp git git-verify-tag
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+rm -f git-worktree && \
+ln git git-worktree 2>/dev/null || \
+ln -s git git-worktree 2>/dev/null || \
+cp git git-worktree
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-write-tree && \
 ln git git-write-tree 2>/dev/null || \
 ln -s git git-write-tree 2>/dev/null || \
@@ -3361,18 +3397,18 @@
 cp git git-cherry
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-rm -f git-cherry-pick && \
-ln git git-cherry-pick 2>/dev/null || \
-ln -s git git-cherry-pick 2>/dev/null || \
-cp git git-cherry-pick
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+rm -f git-cherry-pick && \
+ln git git-cherry-pick 2>/dev/null || \
+ln -s git git-cherry-pick 2>/dev/null || \
+cp git git-cherry-pick
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 rm -f git-fsck-objects && \
 ln git git-fsck-objects 2>/dev/null || \
 ln -s git git-fsck-objects 2>/dev/null || \
@@ -3633,42 +3669,42 @@
 date >boilerplates.made
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/templates'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/dummy-cmd-main.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-commit-graph.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-config.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-pack-headers.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-date.c
+gcc -o oss-fuzz/fuzz-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-pack-idx.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-commit-graph.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-date.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-pack-idx.c
+gcc -o oss-fuzz/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/dummy-cmd-main.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-pack-headers.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-date -Wl,-z,relro   \
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-pack-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 -lrt 
+	oss-fuzz/fuzz-pack-headers.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-commit-graph -Wl,-z,relro   \
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-date -Wl,-z,relro   \
 	-Wl,--allow-multiple-definition \
-	oss-fuzz/fuzz-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 -lrt 
+	oss-fuzz/fuzz-date.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-pack-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-config -Wl,-z,relro   \
 	-Wl,--allow-multiple-definition \
-	oss-fuzz/fuzz-pack-headers.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
+	oss-fuzz/fuzz-config.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-config -Wl,-z,relro   \
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-commit-graph -Wl,-z,relro   \
 	-Wl,--allow-multiple-definition \
-	oss-fuzz/fuzz-config.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
+	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 -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-pack-idx -Wl,-z,relro   \
@@ -3676,19 +3712,19 @@
 	oss-fuzz/fuzz-pack-idx.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-msgfmt --check -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 msgfmt --check -o po/build/locale/bg/LC_MESSAGES/git.mo po/bg.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 msgfmt --check -o po/build/locale/el/LC_MESSAGES/git.mo po/el.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-msgfmt --check -o po/build/locale/de/LC_MESSAGES/git.mo po/de.po
+msgfmt --check -o po/build/locale/is/LC_MESSAGES/git.mo po/is.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-msgfmt --check -o po/build/locale/is/LC_MESSAGES/git.mo po/is.po
+msgfmt --check -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+msgfmt --check -o po/build/locale/de/LC_MESSAGES/git.mo po/de.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 msgfmt --check -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
@@ -3700,28 +3736,31 @@
 msgfmt --check -o po/build/locale/id/LC_MESSAGES/git.mo po/id.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-msgfmt --check -o po/build/locale/it/LC_MESSAGES/git.mo po/it.po
+msgfmt --check -o po/build/locale/ko/LC_MESSAGES/git.mo po/ko.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-msgfmt --check -o po/build/locale/ko/LC_MESSAGES/git.mo po/ko.po
+msgfmt --check -o po/build/locale/it/LC_MESSAGES/git.mo po/it.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 msgfmt --check -o po/build/locale/ru/LC_MESSAGES/git.mo po/ru.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 msgfmt --check -o po/build/locale/pl/LC_MESSAGES/git.mo po/pl.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-msgfmt --check -o po/build/locale/pt_PT/LC_MESSAGES/git.mo po/pt_PT.po
+msgfmt --check -o po/build/locale/sv/LC_MESSAGES/git.mo po/sv.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 msgfmt --check -o po/build/locale/tr/LC_MESSAGES/git.mo po/tr.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-msgfmt --check -o po/build/locale/sv/LC_MESSAGES/git.mo po/sv.po
+msgfmt --check -o po/build/locale/uk/LC_MESSAGES/git.mo po/uk.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-msgfmt --check -o po/build/locale/uk/LC_MESSAGES/git.mo po/uk.po
+msgfmt --check -o po/build/locale/vi/LC_MESSAGES/git.mo po/vi.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 msgfmt --check -o po/build/locale/zh_CN/LC_MESSAGES/git.mo po/zh_CN.po
@@ -3730,9 +3769,6 @@
 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.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-msgfmt --check -o po/build/locale/vi/LC_MESSAGES/git.mo po/vi.po
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_GETTEXT@@||g' \
@@ -3842,53 +3878,50 @@
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_GETTEXT@@||g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/LoadCPAN/Mail/Address.pm > perl/build/lib/Git/LoadCPAN/Mail/Address.pm
+< perl/Git/SVN/Memoize/YAML.pm > perl/build/lib/Git/SVN/Memoize/YAML.pm
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_GETTEXT@@||g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/SVN/Memoize/YAML.pm > perl/build/lib/Git/SVN/Memoize/YAML.pm
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-fake-ssh.c
+< perl/Git/LoadCPAN/Mail/Address.pm > perl/build/lib/Git/LoadCPAN/Mail/Address.pm
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-advise.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bitmap.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bundle-uri.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-crontab.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-fake-ssh.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-tool.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bundle-uri.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bloom.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-cache-tree.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bitmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-chmtime.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bloom.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-crontab.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-csprng.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-date.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-cache-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-delete-gpgsig.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-config.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-date.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-delta.c
@@ -3900,16 +3933,16 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-drop-caches.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-fsmonitor.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-cache-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-split-index.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-fsmonitor.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-cache-tree.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-split-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-find-pack.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-env-helper.c
@@ -3921,13 +3954,19 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-untracked-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-getcwd.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-genrandom.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-find-pack.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-fsmonitor-client.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-getcwd.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-example-tap.c
@@ -3939,34 +3978,34 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hexdump.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hash.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hashmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-online-cpus.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-match-trees.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-match-trees.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mktemp.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hashmap.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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-online-cpus.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pack-mtimes.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-parse-pathspec-file.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mktemp.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-lazy-init-name-hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-parse-pathspec-file.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pack-mtimes.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pcre2-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-lazy-init-name-hash.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-partial-clone.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-partial-clone.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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-progress.c
@@ -3981,55 +4020,46 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-proc-receive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-parse-options.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-graph.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-cache.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-midx.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-graph.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-parse-options.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-reach.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-midx.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-regex.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-revision-walking.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mergesort.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-scrap-cache-tree.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-serve-v2.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-reftable.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-path-utils.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mergesort.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-repository.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-reftable.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-path-utils.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sha1.c
+gcc -o t/helper/test-scrap-cache-tree.o -c -MF t/helper/.depend/test-scrap-cache-tree.o.d -MQ t/helper/test-scrap-cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-scrap-cache-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sha256.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-rot13-filter.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-serve-v2.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule-nested-repo-config.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sha1.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-ref-store.c
@@ -4038,16 +4068,19 @@
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sigchain.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-string-list.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-subprocess.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule-nested-repo-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule-config.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-rot13-filter.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-run-command.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-subprocess.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-string-list.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-truncate.c
@@ -4059,31 +4092,28 @@
 chmod +x bin-wrappers/git
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-wildmatch.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.47.2|' \
      -e 's|@@PROG@@|scalar|' < wrap-for-bin.sh > bin-wrappers/scalar && \
 chmod +x bin-wrappers/scalar
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-sed -e '1s|#!.*/sh|#!/bin/sh|' \
-     -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.47.2|' \
-     -e 's|@@PROG@@|git-receive-pack|' < wrap-for-bin.sh > bin-wrappers/git-receive-pack && \
-chmod +x bin-wrappers/git-receive-pack
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-run-command.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-userdiff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-trace2.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-windows-named-pipe.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-wildmatch.c
+sed -e '1s|#!.*/sh|#!/bin/sh|' \
+     -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.47.2|' \
+     -e 's|@@PROG@@|git-receive-pack|' < wrap-for-bin.sh > bin-wrappers/git-receive-pack && \
+chmod +x bin-wrappers/git-receive-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -4092,25 +4122,19 @@
 chmod +x bin-wrappers/git-shell
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-write-cache.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.47.2|' \
      -e 's|@@PROG@@|git-upload-archive|' < wrap-for-bin.sh > bin-wrappers/git-upload-archive && \
 chmod +x bin-wrappers/git-upload-archive
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-xml-encode.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.47.2|' \
      -e 's|@@PROG@@|git-upload-pack|' < wrap-for-bin.sh > bin-wrappers/git-upload-pack && \
 chmod +x bin-wrappers/git-upload-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-simple-ipc.c
+gcc -o t/helper/test-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-write-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -4119,126 +4143,146 @@
 chmod +x bin-wrappers/git-cvsserver
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.47.2|' \
      -e 's|@@PROG@@|t/helper/test-fake-ssh|' < wrap-for-bin.sh > bin-wrappers/test-fake-ssh && \
 chmod +x bin-wrappers/test-fake-ssh
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-xml-encode.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-simple-ipc.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.47.2|' \
      -e 's|@@PROG@@|t/helper/test-tool|' < wrap-for-bin.sh > bin-wrappers/test-tool && \
 chmod +x bin-wrappers/test-tool
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-hash.o -c -MF t/unit-tests/.depend/t-hash.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-hash.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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-trace2.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/lib-oid.c
+gcc -o t/unit-tests/t-example-decorate.o -c -MF t/unit-tests/.depend/t-example-decorate.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-example-decorate.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/test-lib.c
+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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/lib-oid.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc -o t/unit-tests/t-mem-pool.o -c -MF t/unit-tests/.depend/t-mem-pool.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-mem-pool.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-example-decorate.o -c -MF t/unit-tests/.depend/t-example-decorate.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-example-decorate.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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/lib-reftable.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-prio-queue.o -c -MF t/unit-tests/.depend/t-prio-queue.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-prio-queue.c
+gcc -o t/unit-tests/t-hash.o -c -MF t/unit-tests/.depend/t-hash.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/lib-reftable.c
+gcc -o t/unit-tests/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/test-lib.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-reftable-basics.o -c -MF t/unit-tests/.depend/t-reftable-basics.o.d -MQ t/unit-tests/t-reftable-basics.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-basics.c
+gcc -o t/unit-tests/t-oid-array.o -c -MF t/unit-tests/.depend/t-oid-array.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-oid-array.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-oid-array.o -c -MF t/unit-tests/.depend/t-oid-array.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-oid-array.c
+gcc -o t/unit-tests/t-prio-queue.o -c -MF t/unit-tests/.depend/t-prio-queue.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-prio-queue.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc -o t/unit-tests/t-oidtree.o -c -MF t/unit-tests/.depend/t-oidtree.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-oidtree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-reftable-pq.o -c -MF t/unit-tests/.depend/t-reftable-pq.o.d -MQ t/unit-tests/t-reftable-pq.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-pq.c
+gcc -o t/unit-tests/t-oidmap.o -c -MF t/unit-tests/.depend/t-oidmap.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-oidmap.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+gcc -o t/unit-tests/t-reftable-basics.o -c -MF t/unit-tests/.depend/t-reftable-basics.o.d -MQ t/unit-tests/t-reftable-basics.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-basics.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc -o t/unit-tests/t-reftable-reader.o -c -MF t/unit-tests/.depend/t-reftable-reader.o.d -MQ t/unit-tests/t-reftable-reader.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-reader.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-oidmap.o -c -MF t/unit-tests/.depend/t-oidmap.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-oidmap.c
+gcc -o t/unit-tests/t-reftable-tree.o -c -MF t/unit-tests/.depend/t-reftable-tree.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
     * new test suites
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-reftable-block.o -c -MF t/unit-tests/.depend/t-reftable-block.o.d -MQ t/unit-tests/t-reftable-block.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-block.c
+gcc -o t/unit-tests/t-strcmp-offset.o -c -MF t/unit-tests/.depend/t-strcmp-offset.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-strcmp-offset.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-reftable-tree.o -c -MF t/unit-tests/.depend/t-reftable-tree.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-tree.c
+gcc -o t/unit-tests/t-reftable-pq.o -c -MF t/unit-tests/.depend/t-reftable-pq.o.d -MQ t/unit-tests/t-reftable-pq.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-pq.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-strcmp-offset.o -c -MF t/unit-tests/.depend/t-strcmp-offset.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-strcmp-offset.c
+gcc -o t/unit-tests/t-hashmap.o -c -MF t/unit-tests/.depend/t-hashmap.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-hashmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc -o t/unit-tests/t-trailer.o -c -MF t/unit-tests/.depend/t-trailer.o.d -MQ t/unit-tests/t-trailer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-trailer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+gcc -o t/unit-tests/t-reftable-block.o -c -MF t/unit-tests/.depend/t-reftable-block.o.d -MQ t/unit-tests/t-reftable-block.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-block.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc -o t/unit-tests/t-strbuf.o -c -MF t/unit-tests/.depend/t-strbuf.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-strbuf.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc -o t/unit-tests/t-reftable-merged.o -c -MF t/unit-tests/.depend/t-reftable-merged.o.d -MQ t/unit-tests/t-reftable-merged.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-merged.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-reftable-record.o -c -MF t/unit-tests/.depend/t-reftable-record.o.d -MQ t/unit-tests/t-reftable-record.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-record.c
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/helper/test-tool -Wl,-z,relro   t/helper/test-tool.o common-main.o t/helper/test-advise.o t/helper/test-bitmap.o t/helper/test-bloom.o t/helper/test-bundle-uri.o t/helper/test-cache-tree.o t/helper/test-chmtime.o t/helper/test-config.o t/helper/test-crontab.o t/helper/test-csprng.o t/helper/test-date.o t/helper/test-delete-gpgsig.o t/helper/test-delta.o t/helper/test-dir-iterator.o t/helper/test-drop-caches.o t/helper/test-dump-cache-tree.o t/helper/test-dump-fsmonitor.o t/helper/test-dump-split-index.o t/helper/test-dump-untracked-cache.o t/helper/test-env-helper.o t/helper/test-example-tap.o t/helper/test-find-pack.o t/helper/test-fsmonitor-client.o t/helper/test-genrandom.o t/helper/test-genzeros.o t/helper/test-getcwd.o t/helper/test-hash-speed.o t/helper/test-hash.o t/helper/test-hashmap.o t/helper/test-hexdump.o t/helper/test-json-writer.o t/helper/test-lazy-init-name-hash.o t/helper/test-match-trees.o t/helper/test-mergesort.o t/helper/test-mktemp.o t/helper/test-online-cpus.o t/helper/test-pack-mtimes.o t/helper/test-parse-options.o t/helper/test-parse-pathspec-file.o t/helper/test-partial-clone.o t/helper/test-path-utils.o t/helper/test-pcre2-config.o t/helper/test-pkt-line.o t/helper/test-proc-receive.o t/helper/test-progress.o t/helper/test-reach.o t/helper/test-read-cache.o t/helper/test-read-graph.o t/helper/test-read-midx.o t/helper/test-ref-store.o t/helper/test-reftable.o t/helper/test-regex.o t/helper/test-rot13-filter.o t/helper/test-repository.o t/helper/test-revision-walking.o t/helper/test-run-command.o t/helper/test-scrap-cache-tree.o t/helper/test-serve-v2.o t/helper/test-sha1.o t/helper/test-sha256.o t/helper/test-sigchain.o t/helper/test-simple-ipc.o t/helper/test-string-list.o t/helper/test-submodule-config.o t/helper/test-submodule-nested-repo-config.o t/helper/test-submodule.o t/helper/test-subprocess.o t/helper/test-trace2.o t/helper/test-truncate.o t/helper/test-userdiff.o t/helper/test-wildmatch.o t/helper/test-windows-named-pipe.o t/helper/test-write-cache.o t/helper/test-xml-encode.o t/unit-tests/test-lib.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-hashmap.o -c -MF t/unit-tests/.depend/t-hashmap.o.d -MQ t/unit-tests/t-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-hashmap.c
+gcc -o t/unit-tests/t-reftable-record.o -c -MF t/unit-tests/.depend/t-reftable-record.o.d -MQ t/unit-tests/t-reftable-record.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-record.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-example-decorate -Wl,-z,relro   \
 	t/unit-tests/t-example-decorate.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/helper/test-fake-ssh -Wl,-z,relro   t/helper/test-fake-ssh.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-oid-array -Wl,-z,relro   \
+	t/unit-tests/t-oid-array.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-hash -Wl,-z,relro   \
 	t/unit-tests/t-hash.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/helper/test-tool -Wl,-z,relro   t/helper/test-tool.o common-main.o t/helper/test-advise.o t/helper/test-bitmap.o t/helper/test-bloom.o t/helper/test-bundle-uri.o t/helper/test-cache-tree.o t/helper/test-chmtime.o t/helper/test-config.o t/helper/test-crontab.o t/helper/test-csprng.o t/helper/test-date.o t/helper/test-delete-gpgsig.o t/helper/test-delta.o t/helper/test-dir-iterator.o t/helper/test-drop-caches.o t/helper/test-dump-cache-tree.o t/helper/test-dump-fsmonitor.o t/helper/test-dump-split-index.o t/helper/test-dump-untracked-cache.o t/helper/test-env-helper.o t/helper/test-example-tap.o t/helper/test-find-pack.o t/helper/test-fsmonitor-client.o t/helper/test-genrandom.o t/helper/test-genzeros.o t/helper/test-getcwd.o t/helper/test-hash-speed.o t/helper/test-hash.o t/helper/test-hashmap.o t/helper/test-hexdump.o t/helper/test-json-writer.o t/helper/test-lazy-init-name-hash.o t/helper/test-match-trees.o t/helper/test-mergesort.o t/helper/test-mktemp.o t/helper/test-online-cpus.o t/helper/test-pack-mtimes.o t/helper/test-parse-options.o t/helper/test-parse-pathspec-file.o t/helper/test-partial-clone.o t/helper/test-path-utils.o t/helper/test-pcre2-config.o t/helper/test-pkt-line.o t/helper/test-proc-receive.o t/helper/test-progress.o t/helper/test-reach.o t/helper/test-read-cache.o t/helper/test-read-graph.o t/helper/test-read-midx.o t/helper/test-ref-store.o t/helper/test-reftable.o t/helper/test-regex.o t/helper/test-rot13-filter.o t/helper/test-repository.o t/helper/test-revision-walking.o t/helper/test-run-command.o t/helper/test-scrap-cache-tree.o t/helper/test-serve-v2.o t/helper/test-sha1.o t/helper/test-sha256.o t/helper/test-sigchain.o t/helper/test-simple-ipc.o t/helper/test-string-list.o t/helper/test-submodule-config.o t/helper/test-submodule-nested-repo-config.o t/helper/test-submodule.o t/helper/test-subprocess.o t/helper/test-trace2.o t/helper/test-truncate.o t/helper/test-userdiff.o t/helper/test-wildmatch.o t/helper/test-windows-named-pipe.o t/helper/test-write-cache.o t/helper/test-xml-encode.o t/unit-tests/test-lib.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc -o t/unit-tests/t-urlmatch-normalization.o -c -MF t/unit-tests/.depend/t-urlmatch-normalization.o.d -MQ t/unit-tests/t-urlmatch-normalization.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-urlmatch-normalization.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/helper/test-fake-ssh -Wl,-z,relro   t/helper/test-fake-ssh.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-hashmap -Wl,-z,relro   \
+	t/unit-tests/t-hashmap.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-mem-pool -Wl,-z,relro   \
 	t/unit-tests/t-mem-pool.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-urlmatch-normalization.o -c -MF t/unit-tests/.depend/t-urlmatch-normalization.o.d -MQ t/unit-tests/t-urlmatch-normalization.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-urlmatch-normalization.c
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-oidmap -Wl,-z,relro   \
+	t/unit-tests/t-oidmap.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-oid-array -Wl,-z,relro   \
-	t/unit-tests/t-oid-array.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc -o t/unit-tests/t-reftable-readwrite.o -c -MF t/unit-tests/.depend/t-reftable-readwrite.o.d -MQ t/unit-tests/t-reftable-readwrite.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-readwrite.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-reftable-readwrite.o -c -MF t/unit-tests/.depend/t-reftable-readwrite.o.d -MQ t/unit-tests/t-reftable-readwrite.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-readwrite.c
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-basics -Wl,-z,relro   \
+	t/unit-tests/t-reftable-basics.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-oidtree -Wl,-z,relro   \
 	t/unit-tests/t-oidtree.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-oidmap -Wl,-z,relro   \
-	t/unit-tests/t-oidmap.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-prio-queue -Wl,-z,relro   \
 	t/unit-tests/t-prio-queue.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-basics -Wl,-z,relro   \
-	t/unit-tests/t-reftable-basics.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-merged -Wl,-z,relro   \
+	t/unit-tests/t-reftable-merged.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 for suite in ctype strvec; do \
@@ -4246,14 +4290,6 @@
 done >t/unit-tests/clar-decls.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-reader -Wl,-z,relro   \
-	t/unit-tests/t-reftable-reader.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-record -Wl,-z,relro   \
-	t/unit-tests/t-reftable-record.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-block -Wl,-z,relro   \
 	t/unit-tests/t-reftable-block.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
@@ -4261,46 +4297,39 @@
 awk -f t/unit-tests/clar-generate.awk t/unit-tests/clar-decls.h >t/unit-tests/clar.suite
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-pq -Wl,-z,relro   \
-	t/unit-tests/t-reftable-pq.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-merged -Wl,-z,relro   \
-	t/unit-tests/t-reftable-merged.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-tree -Wl,-z,relro   \
 	t/unit-tests/t-reftable-tree.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc -o t/unit-tests/t-reftable-stack.o -c -MF t/unit-tests/.depend/t-reftable-stack.o.d -MQ t/unit-tests/t-reftable-stack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-stack.c
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-pq -Wl,-z,relro   \
+	t/unit-tests/t-reftable-pq.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-strcmp-offset -Wl,-z,relro   \
-	t/unit-tests/t-strcmp-offset.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-reader -Wl,-z,relro   \
+	t/unit-tests/t-reftable-reader.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-trailer -Wl,-z,relro   \
-	t/unit-tests/t-trailer.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-record -Wl,-z,relro   \
+	t/unit-tests/t-reftable-record.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-urlmatch-normalization -Wl,-z,relro   \
-	t/unit-tests/t-urlmatch-normalization.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-trailer -Wl,-z,relro   \
+	t/unit-tests/t-trailer.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-strbuf -Wl,-z,relro   \
 	t/unit-tests/t-strbuf.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/unit-test.c
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-strcmp-offset -Wl,-z,relro   \
+	t/unit-tests/t-strcmp-offset.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-hashmap -Wl,-z,relro   \
-	t/unit-tests/t-hashmap.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc -o t/unit-tests/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/unit-test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-stack -Wl,-z,relro   \
-	t/unit-tests/t-reftable-stack.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-urlmatch-normalization -Wl,-z,relro   \
+	t/unit-tests/t-urlmatch-normalization.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-readwrite -Wl,-z,relro   \
@@ -4310,9 +4339,16 @@
 gcc -o t/unit-tests/ctype.o -c -MF t/unit-tests/.depend/ctype.o.d -MQ t/unit-tests/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/ctype.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+gcc -o t/unit-tests/t-reftable-stack.o -c -MF t/unit-tests/.depend/t-reftable-stack.o.d -MQ t/unit-tests/t-reftable-stack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-stack.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 gcc -o t/unit-tests/strvec.o -c -MF t/unit-tests/.depend/strvec.o.d -MQ t/unit-tests/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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/strvec.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-stack -Wl,-z,relro   \
+	t/unit-tests/t-reftable-stack.o t/unit-tests/test-lib.o t/unit-tests/lib-oid.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 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.47.2=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/clar/clar.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
@@ -4398,13 +4434,18 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
+sed -e '1,/^$/d' howto/using-merge-subtree.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/using-merge-subtree.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+\
 sed -e '1,/^$/d' howto/revert-branch-rebase.txt | \
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/revert-branch-rebase.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
-sed -e '1,/^$/d' howto/using-merge-subtree.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/using-merge-subtree.html
+sed -e '1,/^$/d' howto/use-git-daemon.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/use-git-daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
@@ -4413,11 +4454,6 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
-sed -e '1,/^$/d' howto/separating-topic-branches.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/separating-topic-branches.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-\
 sed -e '1,/^$/d' howto/using-signed-tag-in-pull-request.txt | \
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/using-signed-tag-in-pull-request.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -4428,13 +4464,8 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
-sed -e '1,/^$/d' howto/use-git-daemon.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/use-git-daemon.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-\
-sed -e '1,/^$/d' howto/revert-a-faulty-merge.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/revert-a-faulty-merge.html
+sed -e '1,/^$/d' howto/separating-topic-branches.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/separating-topic-branches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
@@ -4443,8 +4474,8 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
-sed -e '1,/^$/d' howto/rebuild-from-update-hook.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/rebuild-from-update-hook.html
+sed -e '1,/^$/d' howto/revert-a-faulty-merge.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/revert-a-faulty-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
@@ -4453,16 +4484,18 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
-sed -e '1,/^$/d' howto/recover-corrupted-object-harder.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/recover-corrupted-object-harder.html
+sed -e '1,/^$/d' howto/rebuild-from-update-hook.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/rebuild-from-update-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
-sed -e '1,/^$/d' howto/keep-canonical-history-correct.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/keep-canonical-history-correct.html
+sed -e '1,/^$/d' howto/rebase-from-internal-branch.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/rebase-from-internal-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/api-error-handling.txt
+\
+sed -e '1,/^$/d' howto/recover-corrupted-object-harder.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/recover-corrupted-object-harder.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
@@ -4471,11 +4504,11 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
-sed -e '1,/^$/d' howto/rebase-from-internal-branch.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/rebase-from-internal-branch.html
+sed -e '1,/^$/d' howto/keep-canonical-history-correct.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/keep-canonical-history-correct.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/api-merge.txt
+'/bin/sh' ./howto-index.sh howto/coordinate-embargoed-releases.txt howto/keep-canonical-history-correct.txt howto/maintain-git.txt howto/new-command.txt howto/rebase-from-internal-branch.txt howto/rebuild-from-update-hook.txt howto/recover-corrupted-blob-object.txt howto/recover-corrupted-object-harder.txt howto/revert-a-faulty-merge.txt howto/revert-branch-rebase.txt howto/separating-topic-branches.txt howto/setup-git-server-over-http.txt howto/update-hook-example.txt howto/use-git-daemon.txt howto/using-merge-subtree.txt howto/using-signed-tag-in-pull-request.txt >howto-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 git-bisect-lk2009.txt
@@ -4484,10 +4517,7 @@
 cp SubmittingPatches SubmittingPatches.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-'/bin/sh' ./howto-index.sh howto/coordinate-embargoed-releases.txt howto/keep-canonical-history-correct.txt howto/maintain-git.txt howto/new-command.txt howto/rebase-from-internal-branch.txt howto/rebuild-from-update-hook.txt howto/recover-corrupted-blob-object.txt howto/recover-corrupted-object-harder.txt howto/revert-a-faulty-merge.txt howto/revert-branch-rebase.txt howto/separating-topic-branches.txt howto/setup-git-server-over-http.txt howto/update-hook-example.txt howto/use-git-daemon.txt howto/using-merge-subtree.txt howto/using-signed-tag-in-pull-request.txt >howto-index.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/api-simple-ipc.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/api-error-handling.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 \
@@ -4495,6 +4525,12 @@
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 - >howto/maintain-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/api-merge.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/api-simple-ipc.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 DecisionMaking.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -4510,7 +4546,7 @@
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/long-running-process-protocol.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/parallel-checkout.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/bitmap-format.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/multi-pack-index.txt
@@ -4519,13 +4555,13 @@
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/api-trace2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/bitmap-format.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/bundle-uri.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/bundle-uri.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 MyFirstContribution.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/hash-function-transition.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/parallel-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 MyFirstObjectWalk.txt
@@ -4540,133 +4576,130 @@
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/partial-clone.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/racy-git.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/hash-function-transition.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 cd technical && '/bin/sh' ./api-index.sh
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 MyFirstContribution.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/racy-git.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/scalar.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/shallow.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/send-pack-pipeline.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -o everyday.html everyday.txto
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/shallow.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/trivial-merge.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/unit-tests.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -o git-remote-helpers.html git-remote-helpers.txto
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -o git-remote-helpers.html git-remote-helpers.txto
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -o everyday.html everyday.txto
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-archimport.xml git-archimport.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/unit-tests.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-apply.xml git-apply.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-archive.xml git-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-am.xml git-am.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bugreport.xml git-bugreport.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-archimport.xml git-archimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-annotate.xml git-annotate.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bisect.xml git-bisect.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-add.xml git-add.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-archive.xml git-archive.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-apply.xml git-apply.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/reftable.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bisect.xml git-bisect.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-add.xml git-add.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bugreport.xml git-bugreport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d book -o user-manual.xml user-manual.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/reftable.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-attr.xml git-check-attr.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bundle.xml git-bundle.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-branch.xml git-branch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-blame.xml git-blame.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-attr.xml git-check-attr.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bundle.xml git-bundle.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-blame.xml git-blame.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d book -o user-manual.xml user-manual.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-branch.xml git-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cherry.xml git-cherry.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-citool.xml git-citool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-checkout.xml git-checkout.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-clean.xml git-clean.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cherry.xml git-cherry.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-column.xml git-column.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-clean.xml git-clean.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-clone.xml git-clone.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-checkout.xml git-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-count-objects.xml git-count-objects.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-store.xml git-credential-store.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-count-objects.xml git-count-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential.xml git-credential.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-store.xml git-credential-store.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-clone.xml git-clone.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.txt
@@ -4678,25 +4711,28 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diagnose.xml git-diagnose.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-daemon.xml git-daemon.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-commit.xml git-commit.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential.xml git-credential.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-describe.xml git-describe.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-daemon.xml git-daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-difftool.xml git-difftool.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-describe.xml git-describe.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-commit.xml git-commit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-difftool.xml git-difftool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.txt
@@ -4705,13 +4741,13 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff-files.xml git-diff-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.txt
@@ -4720,22 +4756,13 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fsck.xml git-fsck.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fetch.xml git-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff.xml git-diff.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-gc.xml git-gc.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-gui.xml git-gui.txt
@@ -4744,70 +4771,73 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fsck.xml git-fsck.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-help.xml git-help.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-gc.xml git-gc.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-hook.xml git-hook.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-grep.xml git-grep.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-hook.xml git-hook.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-grep.xml git-grep.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff.xml git-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-http-push.xml git-http-push.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-help.xml git-help.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-imap-send.xml git-imap-send.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-instaweb.xml git-instaweb.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-init-db.xml git-init-db.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-init.xml git-init.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-instaweb.xml git-instaweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-ls-files.xml git-ls-files.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-init.xml git-init.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-ls-files.xml git-ls-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-file.xml git-merge-file.txt
@@ -4816,34 +4846,37 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-index.xml git-merge-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-maintenance.xml git-maintenance.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mktree.xml git-mktree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-maintenance.xml git-maintenance.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mktag.xml git-mktag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mktree.xml git-mktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-name-rev.xml git-name-rev.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mv.xml git-mv.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mergetool.xml git-mergetool.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mv.xml git-mv.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mergetool.xml git-mergetool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.txt
@@ -4855,49 +4888,49 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-patch-id.xml git-patch-id.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge.xml git-merge.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-prune-packed.xml git-prune-packed.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-notes.xml git-notes.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge.xml git-merge.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-prune.xml git-prune.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-p4.xml git-p4.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-range-diff.xml git-range-diff.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-range-diff.xml git-range-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-log.xml git-log.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-reflog.xml git-reflog.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-refs.xml git-refs.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-reflog.xml git-reflog.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-replace.xml git-replace.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-refs.xml git-refs.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-log.xml git-log.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-push.xml git-push.txt
@@ -4906,64 +4939,64 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-pull.xml git-pull.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-request-pull.xml git-request-pull.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-remote.xml git-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-remote.xml git-remote.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-replace.xml git-replace.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-repack.xml git-repack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-request-pull.xml git-request-pull.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rerere.xml git-rerere.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-repack.xml git-repack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-config.xml git-config.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rerere.xml git-rerere.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rebase.xml git-rebase.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rm.xml git-rm.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-restore.xml git-restore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-send-pack.xml git-send-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-reset.xml git-reset.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rm.xml git-rm.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rebase.xml git-rebase.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-reset.xml git-reset.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-revert.xml git-revert.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-revert.xml git-revert.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-send-pack.xml git-send-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-replay.xml git-replay.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-replay.xml git-replay.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-shell.xml git-shell.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show-branch.xml git-show-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-send-email.xml git-send-email.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show-index.xml git-show-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show-branch.xml git-show-branch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-send-email.xml git-send-email.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show-ref.xml git-show-ref.txt
@@ -4972,12 +5005,21 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-stage.xml git-stage.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-stripspace.xml git-stripspace.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-config.xml git-config.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-stash.xml git-stash.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rev-list.xml git-rev-list.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -4987,55 +5029,52 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-symbolic-ref.xml git-symbolic-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-submodule.xml git-submodule.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-stash.xml git-stash.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-switch.xml git-switch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-submodule.xml git-submodule.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-tag.xml git-tag.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-svn.xml git-svn.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-tag.xml git-tag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-var.xml git-var.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-index.xml git-update-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-var.xml git-var.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-index.xml git-update-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-version.xml git-version.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-version.xml git-version.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-svn.xml git-svn.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-web--browse.xml git-web--browse.txt
@@ -5044,9 +5083,6 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-write-tree.xml git-write-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -5056,19 +5092,16 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o scalar.xml scalar.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-worktree.xml git-worktree.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitk.xml gitk.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitweb.xml gitweb.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitk.xml gitk.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-worktree.xml git-worktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-commit-graph.xml gitformat-commit-graph.txt
@@ -5077,76 +5110,76 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-index.xml gitformat-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitweb.xml gitweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitmailmap.xml gitmailmap.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitignore.xml gitignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitmodules.xml gitmodules.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitmailmap.xml gitmailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitignore.xml gitignore.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitmodules.xml gitmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitattributes.xml gitattributes.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o githooks.xml githooks.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitcli.xml gitcli.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git.xml git.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitfaq.xml gitfaq.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o giteveryday.xml giteveryday.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o giteveryday.xml giteveryday.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitpacking.xml gitpacking.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git.xml git.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitpacking.xml gitpacking.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitrevisions.xml gitrevisions.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitfaq.xml gitfaq.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.txt
@@ -5155,43 +5188,40 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-archimport.html git-archimport.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitrevisions.xml gitrevisions.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gittutorial.xml gittutorial.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-annotate.html git-annotate.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-add.html git-add.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitglossary.xml gitglossary.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitworkflows.xml gitworkflows.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-annotate.html git-annotate.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-add.html git-add.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-archimport.html git-archimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-am.html git-am.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitglossary.xml gitglossary.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-apply.html git-apply.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitworkflows.xml gitworkflows.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-archive.html git-archive.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-am.html git-am.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-bisect.html git-bisect.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-apply.html git-apply.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-branch.html git-branch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-archive.html git-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-bugreport.html git-bugreport.txt
@@ -5200,61 +5230,64 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-check-attr.html git-check-attr.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-blame.html git-blame.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-check-ref-format.html git-check-ref-format.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-bundle.html git-bundle.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-check-ignore.html git-check-ignore.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-bisect.html git-bisect.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-check-ref-format.html git-check-ref-format.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-check-ignore.html git-check-ignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-checkout-index.html git-checkout-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-branch.html git-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-check-mailmap.html git-check-mailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-blame.html git-blame.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-cat-file.html git-cat-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-citool.html git-citool.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-checkout-index.html git-checkout-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-cherry.html git-cherry.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-cherry-pick.html git-cherry-pick.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-citool.html git-citool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-count-objects.html git-count-objects.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-cherry-pick.html git-cherry-pick.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-column.html git-column.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-clean.html git-clean.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-checkout.html git-checkout.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-commit-tree.html git-commit-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-credential-cache--daemon.html git-credential-cache--daemon.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-commit-graph.html git-commit-graph.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-credential-cache.html git-credential-cache.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-count-objects.html git-count-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-commit-graph.html git-commit-graph.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-column.html git-column.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-clean.html git-clean.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-credential-cache--daemon.html git-credential-cache--daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-commit-tree.html git-commit-tree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-checkout.html git-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-cvsexportcommit.html git-cvsexportcommit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-credential-cache.html git-credential-cache.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-credential-store.html git-credential-store.txt
@@ -5263,34 +5296,37 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-clone.html git-clone.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-diagnose.html git-diagnose.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-cvsexportcommit.html git-cvsexportcommit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-cvsimport.html git-cvsimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-commit.html git-commit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-describe.html git-describe.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-credential.html git-credential.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-diagnose.html git-diagnose.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-describe.html git-describe.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-credential.html git-credential.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-daemon.html git-daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-commit.html git-commit.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-cvsserver.html git-cvsserver.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-difftool.html git-difftool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fetch-pack.html git-fetch-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fast-export.html git-fast-export.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fast-export.html git-fast-export.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fetch-pack.html git-fetch-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fmt-merge-msg.html git-fmt-merge-msg.txt
@@ -5299,22 +5335,22 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-filter-branch.html git-filter-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-diff-files.html git-diff-files.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fsck-objects.html git-fsck-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-for-each-repo.html git-for-each-repo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fsck-objects.html git-fsck-objects.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-for-each-ref.html git-for-each-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fast-import.html git-fast-import.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-diff-files.html git-diff-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-diff-index.html git-diff-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fetch.html git-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-for-each-ref.html git-for-each-ref.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-diff-index.html git-diff-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fsmonitor--daemon.html git-fsmonitor--daemon.txt
@@ -5323,97 +5359,91 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-get-tar-commit-id.html git-get-tar-commit-id.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fetch.html git-fetch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-hash-object.html git-hash-object.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-diff.html git-diff.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fast-import.html git-fast-import.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-fsck.html git-fsck.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-diff.html git-diff.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-gc.html git-gc.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-hash-object.html git-hash-object.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-gui.html git-gui.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-grep.html git-grep.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-format-patch.html git-format-patch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-hook.html git-hook.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-grep.html git-grep.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-diff-tree.html git-diff-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-gui.html git-gui.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-help.html git-help.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-http-fetch.html git-http-fetch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-http-backend.html git-http-backend.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-http-push.html git-http-push.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-hook.html git-hook.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-init-db.html git-init-db.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-http-push.html git-http-push.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-http-backend.html git-http-backend.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-http-fetch.html git-http-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-help.html git-help.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-init-db.html git-init-db.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-format-patch.html git-format-patch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-index-pack.html git-index-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-imap-send.html git-imap-send.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-index-pack.html git-index-pack.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-instaweb.html git-instaweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-interpret-trailers.html git-interpret-trailers.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-init.html git-init.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-mailinfo.html git-mailinfo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-ls-remote.html git-ls-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-mailsplit.html git-mailsplit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-init.html git-init.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-ls-files.html git-ls-files.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-mailsplit.html git-mailsplit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-mailinfo.html git-mailinfo.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-interpret-trailers.html git-interpret-trailers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-ls-tree.html git-ls-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-base.html git-merge-base.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-one-file.html git-merge-one-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-file.html git-merge-file.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-ls-files.html git-ls-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-index.html git-merge-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-one-file.html git-merge-one-file.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-maintenance.html git-maintenance.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-file.html git-merge-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-mv.html git-mv.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-base.html git-merge-base.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-mergetool--lib.html git-mergetool--lib.txt
@@ -5422,7 +5452,7 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-mktree.html git-mktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-name-rev.html git-name-rev.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-maintenance.html git-maintenance.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-tree.html git-merge-tree.txt
@@ -5431,87 +5461,93 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-mktag.html git-mktag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-multi-pack-index.html git-multi-pack-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-mv.html git-mv.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-mergetool.html git-mergetool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-pack-refs.html git-pack-refs.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-multi-pack-index.html git-multi-pack-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-notes.html git-notes.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-name-rev.html git-name-rev.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-pack-redundant.html git-pack-redundant.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-pack-refs.html git-pack-refs.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-patch-id.html git-patch-id.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-pack-redundant.html git-pack-redundant.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-prune-packed.html git-prune-packed.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-patch-id.html git-patch-id.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-pack-objects.html git-pack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-merge.html git-merge.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-notes.html git-notes.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-prune.html git-prune.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-p4.html git-p4.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-merge.html git-merge.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-range-diff.html git-range-diff.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-prune-packed.html git-prune-packed.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-read-tree.html git-read-tree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-quiltimport.html git-quiltimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-quiltimport.html git-quiltimport.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-p4.html git-p4.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-reflog.html git-reflog.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-read-tree.html git-read-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-remote-ext.html git-remote-ext.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-reflog.html git-reflog.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-refs.html git-refs.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-range-diff.html git-range-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-remote-fd.html git-remote-fd.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-refs.html git-refs.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-receive-pack.html git-receive-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-request-pull.html git-request-pull.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-remote-ext.html git-remote-ext.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-replace.html git-replace.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-remote-fd.html git-remote-fd.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-pull.html git-pull.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-log.html git-log.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-push.html git-push.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-remote.html git-remote.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-replace.html git-replace.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-push.html git-push.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-repack.html git-repack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-repack.html git-repack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-remote.html git-remote.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-request-pull.html git-request-pull.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-rerere.html git-rerere.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-log.html git-log.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-restore.html git-restore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -5521,43 +5557,40 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-rebase.html git-rebase.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-revert.html git-revert.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-rm.html git-rm.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-config.html git-config.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-revert.html git-revert.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-sh-i18n.html git-sh-i18n.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-sh-i18n--envsubst.html git-sh-i18n--envsubst.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-send-pack.html git-send-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-rm.html git-rm.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-sh-i18n.html git-sh-i18n.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-sh-i18n--envsubst.html git-sh-i18n--envsubst.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-send-email.html git-send-email.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-sh-setup.html git-sh-setup.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-replay.html git-replay.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-send-email.html git-send-email.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-sh-setup.html git-sh-setup.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-shell.html git-shell.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-show-branch.html git-show-branch.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-replay.html git-replay.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-show-index.html git-show-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-rev-parse.html git-rev-parse.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-show-index.html git-show-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-show-branch.html git-show-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-stage.html git-stage.txt
@@ -5566,22 +5599,19 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-show-ref.html git-show-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-rev-list.html git-rev-list.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-stripspace.html git-stripspace.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-config.html git-config.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-shortlog.html git-shortlog.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-sparse-checkout.html git-sparse-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-stash.html git-stash.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-stripspace.html git-stripspace.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-sparse-checkout.html git-sparse-checkout.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-status.html git-status.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-status.html git-status.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-stash.html git-stash.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-unpack-file.html git-unpack-file.txt
@@ -5590,52 +5620,55 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-symbolic-ref.html git-symbolic-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-switch.html git-switch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-shortlog.html git-shortlog.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-tag.html git-tag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-submodule.html git-submodule.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-unpack-objects.html git-unpack-objects.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-rev-list.html git-rev-list.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-upload-archive.html git-upload-archive.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-switch.html git-switch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-update-server-info.html git-update-server-info.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-pack.html git-verify-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-update-ref.html git-update-ref.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-unpack-objects.html git-unpack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-tag.html git-tag.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-update-server-info.html git-update-server-info.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-var.html git-var.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-commit.html git-verify-commit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-show.html git-show.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-upload-pack.html git-upload-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-upload-archive.html git-upload-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-svn.html git-svn.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-version.html git-version.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-update-index.html git-update-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-commit.html git-verify-commit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-show.html git-show.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-upload-pack.html git-upload-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-tag.html git-verify-tag.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-update-ref.html git-update-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-version.html git-version.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-tag.html git-verify-tag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-pack.html git-verify-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-update-index.html git-update-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-web--browse.html git-web--browse.txt
@@ -5644,10 +5677,10 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-whatchanged.html git-whatchanged.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-write-tree.html git-write-tree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-svn.html git-svn.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitk.html gitk.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-write-tree.html git-write-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-bundle.html gitformat-bundle.txt
@@ -5656,118 +5689,121 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o scalar.html scalar.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-worktree.html git-worktree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitweb.html gitweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-chunk.html gitformat-chunk.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-index.html gitformat-index.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitk.html gitk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-commit-graph.html gitformat-commit-graph.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-signature.html gitformat-signature.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-chunk.html gitformat-chunk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-index.html gitformat-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git-worktree.html git-worktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitweb.html gitweb.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-signature.html gitformat-signature.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitignore.html gitignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitattributes.html gitattributes.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitmailmap.html gitmailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitmodules.html gitmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitmailmap.html gitmailmap.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-common.html gitprotocol-common.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-pack.html gitformat-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-capabilities.html gitprotocol-capabilities.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-capabilities.html gitprotocol-capabilities.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-pack.html gitformat-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-common.html gitprotocol-common.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitattributes.html gitattributes.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-http.html gitprotocol-http.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-pack.html gitprotocol-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o githooks.html githooks.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitcli.html gitcli.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-http.html gitprotocol-http.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-v2.html gitprotocol-v2.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitrepository-layout.html gitrepository-layout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitcredentials.html gitcredentials.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitcli.html gitcli.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git.html git.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-v2.html gitprotocol-v2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-pack.html gitprotocol-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitcvs-migration.html gitcvs-migration.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitrepository-layout.html gitrepository-layout.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitcredentials.html gitcredentials.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitdiffcore.html gitdiffcore.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o git.html git.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitcvs-migration.html gitcvs-migration.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitdiffcore.html gitdiffcore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitweb.conf.html gitweb.conf.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o giteveryday.html giteveryday.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitnamespaces.html gitnamespaces.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o giteveryday.html giteveryday.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitpacking.html gitpacking.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gittutorial-2.html gittutorial-2.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitweb.conf.html gitweb.conf.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitpacking.html gitpacking.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitfaq.html gitfaq.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gittutorial.html gittutorial.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitsubmodules.html gitsubmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitcore-tutorial.html gitcore-tutorial.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitrevisions.html gitrevisions.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitsubmodules.html gitsubmodules.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitcore-tutorial.html gitcore-tutorial.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitfaq.html gitfaq.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gittutorial-2.html gittutorial-2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 howto-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitremote-helpers.html gitremote-helpers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitrevisions.html gitrevisions.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/api-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 technical/api-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitglossary.html gitglossary.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitremote-helpers.html gitremote-helpers.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 howto-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitworkflows.html gitworkflows.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gitglossary.html gitglossary.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 -d manpage -o gittutorial.html gittutorial.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xsltproc --xinclude --stringparam html.stylesheet docbook-xsl.css --param generate.consistent.ids 1 -o user-manual.html docbook.xsl user-manual.xml
@@ -5776,19 +5812,19 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b xhtml11 SubmittingPatches.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-am.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-annotate.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-archimport.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -5800,16 +5836,13 @@
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-bundle.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -5818,13 +5851,16 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ignore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ref-format.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cat-file.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-checkout-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-ref-format.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -5833,10 +5869,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-cherry.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-citool.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clean.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clean.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-citool.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -5851,33 +5887,36 @@
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-clone.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-credential-cache--daemon.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-count-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-credential-store.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsexportcommit.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsexportcommit.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsserver.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -5887,22 +5926,19 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-daemon.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-fast-export.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-files.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-files.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -5911,58 +5947,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-diff-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fast-import.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-fsck-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-fsmonitor--daemon.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsmonitor--daemon.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-get-tar-commit-id.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-format-patch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-gui.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-get-tar-commit-id.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-gc.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-hash-object.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-backend.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-grep.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-grep.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-backend.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -5971,40 +6007,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-http-push.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-imap-send.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init-db.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-init.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init-db.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-index-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-interpret-trailers.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-remote.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-remote.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailsplit.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailinfo.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-config.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailsplit.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailinfo.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -6013,85 +6049,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-merge-base.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-maintenance.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-mktag.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-mktree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-mergetool.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-log.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-mv.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-name-rev.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-objects.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-notes.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-refs.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-p4.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-pack-refs.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-push.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-read-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-range-diff.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-read-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-refs.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote-fd.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -6100,19 +6139,19 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote-ext.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-reflog.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-remote.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-repack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-rebase.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-repack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-replace.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -6121,43 +6160,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-rerere.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-reset.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-rev-parse.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-send-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-setup.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-i18n.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-shell.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-sh-setup.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -6166,19 +6202,13 @@
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-shortlog.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -6190,28 +6220,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-stripspace.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-symbolic-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-stash.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-sparse-checkout.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-unpack-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-symbolic-ref.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-submodule.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-switch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-tag.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -6220,34 +6250,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-update-server-info.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-unpack-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-var.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-update-ref.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-pack.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-tag.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-whatchanged.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -6256,118 +6292,118 @@
 xmlto -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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 scalar.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitk.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitformat-bundle.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-bundle.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-chunk.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-signature.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitattributes.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-commit-graph.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmodules.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-signature.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitmailmap.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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 gitattributes.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitmodules.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 githooks.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitignore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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-capabilities.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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-common.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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-v2.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitrepository-layout.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitprotocol-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcli.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.conf.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 giteveryday.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcore-tutorial.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitnamespaces.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitsubmodules.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitremote-helpers.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitsubmodules.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitworkflows.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitremote-helpers.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial-2.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+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.47.2/Documentation'
 make[1]: Entering directory '/build/reproducible-path/git-2.47.2'
 # git-mediawiki
@@ -6919,176 +6955,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0017-env-helper.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0007-git-var.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0007-git-var/.git/
 expecting success of 0007.1 'get GIT_AUTHOR_IDENT': 
@@ -7126,41 +6992,9 @@
 	git var GIT_AUTHOR_IDENT
 
 )
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink03-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-expecting success of 0007.3 'requested identities are strict': 
-	(
-		sane_unset GIT_COMMITTER_NAME &&
-		sane_unset GIT_COMMITTER_EMAIL &&
-		test_must_fail git var GIT_COMMITTER_IDENT
-	)
-
-Committer identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink03-arm64.debian.net>) not allowed
-ok 3 - requested identities are strict
+second user <pbuilder2@codethink04-arm64.debian.net> 1112912053 -0700
+prerequisite AUTOIDENT ok
+ok 3 # skip requested identities are strict (missing !AUTOIDENT of !FAIL_PREREQS,!AUTOIDENT)
 
 expecting success of 0007.4 'get GIT_DEFAULT_BRANCH without configuration': 
 	(
@@ -7445,6 +7279,176 @@
 1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0017-env-helper.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0018-advice.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0018-advice/.git/
 expecting success of 0018.1 'advice should be printed when config variable is unset': 
@@ -7939,6 +7943,54 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0025-crlf-renormalize.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0025-crlf-renormalize/.git/
+expecting success of 0025.1 'setup': 
+	git config core.autocrlf false &&
+	printf "LINEONE\nLINETWO\nLINETHREE\n" >LF.txt &&
+	printf "LINEONE\r\nLINETWO\r\nLINETHREE\r\n" >CRLF.txt &&
+	printf "LINEONE\r\nLINETWO\nLINETHREE\n" >CRLF_mix_LF.txt &&
+	git add . &&
+	git commit -m initial
+
+[master (root-commit) 98c48e8] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 9 insertions(+)
+ create mode 100644 CRLF.txt
+ create mode 100644 CRLF_mix_LF.txt
+ create mode 100644 LF.txt
+ok 1 - setup
+
+expecting success of 0025.2 'renormalize CRLF in repo': 
+	echo "*.txt text=auto" >.gitattributes &&
+	git add --renormalize "*.txt" &&
+	cat >expect <<-\EOF &&
+	i/lf w/crlf attr/text=auto CRLF.txt
+	i/lf w/lf attr/text=auto LF.txt
+	i/lf w/mixed attr/text=auto CRLF_mix_LF.txt
+	EOF
+	git ls-files --eol >tmp &&
+	sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+	sort >actual &&
+	test_cmp expect actual
+
+ok 2 - renormalize CRLF in repo
+
+expecting success of 0025.3 'ignore-errors not mistaken for renormalize': 
+	git reset --hard &&
+	echo "*.txt text=auto" >.gitattributes &&
+	git ls-files --eol >expect &&
+	git add --ignore-errors "*.txt" &&
+	git ls-files --eol >actual &&
+	test_cmp expect actual
+
+HEAD is now at 98c48e8 initial
+ok 3 - ignore-errors not mistaken for renormalize
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0024-crlf-archive.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0024-crlf-archive/.git/
 expecting success of 0024.1 'setup': 
@@ -8031,52 +8083,110 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0025-crlf-renormalize.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0025-crlf-renormalize/.git/
-expecting success of 0025.1 'setup': 
-	git config core.autocrlf false &&
-	printf "LINEONE\nLINETWO\nLINETHREE\n" >LF.txt &&
-	printf "LINEONE\r\nLINETWO\r\nLINETHREE\r\n" >CRLF.txt &&
-	printf "LINEONE\r\nLINETWO\nLINETHREE\n" >CRLF_mix_LF.txt &&
-	git add . &&
-	git commit -m initial
+*** t0010-racy-git.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
 
-[master (root-commit) 98c48e8] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 9 insertions(+)
- create mode 100644 CRLF.txt
- create mode 100644 CRLF_mix_LF.txt
- create mode 100644 LF.txt
-ok 1 - setup
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 1 - Racy git trial #0 part A
 
-expecting success of 0025.2 'renormalize CRLF in repo': 
-	echo "*.txt text=auto" >.gitattributes &&
-	git add --renormalize "*.txt" &&
-	cat >expect <<-\EOF &&
-	i/lf w/crlf attr/text=auto CRLF.txt
-	i/lf w/lf attr/text=auto LF.txt
-	i/lf w/mixed attr/text=auto CRLF_mix_LF.txt
-	EOF
-	git ls-files --eol >tmp &&
-	sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-	sort >actual &&
-	test_cmp expect actual
+expecting success of 0010.2 'Racy git trial #0 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
 
-ok 2 - renormalize CRLF in repo
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 2 - Racy git trial #0 part B
 
-expecting success of 0025.3 'ignore-errors not mistaken for renormalize': 
-	git reset --hard &&
-	echo "*.txt text=auto" >.gitattributes &&
-	git ls-files --eol >expect &&
-	git add --ignore-errors "*.txt" &&
-	git ls-files --eol >actual &&
-	test_cmp expect actual
+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 &&
 
-HEAD is now at 98c48e8 initial
-ok 3 - ignore-errors not mistaken for renormalize
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 3 - Racy git trial #1 part A
 
-# passed all 3 test(s)
-1..3
+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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0026-eol-config.sh ***
@@ -9518,112 +9628,6 @@
 1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0010-racy-git.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0034-root-safe-directory.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0034-root-safe-directory/.git/
 1..0 # SKIP You must set env var GIT_TEST_ALLOW_SUDO=YES in order to run this test
@@ -11621,7 +11625,7 @@
 	expect_accepted_implicit -C outer-repo/bare-repo
 
 .
-07:55:04.590513 setup.c:1544                 | d0 | main                     | data         |     |  0.000703 |  0.000703 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+02:07:09.142487 setup.c:1544                 | d0 | main                     | data         |     |  0.000709 |  0.000709 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 2 - safe.bareRepository unset
 
 expecting success of 0035.3 'safe.bareRepository=all': 
@@ -11629,7 +11633,7 @@
 	expect_accepted_implicit -C outer-repo/bare-repo
 
 .
-07:55:04.625496 setup.c:1544                 | d0 | main                     | data         |     |  0.001096 |  0.001096 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+02:07:09.238334 setup.c:1544                 | d0 | main                     | data         |     |  0.000624 |  0.000624 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 3 - safe.bareRepository=all
 
 expecting success of 0035.4 'safe.bareRepository=explicit': 
@@ -11637,7 +11641,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-07:55:04.684599 setup.c:1544                 | d0 | main                     | data         |     |  0.000742 |  0.000742 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+02:07:09.359744 setup.c:1544                 | d0 | main                     | data         |     |  0.005113 |  0.005113 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/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': 
@@ -11649,7 +11653,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-07:55:04.803900 setup.c:1544                 | d0 | main                     | data         |     |  0.000697 |  0.000697 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+02:07:09.502769 setup.c:1544                 | d0 | main                     | data         |     |  0.000654 |  0.000654 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/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': 
@@ -11658,7 +11662,7 @@
 		-c safe.bareRepository=all
 
 .
-07:55:04.851296 setup.c:1544                 | d0 | main                     | data         |     |  0.000651 |  0.000651 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+02:07:09.670773 setup.c:1544                 | d0 | main                     | data         |     |  0.000628 |  0.000628 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/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': 
@@ -11670,7 +11674,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-07:55:04.939145 setup.c:1544                 | d0 | main                     | data         |     |  0.000702 |  0.000702 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+02:07:09.838020 setup.c:1544                 | d0 | main                     | data         |     |  0.000666 |  0.000666 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/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': 
@@ -11683,34 +11687,607 @@
 	expect_accepted_implicit -C outer-repo/.git
 
 .
-07:55:05.024612 setup.c:1544                 | d0 | main                     | data         |     |  0.000664 |  0.000664 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+02:07:09.973088 setup.c:1544                 | d0 | main                     | data         |     |  0.000748 |  0.000748 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
-07:55:05.077931 setup.c:1544                 | d0 | main                     | data         |     |  0.000679 |  0.000679 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+02:07:10.042455 setup.c:1544                 | d0 | main                     | data         |     |  0.000644 |  0.000644 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/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
 
 .
-07:55:05.137008 setup.c:1544                 | d0 | main                     | data         |     |  0.000703 |  0.000703 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/worktrees/outer-secondary
+02:07:10.105282 setup.c:1544                 | d0 | main                     | data         |     |  0.000699 |  0.000699 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/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
 
 .
-07:55:05.190066 setup.c:1544                 | d0 | main                     | data         |     |  0.000650 |  0.000650 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/modules/subn
+02:07:10.182539 setup.c:1544                 | d0 | main                     | data         |     |  0.000665 |  0.000665 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.47.2/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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0033-safe-directory.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/.git/
+expecting success of 0033.1 'safe.directory is not set': 
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
+ok 1 - safe.directory is not set
+
+expecting success of 0033.2 'safe.directory on the command line': 
+	git -c safe.directory="$(pwd)" status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 2 - safe.directory on the command line
+
+expecting success of 0033.3 'safe.directory in the environment': 
+	env GIT_CONFIG_COUNT=1 \
+	    GIT_CONFIG_KEY_0="safe.directory" \
+	    GIT_CONFIG_VALUE_0="$(pwd)" \
+	    git status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 3 - safe.directory in the environment
+
+expecting success of 0033.4 'safe.directory in GIT_CONFIG_PARAMETERS': 
+	env GIT_CONFIG_PARAMETERS="${SQ}safe.directory${SQ}=${SQ}$(pwd)${SQ}" \
+	    git status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 4 - safe.directory in GIT_CONFIG_PARAMETERS
+
+expecting success of 0033.5 'ignoring safe.directory in repo config': 
+	(
+		unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config safe.directory "$(pwd)"
+	) &&
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
+ok 5 - ignoring safe.directory in repo config
+
+expecting success of 0033.6 'safe.directory does not match': 
+	git config --global safe.directory bogus &&
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
+ok 6 - safe.directory does not match
+
+expecting success of 0033.7 'path exist as different key': 
+	git config --global foo.bar "$(pwd)" &&
+	expect_rejected_dir
+
+warning: safe.directory 'bogus' not absolute
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
+ok 7 - path exist as different key
+
+expecting success of 0033.8 'safe.directory matches': 
+	git config --global --add safe.directory "$(pwd)" &&
+	git status
+
+warning: safe.directory 'bogus' not absolute
+warning: safe.directory 'bogus' not absolute
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitconfig
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 8 - safe.directory matches
+
+expecting success of 0033.9 'safe.directory matches, but is reset': 
+	git config --global --add safe.directory "" &&
+	expect_rejected_dir
+
+warning: safe.directory 'bogus' not absolute
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
+ok 9 - safe.directory matches, but is reset
+
+expecting success of 0033.10 'safe.directory=*': 
+	git config --global --add safe.directory "*" &&
+	git status
+
+warning: safe.directory 'bogus' not absolute
+warning: safe.directory 'bogus' not absolute
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitconfig
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 10 - safe.directory=*
+
+expecting success of 0033.11 'safe.directory=*, but is reset': 
+	git config --global --add safe.directory "" &&
+	expect_rejected_dir
+
+warning: safe.directory 'bogus' not absolute
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
+ok 11 - safe.directory=*, but is reset
+
+expecting success of 0033.12 'safe.directory with matching glob': 
+	git config --global --unset-all safe.directory &&
+	p=$(pwd) &&
+	git config --global safe.directory "${p%/*}/*" &&
+	git status
+
+warning: safe.directory 'bogus' not absolute
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitconfig
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 12 - safe.directory with matching glob
+
+expecting success of 0033.13 'safe.directory with unmatching glob': 
+	git config --global --unset-all safe.directory &&
+	p=$(pwd) &&
+	git config --global safe.directory "${p%/*}no/*" &&
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
+ok 13 - safe.directory with unmatching glob
+
+expecting success of 0033.14 'safe.directory in included file': 
+	git config --global --unset-all safe.directory &&
+	cat >gitconfig-include <<-EOF &&
+	[safe]
+		directory = "$(pwd)"
+	EOF
+	git config --global --add include.path "$(pwd)/gitconfig-include" &&
+	git status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitconfig
+	err
+	gitconfig-include
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 14 - safe.directory in included file
+
+expecting success of 0033.15 'local clone of unowned repo refused in unsafe directory': 
+	test_when_finished "rm -rf source" &&
+	git init source &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit -C source initial
+	) &&
+	test_must_fail git clone --local source target &&
+	test_path_is_missing target
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into 'target'...
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git'
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 15 - local clone of unowned repo refused in unsafe directory
+
+expecting success of 0033.16 'local clone of unowned repo accepted in safe directory': 
+	test_when_finished "rm -rf source" &&
+	git init source &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit -C source initial
+	) &&
+	test_must_fail git clone --local source target &&
+	git config --global --add safe.directory "$(pwd)/source/.git" &&
+	git clone --local source target &&
+	test_path_is_dir target
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into 'target'...
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git'
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+Cloning into 'target'...
+done.
+ok 16 - local clone of unowned repo accepted in safe directory
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 0033.17 'checked paths are normalized': 
+	test_when_finished "rm -rf repository; rm -f repo" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	git init repository &&
+	ln -s repository repo &&
+	(
+		cd repository &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "$(pwd)/repository"
+	) &&
+	git -C repository for-each-ref &&
+	git -C repository/ for-each-ref &&
+	git -C repo for-each-ref &&
+	git -C repo/ for-each-ref &&
+	test_must_fail git -C repository/.git for-each-ref &&
+	test_must_fail git -C repository/.git/ for-each-ref &&
+	test_must_fail git -C repo/.git for-each-ref &&
+	test_must_fail git -C repo/.git/ for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+ok 17 - checked paths are normalized
+
+expecting success of 0033.18 'checked leading paths are normalized': 
+	test_when_finished "rm -rf repository; rm -f repo" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	mkdir -p repository &&
+	git init repository/s &&
+	ln -s repository repo &&
+	(
+		cd repository/s &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "$(pwd)/repository/*"
+	) &&
+	git -C repository/s for-each-ref &&
+	git -C repository/s/ for-each-ref &&
+	git -C repo/s for-each-ref &&
+	git -C repo/s/ for-each-ref &&
+	git -C repository/s/.git for-each-ref &&
+	git -C repository/s/.git/ for-each-ref &&
+	git -C repo/s/.git for-each-ref &&
+	git -C repo/s/.git/ for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/s/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+ok 18 - checked leading paths are normalized
+
+expecting success of 0033.19 'configured paths are normalized': 
+	test_when_finished "rm -rf repository; rm -f repo" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	git init repository &&
+	ln -s repository repo &&
+	(
+		cd repository &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "$(pwd)/repo"
+	) &&
+	git -C repository for-each-ref &&
+	git -C repository/ for-each-ref &&
+	git -C repo for-each-ref &&
+	git -C repo/ for-each-ref &&
+	test_must_fail git -C repository/.git for-each-ref &&
+	test_must_fail git -C repository/.git/ for-each-ref &&
+	test_must_fail git -C repo/.git for-each-ref &&
+	test_must_fail git -C repo/.git/ for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+ok 19 - configured paths are normalized
+
+expecting success of 0033.20 'configured leading paths are normalized': 
+	test_when_finished "rm -rf repository; rm -f repo" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	mkdir -p repository &&
+	git init repository/s &&
+	ln -s repository repo &&
+	(
+		cd repository/s &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "$(pwd)/repo/*"
+	) &&
+	git -C repository/s for-each-ref &&
+	git -C repository/s/ for-each-ref &&
+	git -C repository/s/.git for-each-ref &&
+	git -C repository/s/.git/ for-each-ref &&
+	git -C repo/s for-each-ref &&
+	git -C repo/s/ for-each-ref &&
+	git -C repo/s/.git for-each-ref &&
+	git -C repo/s/.git/ for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/s/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+ok 20 - configured leading paths are normalized
+
+expecting success of 0033.21 'safe.directory set to a dot': 
+	test_when_finished "rm -rf repository" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	mkdir -p repository/subdir &&
+	git init repository &&
+	(
+		cd repository &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "."
+	) &&
+	git -C repository for-each-ref &&
+	git -C repository/ for-each-ref &&
+	git -C repository/.git for-each-ref &&
+	git -C repository/.git/ for-each-ref &&
+
+	# What is allowed is repository/subdir but the repository
+	# path is repository.
+	test_must_fail git -C repository/subdir for-each-ref &&
+
+	# Likewise, repository .git/refs is allowed with "." but
+	# repository/.git that is accessed is not allowed.
+	test_must_fail git -C repository/.git/refs for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
+ok 21 - safe.directory set to a dot
+
+expecting success of 0033.22 'safe.directory set to asterisk': 
+	test_when_finished "rm -rf repository" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	mkdir -p repository/subdir &&
+	git init repository &&
+	(
+		cd repository &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "*"
+	) &&
+	# these are trivial
+	git -C repository for-each-ref &&
+	git -C repository/ for-each-ref &&
+	git -C repository/.git for-each-ref &&
+	git -C repository/.git/ for-each-ref &&
+
+	# With "*", everything is allowed, and the repository is
+	# discovered, which is different behaviour from "." above.
+	git -C repository/subdir for-each-ref &&
+
+	# Likewise.
+	git -C repository/.git/refs for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+ok 22 - safe.directory set to asterisk
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0028-working-tree-encoding.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0028-working-tree-encoding/.git/
 expecting success of 0028.1 'setup test files': 
@@ -12902,632 +13479,493 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0033-safe-directory.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/.git/
-expecting success of 0033.1 'safe.directory is not set': 
-	expect_rejected_dir
+*** t0030-stripspace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0030-stripspace/.git/
+expecting success of 0030.1 'long lines without spaces should be unchanged': 
+	echo "$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
-ok 1 - safe.directory is not set
+	echo "$ttt$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.2 'safe.directory on the command line': 
-	git -c safe.directory="$(pwd)" status
+	echo "$ttt$ttt$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-On branch master
+	echo "$ttt$ttt$ttt$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual
 
-No commits yet
+ok 1 - long lines without spaces should be unchanged
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
+expecting success of 0030.2 'lines with spaces at the beginning should be unchanged': 
+	echo "$sss$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 2 - safe.directory on the command line
+	echo "$sss$sss$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.3 'safe.directory in the environment': 
-	env GIT_CONFIG_COUNT=1 \
-	    GIT_CONFIG_KEY_0="safe.directory" \
-	    GIT_CONFIG_VALUE_0="$(pwd)" \
-	    git status
+	echo "$sss$sss$sss$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual
 
-On branch master
+ok 2 - lines with spaces at the beginning should be unchanged
 
-No commits yet
+expecting success of 0030.3 'lines with intermediate spaces should be unchanged': 
+	echo "$ttt$sss$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
+	echo "$ttt$sss$sss$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 3 - safe.directory in the environment
+ok 3 - lines with intermediate spaces should be unchanged
 
-expecting success of 0033.4 'safe.directory in GIT_CONFIG_PARAMETERS': 
-	env GIT_CONFIG_PARAMETERS="${SQ}safe.directory${SQ}=${SQ}$(pwd)${SQ}" \
-	    git status
+expecting success of 0030.4 'consecutive blank lines should be unified': 
+	printf "$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-On branch master
+	printf "$ttt$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-No commits yet
+	printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
+	printf "$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 4 - safe.directory in GIT_CONFIG_PARAMETERS
+	printf "$ttt\n\n$ttt$ttt\n" > expect &&
+	printf "$ttt\n\n\n\n\n$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.5 'ignoring safe.directory in repo config': 
-	(
-		unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config safe.directory "$(pwd)"
-	) &&
-	expect_rejected_dir
+	printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
+	printf "$ttt\n\n\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
-ok 5 - ignoring safe.directory in repo config
+	printf "$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.6 'safe.directory does not match': 
-	git config --global safe.directory bogus &&
-	expect_rejected_dir
+	printf "$ttt$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
-ok 6 - safe.directory does not match
+	printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt$ttt$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.7 'path exist as different key': 
-	git config --global foo.bar "$(pwd)" &&
-	expect_rejected_dir
+	printf "$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-warning: safe.directory 'bogus' not absolute
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
-ok 7 - path exist as different key
+	printf "$ttt\n\n$ttt$ttt\n" > expect &&
+	printf "$ttt\n\t\n \n\n  \t\t\n$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.8 'safe.directory matches': 
-	git config --global --add safe.directory "$(pwd)" &&
-	git status
+	printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
+	printf "$ttt\n\t\n \n\n  \t\t\n$ttt$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual
 
-warning: safe.directory 'bogus' not absolute
-warning: safe.directory 'bogus' not absolute
-On branch master
+ok 4 - consecutive blank lines should be unified
 
-No commits yet
+expecting success of 0030.5 'only consecutive blank lines should be completely removed': 
+	printf "\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitconfig
-	err
+	printf "\n\n\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 8 - safe.directory matches
+	printf "$sss\n$sss\n$sss\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-expecting success of 0033.9 'safe.directory matches, but is reset': 
-	git config --global --add safe.directory "" &&
-	expect_rejected_dir
+	printf "$sss$sss\n$sss\n\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-warning: safe.directory 'bogus' not absolute
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
-ok 9 - safe.directory matches, but is reset
+	printf "\n$sss\n$sss$sss\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-expecting success of 0033.10 'safe.directory=*': 
-	git config --global --add safe.directory "*" &&
-	git status
+	printf "$sss$sss$sss$sss\n\n\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-warning: safe.directory 'bogus' not absolute
-warning: safe.directory 'bogus' not absolute
-On branch master
+	printf "\n$sss$sss$sss$sss\n\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-No commits yet
+	printf "\n\n$sss$sss$sss$sss\n" | git stripspace >actual &&
+	test_must_be_empty actual
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitconfig
-	err
+ok 5 - only consecutive blank lines should be completely removed
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 10 - safe.directory=*
+expecting success of 0030.6 'consecutive blank lines at the beginning should be removed': 
+	printf "$ttt\n" > expect &&
+	printf "\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.11 'safe.directory=*, but is reset': 
-	git config --global --add safe.directory "" &&
-	expect_rejected_dir
+	printf "$ttt\n" > expect &&
+	printf "\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-warning: safe.directory 'bogus' not absolute
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
-ok 11 - safe.directory=*, but is reset
+	printf "$ttt$ttt\n" > expect &&
+	printf "\n\n\n$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.12 'safe.directory with matching glob': 
-	git config --global --unset-all safe.directory &&
-	p=$(pwd) &&
-	git config --global safe.directory "${p%/*}/*" &&
-	git status
+	printf "$ttt$ttt$ttt\n" > expect &&
+	printf "\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-warning: safe.directory 'bogus' not absolute
-On branch master
+	printf "$ttt$ttt$ttt$ttt\n" > expect &&
+	printf "\n\n\n$ttt$ttt$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-No commits yet
+	printf "$ttt\n" > expect &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitconfig
-	err
+	printf "$sss\n$sss\n$sss\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 12 - safe.directory with matching glob
+	printf "\n$sss\n$sss$sss\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.13 'safe.directory with unmatching glob': 
-	git config --global --unset-all safe.directory &&
-	p=$(pwd) &&
-	git config --global safe.directory "${p%/*}no/*" &&
-	expect_rejected_dir
+	printf "$sss$sss\n$sss\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory'
-ok 13 - safe.directory with unmatching glob
+	printf "$sss$sss$sss\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.14 'safe.directory in included file': 
-	git config --global --unset-all safe.directory &&
-	cat >gitconfig-include <<-EOF &&
-	[safe]
-		directory = "$(pwd)"
-	EOF
-	git config --global --add include.path "$(pwd)/gitconfig-include" &&
-	git status
+	printf "\n$sss$sss$sss\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-On branch master
+	printf "\n\n$sss$sss$sss\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual
 
-No commits yet
+ok 6 - consecutive blank lines at the beginning should be removed
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitconfig
-	err
-	gitconfig-include
+expecting success of 0030.7 'consecutive blank lines at the end should be removed': 
+	printf "$ttt\n" > expect &&
+	printf "$ttt\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 14 - safe.directory in included file
+	printf "$ttt\n" > expect &&
+	printf "$ttt\n\n\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.15 'local clone of unowned repo refused in unsafe directory': 
-	test_when_finished "rm -rf source" &&
-	git init source &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit -C source initial
-	) &&
-	test_must_fail git clone --local source target &&
-	test_path_is_missing target
+	printf "$ttt$ttt\n" > expect &&
+	printf "$ttt$ttt\n\n\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into 'target'...
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git'
-To add an exception for this directory, call:
+	printf "$ttt$ttt$ttt\n" > expect &&
+	printf "$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git'
-fatal: Could not read from remote repository.
+	printf "$ttt$ttt$ttt$ttt\n" > expect &&
+	printf "$ttt$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 15 - local clone of unowned repo refused in unsafe directory
+	printf "$ttt\n" > expect &&
 
-expecting success of 0033.16 'local clone of unowned repo accepted in safe directory': 
-	test_when_finished "rm -rf source" &&
-	git init source &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit -C source initial
-	) &&
-	test_must_fail git clone --local source target &&
-	git config --global --add safe.directory "$(pwd)/source/.git" &&
-	git clone --local source target &&
-	test_path_is_dir target
+	printf "$ttt\n$sss\n$sss\n$sss\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into 'target'...
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git'
-To add an exception for this directory, call:
+	printf "$ttt\n\n$sss\n$sss$sss\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/source/.git'
-fatal: Could not read from remote repository.
+	printf "$ttt\n$sss$sss\n$sss\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-Please make sure you have the correct access rights
-and the repository exists.
-Cloning into 'target'...
-done.
-ok 16 - local clone of unowned repo accepted in safe directory
+	printf "$ttt\n$sss$sss$sss\n\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-checking prerequisite: SYMLINKS
+	printf "$ttt\n\n$sss$sss$sss\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+	printf "$ttt\n\n\n$sss$sss$sss\n" | git stripspace >actual &&
+	test_cmp expect actual
 
-)
-prerequisite SYMLINKS ok
-expecting success of 0033.17 'checked paths are normalized': 
-	test_when_finished "rm -rf repository; rm -f repo" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	git init repository &&
-	ln -s repository repo &&
-	(
-		cd repository &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
+ok 7 - consecutive blank lines at the end should be removed
 
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "$(pwd)/repository"
-	) &&
-	git -C repository for-each-ref &&
-	git -C repository/ for-each-ref &&
-	git -C repo for-each-ref &&
-	git -C repo/ for-each-ref &&
-	test_must_fail git -C repository/.git for-each-ref &&
-	test_must_fail git -C repository/.git/ for-each-ref &&
-	test_must_fail git -C repo/.git for-each-ref &&
-	test_must_fail git -C repo/.git/ for-each-ref
+expecting success of 0030.8 'text without newline at end should end with newline': 
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$ttt"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
+ok 8 - text without newline at end should end with newline
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
+expecting success of 0030.9 'text plus spaces without newline at end should end with newline': 
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$sss" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss$sss" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss$sss"
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
+ok 9 - text plus spaces without newline at end should end with newline
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
+expecting success of 0030.10 'text plus spaces without newline at end should not show spaces': 
+	printf "$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	printf "$ttt$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	printf "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	printf "$ttt$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	printf "$ttt$ttt$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	printf "$ttt$sss$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-ok 17 - checked paths are normalized
+ok 10 - text plus spaces without newline at end should not show spaces
 
-expecting success of 0033.18 'checked leading paths are normalized': 
-	test_when_finished "rm -rf repository; rm -f repo" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	mkdir -p repository &&
-	git init repository/s &&
-	ln -s repository repo &&
-	(
-		cd repository/s &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
+expecting success of 0030.11 'text plus spaces without newline should show the correct lines': 
+	printf "$ttt\n" >expect &&
+	printf "$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "$(pwd)/repository/*"
-	) &&
-	git -C repository/s for-each-ref &&
-	git -C repository/s/ for-each-ref &&
-	git -C repo/s for-each-ref &&
-	git -C repo/s/ for-each-ref &&
-	git -C repository/s/.git for-each-ref &&
-	git -C repository/s/.git/ for-each-ref &&
-	git -C repo/s/.git for-each-ref &&
-	git -C repo/s/.git/ for-each-ref
+	printf "$ttt\n" >expect &&
+	printf "$ttt$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/s/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-ok 18 - checked leading paths are normalized
+	printf "$ttt\n" >expect &&
+	printf "$ttt$sss$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.19 'configured paths are normalized': 
-	test_when_finished "rm -rf repository; rm -f repo" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	git init repository &&
-	ln -s repository repo &&
-	(
-		cd repository &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
+	printf "$ttt$ttt\n" >expect &&
+	printf "$ttt$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "$(pwd)/repo"
-	) &&
-	git -C repository for-each-ref &&
-	git -C repository/ for-each-ref &&
-	git -C repo for-each-ref &&
-	git -C repo/ for-each-ref &&
-	test_must_fail git -C repository/.git for-each-ref &&
-	test_must_fail git -C repository/.git/ for-each-ref &&
-	test_must_fail git -C repo/.git for-each-ref &&
-	test_must_fail git -C repo/.git/ for-each-ref
+	printf "$ttt$ttt\n" >expect &&
+	printf "$ttt$ttt$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
+	printf "$ttt$ttt$ttt\n" >expect &&
+	printf "$ttt$ttt$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
+ok 11 - text plus spaces without newline should show the correct lines
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
+expecting success of 0030.12 'text plus spaces at end should not show spaces': 
+	echo "$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	echo "$ttt$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	echo "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	echo "$ttt$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	echo "$ttt$ttt$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	echo "$ttt$sss$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
+ok 12 - text plus spaces at end should not show spaces
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-ok 19 - configured paths are normalized
+expecting success of 0030.13 'text plus spaces at end should be cleaned and newline must remain': 
+	echo "$ttt" >expect &&
+	echo "$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.20 'configured leading paths are normalized': 
-	test_when_finished "rm -rf repository; rm -f repo" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	mkdir -p repository &&
-	git init repository/s &&
-	ln -s repository repo &&
-	(
-		cd repository/s &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
+	echo "$ttt" >expect &&
+	echo "$ttt$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "$(pwd)/repo/*"
-	) &&
-	git -C repository/s for-each-ref &&
-	git -C repository/s/ for-each-ref &&
-	git -C repository/s/.git for-each-ref &&
-	git -C repository/s/.git/ for-each-ref &&
-	git -C repo/s for-each-ref &&
-	git -C repo/s/ for-each-ref &&
-	git -C repo/s/.git for-each-ref &&
-	git -C repo/s/.git/ for-each-ref
+	echo "$ttt" >expect &&
+	echo "$ttt$sss$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/s/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-ok 20 - configured leading paths are normalized
+	echo "$ttt$ttt" >expect &&
+	echo "$ttt$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0033.21 'safe.directory set to a dot': 
-	test_when_finished "rm -rf repository" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	mkdir -p repository/subdir &&
-	git init repository &&
-	(
-		cd repository &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
+	echo "$ttt$ttt" >expect &&
+	echo "$ttt$ttt$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "."
-	) &&
-	git -C repository for-each-ref &&
-	git -C repository/ for-each-ref &&
-	git -C repository/.git for-each-ref &&
-	git -C repository/.git/ for-each-ref &&
+	echo "$ttt$ttt$ttt" >expect &&
+	echo "$ttt$ttt$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual
 
-	# What is allowed is repository/subdir but the repository
-	# path is repository.
-	test_must_fail git -C repository/subdir for-each-ref &&
+ok 13 - text plus spaces at end should be cleaned and newline must remain
 
-	# Likewise, repository .git/refs is allowed with "." but
-	# repository/.git that is accessed is not allowed.
-	test_must_fail git -C repository/.git/refs for-each-ref
+expecting success of 0030.14 'spaces with newline at end should be replaced with empty string': 
+	echo | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository'
-To add an exception for this directory, call:
+	echo "$sss" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
+	echo "$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-	git config --global --add safe.directory '/build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git'
-ok 21 - safe.directory set to a dot
+	echo "$sss$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-expecting success of 0033.22 'safe.directory set to asterisk': 
-	test_when_finished "rm -rf repository" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	mkdir -p repository/subdir &&
-	git init repository &&
-	(
-		cd repository &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
+	echo "$sss$sss$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual
 
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "*"
-	) &&
-	# these are trivial
-	git -C repository for-each-ref &&
-	git -C repository/ for-each-ref &&
-	git -C repository/.git for-each-ref &&
-	git -C repository/.git/ for-each-ref &&
+ok 14 - spaces with newline at end should be replaced with empty string
 
-	# With "*", everything is allowed, and the repository is
-	# discovered, which is different behaviour from "." above.
-	git -C repository/subdir for-each-ref &&
+expecting success of 0030.15 'spaces without newline at end should not show spaces': 
+	printf "" | git stripspace >tmp &&
+	! grep " " tmp >/dev/null &&
+	printf "$sss" | git stripspace >tmp &&
+	! grep " " tmp >/dev/null &&
+	printf "$sss$sss" | git stripspace >tmp &&
+	! grep " " tmp >/dev/null &&
+	printf "$sss$sss$sss" | git stripspace >tmp &&
+	! grep " " tmp >/dev/null &&
+	printf "$sss$sss$sss$sss" | git stripspace >tmp &&
+	! grep " " tmp >/dev/null
 
-	# Likewise.
-	git -C repository/.git/refs for-each-ref
+ok 15 - spaces without newline at end should not show spaces
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0033-safe-directory/repository/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-ok 22 - safe.directory set to asterisk
+expecting success of 0030.16 'spaces without newline at end should be replaced with empty string': 
+	printf "" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0051-windows-named-pipe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0051-windows-named-pipe/.git/
-1..0 # SKIP skipping Windows-specific tests
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0055-beyond-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0055-beyond-symlinks/.git/
-checking prerequisite: SYMLINKS
+	printf "$sss$sss" | git stripspace >actual &&
+	test_must_be_empty 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
+	printf "$sss$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-)
-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
+	printf "$sss$sss$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual
 
-ok 1 - setup
+ok 16 - spaces without newline at end should be replaced with empty string
 
-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 &&
+expecting success of 0030.17 'consecutive text lines should be unchanged': 
+	printf "$ttt$ttt\n$ttt\n" >expect &&
+	printf "$ttt$ttt\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
+
+	printf "$ttt\n$ttt$ttt\n$ttt\n" >expect &&
+	printf "$ttt\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
+
+	printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" >expect &&
+	printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
+
+	printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" >expect &&
+	printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
+
+	printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" >expect &&
+	printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
+
+	printf "$ttt\n$ttt$ttt\n\n$ttt\n" >expect &&
+	printf "$ttt\n$ttt$ttt\n\n$ttt\n" | git stripspace >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
+ok 17 - consecutive text lines should be unchanged
 
-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 &&
+expecting success of 0030.18 'strip comments, too': 
+	test ! -z "$(echo "# comment" | git stripspace)" &&
+	test -z "$(echo "# comment" | git stripspace -s)"
+
+ok 18 - strip comments, too
+
+expecting success of 0030.19 'strip comments with changed comment char': 
+	test ! -z "$(echo "; comment" | git -c core.commentchar=";" stripspace)" &&
+	test -z "$(echo "; comment" | git -c core.commentchar=";" stripspace -s)"
+
+ok 19 - strip comments with changed comment char
+
+expecting success of 0030.20 'strip comments with changed comment string': 
+	test ! -z "$(echo "// comment" | git -c core.commentchar=// stripspace)" &&
+	test -z "$(echo "// comment" | git -c core.commentchar="//" stripspace -s)"
+
+ok 20 - strip comments with changed comment string
+
+expecting success of 0030.21 'newline as commentchar is forbidden': 
+	test_must_fail git -c core.commentChar="$LF" stripspace -s 2>err &&
+	grep "core.commentchar cannot contain newline" err
+
+error: core.commentchar cannot contain newline
+ok 21 - newline as commentchar is forbidden
+
+expecting success of 0030.22 'empty commentchar is forbidden': 
+	test_must_fail git -c core.commentchar= stripspace -s 2>err &&
+	grep "core.commentchar must have at least one character" err
+
+error: core.commentchar must have at least one character
+ok 22 - empty commentchar is forbidden
+
+expecting success of 0030.23 '-c with single line': 
+	printf "# foo\n" >expect &&
+	printf "foo" | git stripspace -c >actual &&
 	test_cmp expect actual
 
-fatal: pathspec 'c/d' is beyond a symbolic link
-ok 3 - add beyond symlinks
+ok 23 - -c with single line
 
-# passed all 3 test(s)
-1..3
+expecting success of 0030.24 '-c with single line followed by empty line': 
+	printf "# foo\n#\n" >expect &&
+	printf "foo\n\n" | git stripspace -c >actual &&
+	test_cmp expect actual
+
+ok 24 - -c with single line followed by empty line
+
+expecting success of 0030.25 '-c with newline only': 
+	printf "#\n" >expect &&
+	printf "\n" | git stripspace -c >actual &&
+	test_cmp expect actual
+
+ok 25 - -c with newline only
+
+expecting success of 0030.26 '--comment-lines with single line': 
+	printf "# foo\n" >expect &&
+	printf "foo" | git stripspace -c >actual &&
+	test_cmp expect actual
+
+ok 26 - --comment-lines with single line
+
+expecting success of 0030.27 '-c with changed comment char': 
+	printf "; foo\n" >expect &&
+	printf "foo" | git -c core.commentchar=";" stripspace -c >actual &&
+	test_cmp expect actual
+
+ok 27 - -c with changed comment char
+
+expecting success of 0030.28 '-c with comment char defined in .git/config': 
+	test_config core.commentchar = &&
+	printf "= foo\n" >expect &&
+	rm -fr sub &&
+	mkdir sub &&
+	printf "foo" | git -C sub stripspace -c >actual &&
+	test_cmp expect actual
+
+ok 28 - -c with comment char defined in .git/config
+
+expecting success of 0030.29 '-c outside git repository': 
+	printf "# foo\n" >expect &&
+	printf "foo" | nongit git stripspace -c >actual &&
+	test_cmp expect actual
+
+ok 29 - -c outside git repository
+
+expecting success of 0030.30 'avoid SP-HT sequence in commented line': 
+	printf "#\tone\n#\n# two\n" >expect &&
+	printf "\tone\n\ntwo\n" | git stripspace -c >actual &&
+	test_cmp expect actual
+
+ok 30 - avoid SP-HT sequence in commented line
+
+# passed all 30 test(s)
+1..30
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0051-windows-named-pipe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0051-windows-named-pipe/.git/
+1..0 # SKIP skipping Windows-specific tests
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0050-filesystem.sh ***
@@ -13689,488 +14127,1004 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0030-stripspace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0030-stripspace/.git/
-expecting success of 0030.1 'long lines without spaces should be unchanged': 
-	echo "$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual &&
+*** t0055-beyond-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0055-beyond-symlinks/.git/
+checking prerequisite: SYMLINKS
 
-	echo "$ttt$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-	echo "$ttt$ttt$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual &&
+)
+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
 
-	echo "$ttt$ttt$ttt$ttt" >expect &&
-	git stripspace <expect >actual &&
+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
 
-ok 1 - long lines without spaces should be unchanged
+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 0030.2 'lines with spaces at the beginning should be unchanged': 
-	echo "$sss$ttt" >expect &&
-	git stripspace <expect >actual &&
+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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0056-git-C.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0056-git-C/.git/
+expecting success of 0056.1 '"git -C <path>" runs git from the directory <path>': 
+	test_create_repo dir1 &&
+	echo 1 >dir1/a.txt &&
+	msg="initial in dir1" &&
+	(cd dir1 && git add a.txt && git commit -m "$msg") &&
+	echo "$msg" >expected &&
+	git -C dir1 log --format=%s >actual &&
+	test_cmp expected actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0056-git-C/dir1/.git/
+[master (root-commit) 4efbfb5] initial in dir1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.txt
+ok 1 - "git -C <path>" runs git from the directory <path>
+
+expecting success of 0056.2 '"git -C <path>" with an empty <path> is a no-op': 
+	(
+		mkdir -p dir1/subdir &&
+		cd dir1/subdir &&
+		git -C "" rev-parse --show-prefix >actual &&
+		echo subdir/ >expect &&
+		test_cmp expect actual
+	)
+
+ok 2 - "git -C <path>" with an empty <path> is a no-op
+
+expecting success of 0056.3 'Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"': 
+	test_create_repo dir1/dir2 &&
+	echo 1 >dir1/dir2/b.txt &&
+	git -C dir1/dir2 add b.txt &&
+	msg="initial in dir1/dir2" &&
+	echo "$msg" >expected &&
+	git -C dir1/dir2 commit -m "$msg" &&
+	git -C dir1 -C dir2 log --format=%s >actual &&
+	test_cmp expected actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0056-git-C/dir1/dir2/.git/
+[master (root-commit) ea3acc3] initial in dir1/dir2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.txt
+ok 3 - Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"
+
+expecting success of 0056.4 'Effect on --git-dir option: "-C c --git-dir=a.git" is equivalent to "--git-dir c/a.git"': 
+	mkdir c &&
+	mkdir c/a &&
+	mkdir c/a.git &&
+	(cd c/a.git && git init --bare) &&
+	echo 1 >c/a/a.txt &&
+	git --git-dir c/a.git --work-tree=c/a add a.txt &&
+	git --git-dir c/a.git --work-tree=c/a commit -m "initial" &&
+	git --git-dir=c/a.git log -1 --format=%s >expected &&
+	git -C c --git-dir=a.git log -1 --format=%s >actual &&
+	test_cmp expected actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0056-git-C/c/a.git/
+[master (root-commit) cac529a] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.txt
+ok 4 - Effect on --git-dir option: "-C c --git-dir=a.git" is equivalent to "--git-dir c/a.git"
+
+expecting success of 0056.5 'Order should not matter: "--git-dir=a.git -C c" is equivalent to "-C c --git-dir=a.git"': 
+	git -C c --git-dir=a.git log -1 --format=%s >expected &&
+	git --git-dir=a.git -C c log -1 --format=%s >actual &&
+	test_cmp expected actual
+
+ok 5 - Order should not matter: "--git-dir=a.git -C c" is equivalent to "-C c --git-dir=a.git"
+
+expecting success of 0056.6 'Effect on --work-tree option: "-C c/a.git --work-tree=../a"  is equivalent to "--work-tree=c/a --git-dir=c/a.git"': 
+	rm c/a/a.txt &&
+	git --git-dir=c/a.git --work-tree=c/a status >expected &&
+	git -C c/a.git --work-tree=../a status >actual &&
+	test_cmp expected actual
+
+ok 6 - Effect on --work-tree option: "-C c/a.git --work-tree=../a"  is equivalent to "--work-tree=c/a --git-dir=c/a.git"
+
+expecting success of 0056.7 'Order should not matter: "--work-tree=../a -C c/a.git" is equivalent to "-C c/a.git --work-tree=../a"': 
+	git -C c/a.git --work-tree=../a status >expected &&
+	git --work-tree=../a -C c/a.git status >actual &&
+	test_cmp expected actual
+
+ok 7 - Order should not matter: "--work-tree=../a -C c/a.git" is equivalent to "-C c/a.git --work-tree=../a"
+
+expecting success of 0056.8 'Effect on --git-dir and --work-tree options - "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=c/a.git --work-tree=c/a"': 
+	git --git-dir=c/a.git --work-tree=c/a status >expected &&
+	git -C c --git-dir=a.git --work-tree=a status >actual &&
+	test_cmp expected actual
+
+ok 8 - Effect on --git-dir and --work-tree options - "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=c/a.git --work-tree=c/a"
+
+expecting success of 0056.9 'Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git -C c --work-tree=a"': 
+	git -C c --git-dir=a.git --work-tree=a status >expected &&
+	git --git-dir=a.git -C c --work-tree=a status >actual &&
+	test_cmp expected actual
+
+ok 9 - Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git -C c --work-tree=a"
+
+expecting success of 0056.10 'Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git --work-tree=a -C c"': 
+	git -C c --git-dir=a.git --work-tree=a status >expected &&
+	git --git-dir=a.git --work-tree=a -C c status >actual &&
+	test_cmp expected actual
+
+ok 10 - Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git --work-tree=a -C c"
+
+expecting success of 0056.11 'Relative followed by fullpath: "-C ./here -C /there" is equivalent to "-C /there"': 
+	echo "initial in dir1/dir2" >expected &&
+	git -C dir1 -C "$(pwd)/dir1/dir2" log --format=%s >actual &&
+	test_cmp expected actual
+
+ok 11 - Relative followed by fullpath: "-C ./here -C /there" is equivalent to "-C /there"
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0062-revision-walking.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0040-parse-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0040-parse-options/.git/
+expecting success of 0040.1 'test help': 
+	test_must_fail test-tool parse-options -h >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 1 - test help
+
+expecting success of 0040.2 'OPT_BOOL() #1': check boolean: 1 --yes
+ok 2 - OPT_BOOL() #1
+
+expecting success of 0040.3 'OPT_BOOL() #2': check boolean: 1 --no-doubt
+ok 3 - OPT_BOOL() #2
+
+expecting success of 0040.4 'OPT_BOOL() #3': check boolean: 1 -D
+ok 4 - OPT_BOOL() #3
+
+expecting success of 0040.5 'OPT_BOOL() #4': check boolean: 1 --no-fear
+ok 5 - OPT_BOOL() #4
+
+expecting success of 0040.6 'OPT_BOOL() #5': check boolean: 1 -B
+ok 6 - OPT_BOOL() #5
+
+expecting success of 0040.7 'OPT_BOOL() is idempotent #1': check boolean: 1 --yes --yes
+ok 7 - OPT_BOOL() is idempotent #1
+
+expecting success of 0040.8 'OPT_BOOL() is idempotent #2': check boolean: 1 -DB
+ok 8 - OPT_BOOL() is idempotent #2
+
+expecting success of 0040.9 'OPT_BOOL() negation #1': check boolean: 0 -D --no-yes
+ok 9 - OPT_BOOL() negation #1
+
+expecting success of 0040.10 'OPT_BOOL() negation #2': check boolean: 0 -D --no-no-doubt
+ok 10 - OPT_BOOL() negation #2
+
+expecting success of 0040.11 'OPT_BOOL() no negation #1': check_unknown_i18n --fear
+ok 11 - OPT_BOOL() no negation #1
+
+expecting success of 0040.12 'OPT_BOOL() no negation #2': check_unknown_i18n --no-no-fear
+ok 12 - OPT_BOOL() no negation #2
+
+expecting success of 0040.13 'OPT_BOOL() positivation': check boolean: 0 -D --doubt
+ok 13 - OPT_BOOL() positivation
+
+expecting success of 0040.14 'OPT_INT() negative': check integer: -2345 -i -2345
+ok 14 - OPT_INT() negative
+
+expecting success of 0040.15 'OPT_MAGNITUDE() simple': 
+	check magnitude: 2345678 -m 2345678
+
+ok 15 - OPT_MAGNITUDE() simple
+
+expecting success of 0040.16 'OPT_MAGNITUDE() kilo': 
+	check magnitude: 239616 -m 234k
+
+ok 16 - OPT_MAGNITUDE() kilo
+
+expecting success of 0040.17 'OPT_MAGNITUDE() mega': 
+	check magnitude: 104857600 -m 100m
+
+ok 17 - OPT_MAGNITUDE() mega
+
+expecting success of 0040.18 'OPT_MAGNITUDE() giga': 
+	check magnitude: 1073741824 -m 1g
+
+ok 18 - OPT_MAGNITUDE() giga
+
+expecting success of 0040.19 'OPT_MAGNITUDE() 3giga': 
+	check magnitude: 3221225472 -m 3g
+
+ok 19 - OPT_MAGNITUDE() 3giga
+
+expecting success of 0040.20 'short options': 
+	test-tool parse-options -s123 -b -i 1729 -m 16k -b -vv -n -F my.file \
+	>output 2>output.err &&
+	test_cmp expect output &&
+	test_must_be_empty output.err
+
+ok 20 - short options
+
+expecting success of 0040.21 'long options': 
+	test-tool parse-options --boolean --integer 1729 --magnitude 16k \
+		--boolean --string2=321 --verbose --verbose --no-dry-run \
+		--abbrev=10 --file fi.le --obsolete \
+		>output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 21 - long options
+
+expecting success of 0040.22 'abbreviate to something longer than SHA1 length': 
+	cat >expect <<-EOF &&
+	boolean: 0
+	integer: 0
+	magnitude: 0
+	timestamp: 0
+	string: (not set)
+	abbrev: 100
+	verbose: -1
+	quiet: 0
+	dry run: no
+	file: (not set)
+	EOF
+	test-tool parse-options --abbrev=100 >output &&
+	test_cmp expect output
+
+ok 22 - abbreviate to something longer than SHA1 length
+
+expecting success of 0040.23 'missing required value': 
+	cat >expect <<-\EOF &&
+	error: switch `s' requires a value
+	EOF
+	test_expect_code 129 test-tool parse-options -s 2>actual &&
 	test_cmp expect actual &&
 
-	echo "$sss$sss$ttt" >expect &&
-	git stripspace <expect >actual &&
+	cat >expect <<-\EOF &&
+	error: option `string' requires a value
+	EOF
+	test_expect_code 129 test-tool parse-options --string 2>actual &&
 	test_cmp expect actual &&
 
-	echo "$sss$sss$sss$ttt" >expect &&
-	git stripspace <expect >actual &&
+	cat >expect <<-\EOF &&
+	error: option `file' requires a value
+	EOF
+	test_expect_code 129 test-tool parse-options --file 2>actual &&
 	test_cmp expect actual
 
-ok 2 - lines with spaces at the beginning should be unchanged
+ok 23 - missing required value
 
-expecting success of 0030.3 'lines with intermediate spaces should be unchanged': 
-	echo "$ttt$sss$ttt" >expect &&
-	git stripspace <expect >actual &&
+expecting success of 0040.24 'superfluous value provided: boolean': 
+	cat >expect <<-\EOF &&
+	error: option `yes' takes no value
+	EOF
+	test_expect_code 129 test-tool parse-options --yes=hi 2>actual &&
 	test_cmp expect actual &&
 
-	echo "$ttt$sss$sss$ttt" >expect &&
-	git stripspace <expect >actual &&
+	cat >expect <<-\EOF &&
+	error: option `no-yes' takes no value
+	EOF
+	test_expect_code 129 test-tool parse-options --no-yes=hi 2>actual &&
 	test_cmp expect actual
 
-ok 3 - lines with intermediate spaces should be unchanged
+ok 24 - superfluous value provided: boolean
 
-expecting success of 0030.4 'consecutive blank lines should be unified': 
-	printf "$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+expecting success of 0040.25 'superfluous value provided: boolean, abbreviated': 
+	cat >expect <<-\EOF &&
+	error: option `yes' takes no value
+	EOF
+	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --ye=hi 2>actual &&
 	test_cmp expect actual &&
 
-	printf "$ttt$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+	cat >expect <<-\EOF &&
+	error: option `no-yes' takes no value
+	EOF
+	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --no-ye=hi 2>actual &&
+	test_cmp expect actual
 
-	printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 25 - superfluous value provided: boolean, abbreviated
 
-	printf "$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.26 'superfluous value provided: cmdmode': 
+	cat >expect <<-\EOF &&
+	error: option `mode1' takes no value
+	EOF
+	test_expect_code 129 test-tool parse-options --mode1=hi 2>actual &&
+	test_cmp expect actual
 
-	printf "$ttt\n\n$ttt$ttt\n" > expect &&
-	printf "$ttt\n\n\n\n\n$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 26 - superfluous value provided: cmdmode
 
-	printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
-	printf "$ttt\n\n\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.27 'intermingled arguments': 
+	test-tool parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
+		>output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
 
-	printf "$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 27 - intermingled arguments
 
-	printf "$ttt$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.28 'unambiguously abbreviated option': 
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --int 2 --boolean --no-bo >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
 
-	printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt$ttt$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 28 - unambiguously abbreviated option
 
-	printf "$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.29 'unambiguously abbreviated option with "="': 
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --expect="integer: 2" --int=2
 
-	printf "$ttt\n\n$ttt$ttt\n" > expect &&
-	printf "$ttt\n\t\n \n\n  \t\t\n$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 29 - unambiguously abbreviated option with "="
 
-	printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
-	printf "$ttt\n\t\n \n\n  \t\t\n$ttt$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual
+expecting success of 0040.30 'ambiguously abbreviated option': 
+	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --strin 123
 
-ok 4 - consecutive blank lines should be unified
+error: ambiguous option: strin (could be --string or --string2)
+usage: test-tool parse-options <options>
 
-expecting success of 0030.5 'only consecutive blank lines should be completely removed': 
-	printf "\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
+    A helper function for the parse-options API.
 
-	printf "\n\n\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
+    --[no-]yes            get a boolean
+    -D, --no-doubt        begins with 'no-'
+    --doubt               opposite of --no-doubt
+    -B, --no-fear         be brave
+    -b, --[no-]boolean    increment by one
+    -4, --[no-]or4        bitwise-or boolean with ...0100
+    --[no-]neg-or4        same as --no-or4
 
-	printf "$sss\n$sss\n$sss\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
+    -i, --[no-]integer <n>
+                          get a integer
+    -j <n>                get a integer, too
+    -m, --magnitude <n>   get a magnitude
+    --[no-]set23          set integer to 23
+    --mode1               set integer to 1 (cmdmode option)
+    --mode2               set integer to 2 (cmdmode option)
+    --[no-]mode34 (3|4)   set integer to 3 or 4 (cmdmode option)
+    -L, --[no-]length <str>
+                          get length of <str>
+    -F, --[no-]file <file>
+                          set file to <file>
 
-	printf "$sss$sss\n$sss\n\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
+String options
+    -s, --[no-]string <string>
+                          get a string
+    --[no-]string2 <str>  get another string
+    --[no-]st <st>        get another string (pervert ordering)
+    -o <str>              get another string
+    --longhelp            help text of this entry
+                          spans multiple lines
+    --[no-]list <str>     add str to list
 
-	printf "\n$sss\n$sss$sss\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
+Magic arguments
+    -NUM                  set integer to NUM
+    +                     same as -b
+    --ambiguous           positive ambiguity
+    --no-ambiguous        negative ambiguity
 
-	printf "$sss$sss$sss$sss\n\n\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
+Standard options
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+    -v, --[no-]verbose    be verbose
+    -n, --[no-]dry-run    dry run
+    -q, --[no-]quiet      be quiet
+    --[no-]expect <string>
+                          expected output in the variable dump
 
-	printf "\n$sss$sss$sss$sss\n\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
+Alias
+    -A, --[no-]alias-source <string>
+                          get a string
+    -Z, --[no-]alias-target <string>
+                          alias of --alias-source
 
-	printf "\n\n$sss$sss$sss$sss\n" | git stripspace >actual &&
-	test_must_be_empty actual
+ok 30 - ambiguously abbreviated option
 
-ok 5 - only consecutive blank lines should be completely removed
+expecting success of 0040.31 'non ambiguous option (after two options it abbreviates)': 
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --expect="string: 123" --st 123
 
-expecting success of 0030.6 'consecutive blank lines at the beginning should be removed': 
-	printf "$ttt\n" > expect &&
-	printf "\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 31 - non ambiguous option (after two options it abbreviates)
 
-	printf "$ttt\n" > expect &&
-	printf "\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.32 'Alias options do not contribute to abbreviation': 
+	test-tool parse-options --alias-source 123 >output &&
+	grep "^string: 123" output &&
+	test-tool parse-options --alias-target 123 >output &&
+	grep "^string: 123" output &&
+	test_must_fail test-tool parse-options --alias &&
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --alias 123 >output &&
+	grep "^string: 123" output
 
-	printf "$ttt$ttt\n" > expect &&
-	printf "\n\n\n$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+string: 123
+string: 123
+fatal: disallowed abbreviated or ambiguous option 'alias'
+string: 123
+ok 32 - Alias options do not contribute to abbreviation
 
-	printf "$ttt$ttt$ttt\n" > expect &&
-	printf "\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.33 'detect possible typos': 
+	test_must_fail test-tool parse-options -boolean >output 2>output.err &&
+	test_must_be_empty output &&
+	test_cmp typo.err output.err
 
-	printf "$ttt$ttt$ttt$ttt\n" > expect &&
-	printf "\n\n\n$ttt$ttt$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 33 - detect possible typos
 
-	printf "$ttt\n" > expect &&
+expecting success of 0040.34 'detect possible typos': 
+	test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
+	test_must_be_empty output &&
+	test_cmp typo.err output.err
 
-	printf "$sss\n$sss\n$sss\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 34 - detect possible typos
 
-	printf "\n$sss\n$sss$sss\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.35 'OPT_CALLBACK() and OPT_BIT() work': 
+	test-tool parse-options --length=four -b -4 >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
 
-	printf "$sss$sss\n$sss\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 35 - OPT_CALLBACK() and OPT_BIT() work
 
-	printf "$sss$sss$sss\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.36 'OPT_CALLBACK() and callback errors work': 
+	test_must_fail test-tool parse-options --no-length >output 2>output.err &&
+	test_must_be_empty output &&
+	test_must_be_empty output.err
 
-	printf "\n$sss$sss$sss\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 36 - OPT_CALLBACK() and callback errors work
 
-	printf "\n\n$sss$sss$sss\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual
+expecting success of 0040.37 'OPT_BIT() and OPT_SET_INT() work': 
+	test-tool parse-options --set23 -bbbbb --no-or4 >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
 
-ok 6 - consecutive blank lines at the beginning should be removed
+ok 37 - OPT_BIT() and OPT_SET_INT() work
 
-expecting success of 0030.7 'consecutive blank lines at the end should be removed': 
-	printf "$ttt\n" > expect &&
-	printf "$ttt\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.38 'OPT_NEGBIT() and OPT_SET_INT() work': 
+	test-tool parse-options --set23 -bbbbb --neg-or4 >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
 
-	printf "$ttt\n" > expect &&
-	printf "$ttt\n\n\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 38 - OPT_NEGBIT() and OPT_SET_INT() work
 
-	printf "$ttt$ttt\n" > expect &&
-	printf "$ttt$ttt\n\n\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.39 'OPT_BIT() works': 
+	test-tool parse-options --expect="boolean: 6" -bb --or4
 
-	printf "$ttt$ttt$ttt\n" > expect &&
-	printf "$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 39 - OPT_BIT() works
 
-	printf "$ttt$ttt$ttt$ttt\n" > expect &&
-	printf "$ttt$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.40 'OPT_NEGBIT() works': 
+	test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4
 
-	printf "$ttt\n" > expect &&
+ok 40 - OPT_NEGBIT() works
 
-	printf "$ttt\n$sss\n$sss\n$sss\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.41 'OPT_CMDMODE() works': 
+	test-tool parse-options --expect="integer: 1" --mode1 &&
+	test-tool parse-options --expect="integer: 3" --mode34=3
 
-	printf "$ttt\n\n$sss\n$sss$sss\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 41 - OPT_CMDMODE() works
 
-	printf "$ttt\n$sss$sss\n$sss\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.42 'OPT_CMDMODE() detects incompatibility (1)': 
+	test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err &&
+	test_must_be_empty output &&
+	test_grep "mode1" output.err &&
+	test_grep "mode2" output.err &&
+	test_grep "cannot be used together" output.err
 
-	printf "$ttt\n$sss$sss$sss\n\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+error: options '--mode2' and '--mode1' cannot be used together
+error: options '--mode2' and '--mode1' cannot be used together
+error: options '--mode2' and '--mode1' cannot be used together
+ok 42 - OPT_CMDMODE() detects incompatibility (1)
 
-	printf "$ttt\n\n$sss$sss$sss\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.43 'OPT_CMDMODE() detects incompatibility (2)': 
+	test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err &&
+	test_must_be_empty output &&
+	test_grep "mode2" output.err &&
+	test_grep "set23" output.err &&
+	test_grep "cannot be used together" output.err
 
-	printf "$ttt\n\n\n$sss$sss$sss\n" | git stripspace >actual &&
-	test_cmp expect actual
+error: options '--mode2' and '--set23' cannot be used together
+error: options '--mode2' and '--set23' cannot be used together
+error: options '--mode2' and '--set23' cannot be used together
+ok 43 - OPT_CMDMODE() detects incompatibility (2)
 
-ok 7 - consecutive blank lines at the end should be removed
+expecting success of 0040.44 'OPT_CMDMODE() detects incompatibility (3)': 
+	test_must_fail test-tool parse-options --mode2 --set23 >output 2>output.err &&
+	test_must_be_empty output &&
+	test_grep "mode2" output.err &&
+	test_grep "set23" output.err &&
+	test_grep "cannot be used together" output.err
 
-expecting success of 0030.8 'text without newline at end should end with newline': 
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$ttt"
+error: options '--set23' and '--mode2' cannot be used together
+error: options '--set23' and '--mode2' cannot be used together
+error: options '--set23' and '--mode2' cannot be used together
+ok 44 - OPT_CMDMODE() detects incompatibility (3)
 
-ok 8 - text without newline at end should end with newline
+expecting success of 0040.45 'OPT_CMDMODE() detects incompatibility (4)': 
+	test_must_fail test-tool parse-options --mode2 --mode34=3 \
+		>output 2>output.err &&
+	test_must_be_empty output &&
+	test_grep "mode2" output.err &&
+	test_grep "mode34.3" output.err &&
+	test_grep "cannot be used together" output.err
 
-expecting success of 0030.9 'text plus spaces without newline at end should end with newline': 
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$sss" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss$sss" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss$sss"
+error: options '--mode34=3' and '--mode2' cannot be used together
+error: options '--mode34=3' and '--mode2' cannot be used together
+error: options '--mode34=3' and '--mode2' cannot be used together
+ok 45 - OPT_CMDMODE() detects incompatibility (4)
 
-ok 9 - text plus spaces without newline at end should end with newline
+expecting success of 0040.46 'OPT_COUNTUP() with PARSE_OPT_NODASH works': 
+	test-tool parse-options --expect="boolean: 6" + + + + + +
 
-expecting success of 0030.10 'text plus spaces without newline at end should not show spaces': 
-	printf "$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	printf "$ttt$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	printf "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	printf "$ttt$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	printf "$ttt$ttt$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	printf "$ttt$sss$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null
+ok 46 - OPT_COUNTUP() with PARSE_OPT_NODASH works
 
-ok 10 - text plus spaces without newline at end should not show spaces
+expecting success of 0040.47 'OPT_NUMBER_CALLBACK() works': 
+	test-tool parse-options --expect="integer: 12345" -12345
 
-expecting success of 0030.11 'text plus spaces without newline should show the correct lines': 
-	printf "$ttt\n" >expect &&
-	printf "$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 47 - OPT_NUMBER_CALLBACK() works
 
-	printf "$ttt\n" >expect &&
-	printf "$ttt$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.48 'negation of OPT_NONEG flags is not ambiguous': 
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --no-ambig >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
 
-	printf "$ttt\n" >expect &&
-	printf "$ttt$sss$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 48 - negation of OPT_NONEG flags is not ambiguous
 
-	printf "$ttt$ttt\n" >expect &&
-	printf "$ttt$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.49 '--list keeps list of strings': 
+	test-tool parse-options --list foo --list=bar --list=baz >output &&
+	test_cmp expect output
 
-	printf "$ttt$ttt\n" >expect &&
-	printf "$ttt$ttt$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 49 - --list keeps list of strings
 
-	printf "$ttt$ttt$ttt\n" >expect &&
-	printf "$ttt$ttt$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual
+expecting success of 0040.50 '--no-list resets list': 
+	test-tool parse-options --list=other --list=irrelevant --list=options \
+		--no-list --list=foo --list=bar --list=baz >output &&
+	test_cmp expect output
 
-ok 11 - text plus spaces without newline should show the correct lines
+ok 50 - --no-list resets list
 
-expecting success of 0030.12 'text plus spaces at end should not show spaces': 
-	echo "$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	echo "$ttt$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	echo "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	echo "$ttt$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	echo "$ttt$ttt$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	echo "$ttt$sss$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null
+expecting success of 0040.51 'multiple quiet levels': 
+	test-tool parse-options --expect="quiet: 3" -q -q -q
 
-ok 12 - text plus spaces at end should not show spaces
+ok 51 - multiple quiet levels
 
-expecting success of 0030.13 'text plus spaces at end should be cleaned and newline must remain': 
-	echo "$ttt" >expect &&
-	echo "$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.52 'multiple verbose levels': 
+	test-tool parse-options --expect="verbose: 3" -v -v -v
 
-	echo "$ttt" >expect &&
-	echo "$ttt$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 52 - multiple verbose levels
 
-	echo "$ttt" >expect &&
-	echo "$ttt$sss$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.53 '--no-quiet sets --quiet to 0': 
+	test-tool parse-options --expect="quiet: 0" --no-quiet
 
-	echo "$ttt$ttt" >expect &&
-	echo "$ttt$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 53 - --no-quiet sets --quiet to 0
 
-	echo "$ttt$ttt" >expect &&
-	echo "$ttt$ttt$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.54 '--no-quiet resets multiple -q to 0': 
+	test-tool parse-options --expect="quiet: 0" -q -q -q --no-quiet
 
-	echo "$ttt$ttt$ttt" >expect &&
-	echo "$ttt$ttt$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual
+ok 54 - --no-quiet resets multiple -q to 0
 
-ok 13 - text plus spaces at end should be cleaned and newline must remain
+expecting success of 0040.55 '--no-verbose sets verbose to 0': 
+	test-tool parse-options --expect="verbose: 0" --no-verbose
 
-expecting success of 0030.14 'spaces with newline at end should be replaced with empty string': 
-	echo | git stripspace >actual &&
-	test_must_be_empty actual &&
+ok 55 - --no-verbose sets verbose to 0
 
-	echo "$sss" | git stripspace >actual &&
-	test_must_be_empty actual &&
+expecting success of 0040.56 '--no-verbose resets multiple verbose to 0': 
+	test-tool parse-options --expect="verbose: 0" -v -v -v --no-verbose
 
-	echo "$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual &&
+ok 56 - --no-verbose resets multiple verbose to 0
 
-	echo "$sss$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual &&
+expecting success of 0040.57 'GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works': 
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+		test-tool parse-options --ye &&
+	test_must_fail env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=true \
+		test-tool parse-options --ye
 
-	echo "$sss$sss$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual
+boolean: 1
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: -1
+quiet: 0
+dry run: no
+file: (not set)
+fatal: disallowed abbreviated or ambiguous option 'ye'
+ok 57 - GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works
 
-ok 14 - spaces with newline at end should be replaced with empty string
+expecting success of 0040.58 '--end-of-options treats remainder as args': 
+	test-tool parse-options \
+	    --expect="verbose: -1" \
+	    --expect="arg 00: --verbose" \
+	    --end-of-options --verbose
 
-expecting success of 0030.15 'spaces without newline at end should not show spaces': 
-	printf "" | git stripspace >tmp &&
-	! grep " " tmp >/dev/null &&
-	printf "$sss" | git stripspace >tmp &&
-	! grep " " tmp >/dev/null &&
-	printf "$sss$sss" | git stripspace >tmp &&
-	! grep " " tmp >/dev/null &&
-	printf "$sss$sss$sss" | git stripspace >tmp &&
-	! grep " " tmp >/dev/null &&
-	printf "$sss$sss$sss$sss" | git stripspace >tmp &&
-	! grep " " tmp >/dev/null
+ok 58 - --end-of-options treats remainder as args
 
-ok 15 - spaces without newline at end should not show spaces
+expecting success of 0040.59 'KEEP_DASHDASH works': 
+	test-tool parse-options-flags --keep-dashdash cmd --opt=1 -- --opt=2 --unknown >actual &&
+	cat >expect <<-\EOF &&
+	opt: 1
+	arg 00: --
+	arg 01: --opt=2
+	arg 02: --unknown
+	EOF
+	test_cmp expect actual
 
-expecting success of 0030.16 'spaces without newline at end should be replaced with empty string': 
-	printf "" | git stripspace >actual &&
-	test_must_be_empty actual &&
+ok 59 - KEEP_DASHDASH works
 
-	printf "$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual &&
+expecting success of 0040.60 'KEEP_ARGV0 works': 
+	test-tool parse-options-flags --keep-argv0 cmd arg0 --opt=3 >actual &&
+	cat >expect <<-\EOF &&
+	opt: 3
+	arg 00: cmd
+	arg 01: arg0
+	EOF
+	test_cmp expect actual
 
-	printf "$sss$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual &&
+ok 60 - KEEP_ARGV0 works
 
-	printf "$sss$sss$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual
+expecting success of 0040.61 'STOP_AT_NON_OPTION works': 
+	test-tool parse-options-flags --stop-at-non-option cmd --opt=4 arg0 --opt=5 --unknown >actual &&
+	cat >expect <<-\EOF &&
+	opt: 4
+	arg 00: arg0
+	arg 01: --opt=5
+	arg 02: --unknown
+	EOF
+	test_cmp expect actual
 
-ok 16 - spaces without newline at end should be replaced with empty string
+ok 61 - STOP_AT_NON_OPTION works
 
-expecting success of 0030.17 'consecutive text lines should be unchanged': 
-	printf "$ttt$ttt\n$ttt\n" >expect &&
-	printf "$ttt$ttt\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.62 'KEEP_UNKNOWN_OPT works': 
+	test-tool parse-options-flags --keep-unknown-opt cmd --unknown=1 --opt=6 -u2 >actual &&
+	cat >expect <<-\EOF &&
+	opt: 6
+	arg 00: --unknown=1
+	arg 01: -u2
+	EOF
+	test_cmp expect actual
 
-	printf "$ttt\n$ttt$ttt\n$ttt\n" >expect &&
-	printf "$ttt\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+ok 62 - KEEP_UNKNOWN_OPT works
 
-	printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" >expect &&
-	printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.63 'NO_INTERNAL_HELP works for -h': 
+	test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd -h 2>err &&
+	grep "^error: unknown switch \`h$SQ" err &&
+	grep "^usage: " err
 
-	printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" >expect &&
-	printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+error: unknown switch `h'
+usage: <...> cmd [options]
+ok 63 - NO_INTERNAL_HELP works for -h
 
-	printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" >expect &&
-	printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
+expecting success of 0040.64 'NO_INTERNAL_HELP works for --help': 
+		test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd --help 2>err &&
+		grep '^error: unknown option `'help\' err &&
+		grep '^usage: ' err
+	
+error: unknown option `help'
+usage: <...> cmd [options]
+ok 64 - NO_INTERNAL_HELP works for --help
 
-	printf "$ttt\n$ttt$ttt\n\n$ttt\n" >expect &&
-	printf "$ttt\n$ttt$ttt\n\n$ttt\n" | git stripspace >actual &&
+expecting success of 0040.65 'NO_INTERNAL_HELP works for --help-all': 
+		test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd --help-all 2>err &&
+		grep '^error: unknown option `'help-all\' err &&
+		grep '^usage: ' err
+	
+error: unknown option `help-all'
+usage: <...> cmd [options]
+ok 65 - NO_INTERNAL_HELP works for --help-all
+
+expecting success of 0040.66 'KEEP_UNKNOWN_OPT | NO_INTERNAL_HELP works': 
+	test-tool parse-options-flags --keep-unknown-opt --no-internal-help cmd -h --help --help-all >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	arg 00: -h
+	arg 01: --help
+	arg 02: --help-all
+	EOF
 	test_cmp expect actual
 
-ok 17 - consecutive text lines should be unchanged
+ok 66 - KEEP_UNKNOWN_OPT | NO_INTERNAL_HELP works
 
-expecting success of 0030.18 'strip comments, too': 
-	test ! -z "$(echo "# comment" | git stripspace)" &&
-	test -z "$(echo "# comment" | git stripspace -s)"
+expecting success of 0040.67 'subcommand - no subcommand shows error and usage': 
+	test_expect_code 129 test-tool parse-subcommand cmd 2>err &&
+	grep "^error: need a subcommand" err &&
+	grep ^usage: err
 
-ok 18 - strip comments, too
+error: need a subcommand
+usage: <...> cmd subcmd-one
+ok 67 - subcommand - no subcommand shows error and usage
 
-expecting success of 0030.19 'strip comments with changed comment char': 
-	test ! -z "$(echo "; comment" | git -c core.commentchar=";" stripspace)" &&
-	test -z "$(echo "; comment" | git -c core.commentchar=";" stripspace -s)"
+expecting success of 0040.68 'subcommand - subcommand after -- shows error and usage': 
+	test_expect_code 129 test-tool parse-subcommand cmd -- subcmd-one 2>err &&
+	grep "^error: need a subcommand" err &&
+	grep ^usage: err
 
-ok 19 - strip comments with changed comment char
+error: need a subcommand
+usage: <...> cmd subcmd-one
+ok 68 - subcommand - subcommand after -- shows error and usage
 
-expecting success of 0030.20 'strip comments with changed comment string': 
-	test ! -z "$(echo "// comment" | git -c core.commentchar=// stripspace)" &&
-	test -z "$(echo "// comment" | git -c core.commentchar="//" stripspace -s)"
+expecting success of 0040.69 'subcommand - subcommand after --end-of-options shows error and usage': 
+	test_expect_code 129 test-tool parse-subcommand cmd --end-of-options subcmd-one 2>err &&
+	grep "^error: need a subcommand" err &&
+	grep ^usage: err
 
-ok 20 - strip comments with changed comment string
+error: need a subcommand
+usage: <...> cmd subcmd-one
+ok 69 - subcommand - subcommand after --end-of-options shows error and usage
 
-expecting success of 0030.21 'newline as commentchar is forbidden': 
-	test_must_fail git -c core.commentChar="$LF" stripspace -s 2>err &&
-	grep "core.commentchar cannot contain newline" err
+expecting success of 0040.70 'subcommand - unknown subcommand shows error and usage': 
+	test_expect_code 129 test-tool parse-subcommand cmd nope 2>err &&
+	grep "^error: unknown subcommand: \`nope$SQ" err &&
+	grep ^usage: err
 
-error: core.commentchar cannot contain newline
-ok 21 - newline as commentchar is forbidden
+error: unknown subcommand: `nope'
+usage: <...> cmd subcmd-one
+ok 70 - subcommand - unknown subcommand shows error and usage
 
-expecting success of 0030.22 'empty commentchar is forbidden': 
-	test_must_fail git -c core.commentchar= stripspace -s 2>err &&
-	grep "core.commentchar must have at least one character" err
+expecting success of 0040.71 'subcommand - subcommands cannot be abbreviated': 
+	test_expect_code 129 test-tool parse-subcommand cmd subcmd-o 2>err &&
+	grep "^error: unknown subcommand: \`subcmd-o$SQ$" err &&
+	grep ^usage: err
 
-error: core.commentchar must have at least one character
-ok 22 - empty commentchar is forbidden
+error: unknown subcommand: `subcmd-o'
+usage: <...> cmd subcmd-one
+ok 71 - subcommand - subcommands cannot be abbreviated
 
-expecting success of 0030.23 '-c with single line': 
-	printf "# foo\n" >expect &&
-	printf "foo" | git stripspace -c >actual &&
+expecting success of 0040.72 'subcommand - no negated subcommands': 
+	test_expect_code 129 test-tool parse-subcommand cmd no-subcmd-one 2>err &&
+	grep "^error: unknown subcommand: \`no-subcmd-one$SQ" err &&
+	grep ^usage: err
+
+error: unknown subcommand: `no-subcmd-one'
+usage: <...> cmd subcmd-one
+ok 72 - subcommand - no negated subcommands
+
+expecting success of 0040.73 'subcommand - simple': 
+	test-tool parse-subcommand cmd subcmd-two >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_two
+	arg 00: subcmd-two
+	EOF
 	test_cmp expect actual
 
-ok 23 - -c with single line
+ok 73 - subcommand - simple
 
-expecting success of 0030.24 '-c with single line followed by empty line': 
-	printf "# foo\n#\n" >expect &&
-	printf "foo\n\n" | git stripspace -c >actual &&
+expecting success of 0040.74 'subcommand - stop parsing at the first subcommand': 
+	test-tool parse-subcommand cmd --opt=1 subcmd-two subcmd-one --opt=2 >actual &&
+	cat >expect <<-\EOF &&
+	opt: 1
+	fn: subcmd_two
+	arg 00: subcmd-two
+	arg 01: subcmd-one
+	arg 02: --opt=2
+	EOF
 	test_cmp expect actual
 
-ok 24 - -c with single line followed by empty line
+ok 74 - subcommand - stop parsing at the first subcommand
 
-expecting success of 0030.25 '-c with newline only': 
-	printf "#\n" >expect &&
-	printf "\n" | git stripspace -c >actual &&
+expecting success of 0040.75 'subcommand - KEEP_ARGV0': 
+	test-tool parse-subcommand --keep-argv0 cmd subcmd-two >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_two
+	arg 00: cmd
+	arg 01: subcmd-two
+	EOF
 	test_cmp expect actual
 
-ok 25 - -c with newline only
+ok 75 - subcommand - KEEP_ARGV0
 
-expecting success of 0030.26 '--comment-lines with single line': 
-	printf "# foo\n" >expect &&
-	printf "foo" | git stripspace -c >actual &&
+expecting success of 0040.76 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given': 
+	test-tool parse-subcommand --subcommand-optional cmd >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	EOF
 	test_cmp expect actual
 
-ok 26 - --comment-lines with single line
+ok 76 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given
 
-expecting success of 0030.27 '-c with changed comment char': 
-	printf "; foo\n" >expect &&
-	printf "foo" | git -c core.commentchar=";" stripspace -c >actual &&
+expecting success of 0040.77 'subcommand - SUBCOMMAND_OPTIONAL + given subcommand': 
+	test-tool parse-subcommand --subcommand-optional cmd subcmd-two branch file >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_two
+	arg 00: subcmd-two
+	arg 01: branch
+	arg 02: file
+	EOF
 	test_cmp expect actual
 
-ok 27 - -c with changed comment char
+ok 77 - subcommand - SUBCOMMAND_OPTIONAL + given subcommand
 
-expecting success of 0030.28 '-c with comment char defined in .git/config': 
-	test_config core.commentchar = &&
-	printf "= foo\n" >expect &&
-	rm -fr sub &&
-	mkdir sub &&
-	printf "foo" | git -C sub stripspace -c >actual &&
+expecting success of 0040.78 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown dashless args': 
+	test-tool parse-subcommand --subcommand-optional cmd branch file >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: branch
+	arg 01: file
+	EOF
 	test_cmp expect actual
 
-ok 28 - -c with comment char defined in .git/config
+ok 78 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown dashless args
 
-expecting success of 0030.29 '-c outside git repository': 
-	printf "# foo\n" >expect &&
-	printf "foo" | nongit git stripspace -c >actual &&
+expecting success of 0040.79 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown option': 
+	test_expect_code 129 test-tool parse-subcommand --subcommand-optional cmd --subcommand-opt 2>err &&
+	grep "^error: unknown option" err &&
+	grep ^usage: err
+
+error: unknown option `subcommand-opt'
+usage: <...> cmd subcmd-one
+ok 79 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown option
+
+expecting success of 0040.80 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand not given + unknown option': 
+	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: --subcommand-opt
+	EOF
 	test_cmp expect actual
 
-ok 29 - -c outside git repository
+ok 80 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand not given + unknown option
 
-expecting success of 0030.30 'avoid SP-HT sequence in commented line': 
-	printf "#\tone\n#\n# two\n" >expect &&
-	printf "\tone\n\ntwo\n" | git stripspace -c >actual &&
+expecting success of 0040.81 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand ignored after unknown option': 
+	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt subcmd-two >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: --subcommand-opt
+	arg 01: subcmd-two
+	EOF
 	test_cmp expect actual
 
-ok 30 - avoid SP-HT sequence in commented line
+ok 81 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand ignored after unknown option
 
-# passed all 30 test(s)
-1..30
+expecting success of 0040.82 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + command and subcommand options cannot be mixed': 
+	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt branch --opt=1 >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: --subcommand-opt
+	arg 01: branch
+	arg 02: --opt=1
+	EOF
+	test_cmp expect actual
+
+ok 82 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + command and subcommand options cannot be mixed
+
+expecting success of 0040.83 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_ARGV0': 
+	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt --keep-argv0 cmd --subcommand-opt branch >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: cmd
+	arg 01: --subcommand-opt
+	arg 02: branch
+	EOF
+	test_cmp expect actual
+
+ok 83 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_ARGV0
+
+expecting success of 0040.84 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_DASHDASH': 
+	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt --keep-dashdash cmd -- --subcommand-opt file >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: --
+	arg 01: --subcommand-opt
+	arg 02: file
+	EOF
+	test_cmp expect actual
+
+ok 84 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_DASHDASH
+
+expecting success of 0040.85 'subcommand - completion helper': 
+	test-tool parse-subcommand cmd --git-completion-helper >actual &&
+	echo "subcmd-one subcmd-two --opt= --no-opt" >expect &&
+	test_cmp expect actual
+
+ok 85 - subcommand - completion helper
+
+expecting success of 0040.86 'subcommands are incompatible with STOP_AT_NON_OPTION': 
+	test_must_fail test-tool parse-subcommand --stop-at-non-option cmd subcmd-one 2>err &&
+	grep ^BUG err
+
+BUG: parse-options.c:610: subcommands are incompatible with PARSE_OPT_STOP_AT_NON_OPTION
+ok 86 - subcommands are incompatible with STOP_AT_NON_OPTION
+
+expecting success of 0040.87 'subcommands are incompatible with KEEP_UNKNOWN_OPT unless in combination with SUBCOMMAND_OPTIONAL': 
+	test_must_fail test-tool parse-subcommand --keep-unknown-opt cmd subcmd-two 2>err &&
+	grep ^BUG err
+
+BUG: parse-options.c:613: subcommands are incompatible with PARSE_OPT_KEEP_UNKNOWN_OPT unless in combination with PARSE_OPT_SUBCOMMAND_OPTIONAL
+ok 87 - subcommands are incompatible with KEEP_UNKNOWN_OPT unless in combination with SUBCOMMAND_OPTIONAL
+
+expecting success of 0040.88 'subcommands are incompatible with KEEP_DASHDASH unless in combination with SUBCOMMAND_OPTIONAL': 
+	test_must_fail test-tool parse-subcommand --keep-dashdash cmd subcmd-two 2>err &&
+	grep ^BUG err
+
+BUG: parse-options.c:615: subcommands are incompatible with PARSE_OPT_KEEP_DASHDASH unless in combination with PARSE_OPT_SUBCOMMAND_OPTIONAL
+ok 88 - subcommands are incompatible with KEEP_DASHDASH unless in combination with SUBCOMMAND_OPTIONAL
+
+expecting success of 0040.89 'negative magnitude': 
+	test_must_fail test-tool parse-options --magnitude -1 >out 2>err &&
+	grep "non-negative integer" err &&
+	test_must_be_empty out
+
+error: option `magnitude' expects a non-negative integer value with an optional k/m/g suffix
+ok 89 - negative magnitude
+
+expecting success of 0040.90 'magnitude with units but no numbers': 
+	test_must_fail test-tool parse-options --magnitude m >out 2>err &&
+	grep "non-negative integer" err &&
+	test_must_be_empty out
+
+error: option `magnitude' expects a non-negative integer value with an optional k/m/g suffix
+ok 90 - magnitude with units but no numbers
+
+# passed all 90 test(s)
+1..90
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0012-help.sh ***
@@ -18800,956 +19754,6 @@
 1..174
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0056-git-C.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0056-git-C/.git/
-expecting success of 0056.1 '"git -C <path>" runs git from the directory <path>': 
-	test_create_repo dir1 &&
-	echo 1 >dir1/a.txt &&
-	msg="initial in dir1" &&
-	(cd dir1 && git add a.txt && git commit -m "$msg") &&
-	echo "$msg" >expected &&
-	git -C dir1 log --format=%s >actual &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0056-git-C/dir1/.git/
-[master (root-commit) 4efbfb5] initial in dir1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.txt
-ok 1 - "git -C <path>" runs git from the directory <path>
-
-expecting success of 0056.2 '"git -C <path>" with an empty <path> is a no-op': 
-	(
-		mkdir -p dir1/subdir &&
-		cd dir1/subdir &&
-		git -C "" rev-parse --show-prefix >actual &&
-		echo subdir/ >expect &&
-		test_cmp expect actual
-	)
-
-ok 2 - "git -C <path>" with an empty <path> is a no-op
-
-expecting success of 0056.3 'Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"': 
-	test_create_repo dir1/dir2 &&
-	echo 1 >dir1/dir2/b.txt &&
-	git -C dir1/dir2 add b.txt &&
-	msg="initial in dir1/dir2" &&
-	echo "$msg" >expected &&
-	git -C dir1/dir2 commit -m "$msg" &&
-	git -C dir1 -C dir2 log --format=%s >actual &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0056-git-C/dir1/dir2/.git/
-[master (root-commit) ea3acc3] initial in dir1/dir2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.txt
-ok 3 - Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"
-
-expecting success of 0056.4 'Effect on --git-dir option: "-C c --git-dir=a.git" is equivalent to "--git-dir c/a.git"': 
-	mkdir c &&
-	mkdir c/a &&
-	mkdir c/a.git &&
-	(cd c/a.git && git init --bare) &&
-	echo 1 >c/a/a.txt &&
-	git --git-dir c/a.git --work-tree=c/a add a.txt &&
-	git --git-dir c/a.git --work-tree=c/a commit -m "initial" &&
-	git --git-dir=c/a.git log -1 --format=%s >expected &&
-	git -C c --git-dir=a.git log -1 --format=%s >actual &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0056-git-C/c/a.git/
-[master (root-commit) cac529a] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.txt
-ok 4 - Effect on --git-dir option: "-C c --git-dir=a.git" is equivalent to "--git-dir c/a.git"
-
-expecting success of 0056.5 'Order should not matter: "--git-dir=a.git -C c" is equivalent to "-C c --git-dir=a.git"': 
-	git -C c --git-dir=a.git log -1 --format=%s >expected &&
-	git --git-dir=a.git -C c log -1 --format=%s >actual &&
-	test_cmp expected actual
-
-ok 5 - Order should not matter: "--git-dir=a.git -C c" is equivalent to "-C c --git-dir=a.git"
-
-expecting success of 0056.6 'Effect on --work-tree option: "-C c/a.git --work-tree=../a"  is equivalent to "--work-tree=c/a --git-dir=c/a.git"': 
-	rm c/a/a.txt &&
-	git --git-dir=c/a.git --work-tree=c/a status >expected &&
-	git -C c/a.git --work-tree=../a status >actual &&
-	test_cmp expected actual
-
-ok 6 - Effect on --work-tree option: "-C c/a.git --work-tree=../a"  is equivalent to "--work-tree=c/a --git-dir=c/a.git"
-
-expecting success of 0056.7 'Order should not matter: "--work-tree=../a -C c/a.git" is equivalent to "-C c/a.git --work-tree=../a"': 
-	git -C c/a.git --work-tree=../a status >expected &&
-	git --work-tree=../a -C c/a.git status >actual &&
-	test_cmp expected actual
-
-ok 7 - Order should not matter: "--work-tree=../a -C c/a.git" is equivalent to "-C c/a.git --work-tree=../a"
-
-expecting success of 0056.8 'Effect on --git-dir and --work-tree options - "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=c/a.git --work-tree=c/a"': 
-	git --git-dir=c/a.git --work-tree=c/a status >expected &&
-	git -C c --git-dir=a.git --work-tree=a status >actual &&
-	test_cmp expected actual
-
-ok 8 - Effect on --git-dir and --work-tree options - "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=c/a.git --work-tree=c/a"
-
-expecting success of 0056.9 'Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git -C c --work-tree=a"': 
-	git -C c --git-dir=a.git --work-tree=a status >expected &&
-	git --git-dir=a.git -C c --work-tree=a status >actual &&
-	test_cmp expected actual
-
-ok 9 - Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git -C c --work-tree=a"
-
-expecting success of 0056.10 'Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git --work-tree=a -C c"': 
-	git -C c --git-dir=a.git --work-tree=a status >expected &&
-	git --git-dir=a.git --work-tree=a -C c status >actual &&
-	test_cmp expected actual
-
-ok 10 - Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git --work-tree=a -C c"
-
-expecting success of 0056.11 'Relative followed by fullpath: "-C ./here -C /there" is equivalent to "-C /there"': 
-	echo "initial in dir1/dir2" >expected &&
-	git -C dir1 -C "$(pwd)/dir1/dir2" log --format=%s >actual &&
-	test_cmp expected actual
-
-ok 11 - Relative followed by fullpath: "-C ./here -C /there" is equivalent to "-C /there"
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0062-revision-walking.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0040-parse-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0040-parse-options/.git/
-expecting success of 0040.1 'test help': 
-	test_must_fail test-tool parse-options -h >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 1 - test help
-
-expecting success of 0040.2 'OPT_BOOL() #1': check boolean: 1 --yes
-ok 2 - OPT_BOOL() #1
-
-expecting success of 0040.3 'OPT_BOOL() #2': check boolean: 1 --no-doubt
-ok 3 - OPT_BOOL() #2
-
-expecting success of 0040.4 'OPT_BOOL() #3': check boolean: 1 -D
-ok 4 - OPT_BOOL() #3
-
-expecting success of 0040.5 'OPT_BOOL() #4': check boolean: 1 --no-fear
-ok 5 - OPT_BOOL() #4
-
-expecting success of 0040.6 'OPT_BOOL() #5': check boolean: 1 -B
-ok 6 - OPT_BOOL() #5
-
-expecting success of 0040.7 'OPT_BOOL() is idempotent #1': check boolean: 1 --yes --yes
-ok 7 - OPT_BOOL() is idempotent #1
-
-expecting success of 0040.8 'OPT_BOOL() is idempotent #2': check boolean: 1 -DB
-ok 8 - OPT_BOOL() is idempotent #2
-
-expecting success of 0040.9 'OPT_BOOL() negation #1': check boolean: 0 -D --no-yes
-ok 9 - OPT_BOOL() negation #1
-
-expecting success of 0040.10 'OPT_BOOL() negation #2': check boolean: 0 -D --no-no-doubt
-ok 10 - OPT_BOOL() negation #2
-
-expecting success of 0040.11 'OPT_BOOL() no negation #1': check_unknown_i18n --fear
-ok 11 - OPT_BOOL() no negation #1
-
-expecting success of 0040.12 'OPT_BOOL() no negation #2': check_unknown_i18n --no-no-fear
-ok 12 - OPT_BOOL() no negation #2
-
-expecting success of 0040.13 'OPT_BOOL() positivation': check boolean: 0 -D --doubt
-ok 13 - OPT_BOOL() positivation
-
-expecting success of 0040.14 'OPT_INT() negative': check integer: -2345 -i -2345
-ok 14 - OPT_INT() negative
-
-expecting success of 0040.15 'OPT_MAGNITUDE() simple': 
-	check magnitude: 2345678 -m 2345678
-
-ok 15 - OPT_MAGNITUDE() simple
-
-expecting success of 0040.16 'OPT_MAGNITUDE() kilo': 
-	check magnitude: 239616 -m 234k
-
-ok 16 - OPT_MAGNITUDE() kilo
-
-expecting success of 0040.17 'OPT_MAGNITUDE() mega': 
-	check magnitude: 104857600 -m 100m
-
-ok 17 - OPT_MAGNITUDE() mega
-
-expecting success of 0040.18 'OPT_MAGNITUDE() giga': 
-	check magnitude: 1073741824 -m 1g
-
-ok 18 - OPT_MAGNITUDE() giga
-
-expecting success of 0040.19 'OPT_MAGNITUDE() 3giga': 
-	check magnitude: 3221225472 -m 3g
-
-ok 19 - OPT_MAGNITUDE() 3giga
-
-expecting success of 0040.20 'short options': 
-	test-tool parse-options -s123 -b -i 1729 -m 16k -b -vv -n -F my.file \
-	>output 2>output.err &&
-	test_cmp expect output &&
-	test_must_be_empty output.err
-
-ok 20 - short options
-
-expecting success of 0040.21 'long options': 
-	test-tool parse-options --boolean --integer 1729 --magnitude 16k \
-		--boolean --string2=321 --verbose --verbose --no-dry-run \
-		--abbrev=10 --file fi.le --obsolete \
-		>output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 21 - long options
-
-expecting success of 0040.22 'abbreviate to something longer than SHA1 length': 
-	cat >expect <<-EOF &&
-	boolean: 0
-	integer: 0
-	magnitude: 0
-	timestamp: 0
-	string: (not set)
-	abbrev: 100
-	verbose: -1
-	quiet: 0
-	dry run: no
-	file: (not set)
-	EOF
-	test-tool parse-options --abbrev=100 >output &&
-	test_cmp expect output
-
-ok 22 - abbreviate to something longer than SHA1 length
-
-expecting success of 0040.23 'missing required value': 
-	cat >expect <<-\EOF &&
-	error: switch `s' requires a value
-	EOF
-	test_expect_code 129 test-tool parse-options -s 2>actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-\EOF &&
-	error: option `string' requires a value
-	EOF
-	test_expect_code 129 test-tool parse-options --string 2>actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-\EOF &&
-	error: option `file' requires a value
-	EOF
-	test_expect_code 129 test-tool parse-options --file 2>actual &&
-	test_cmp expect actual
-
-ok 23 - missing required value
-
-expecting success of 0040.24 'superfluous value provided: boolean': 
-	cat >expect <<-\EOF &&
-	error: option `yes' takes no value
-	EOF
-	test_expect_code 129 test-tool parse-options --yes=hi 2>actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-\EOF &&
-	error: option `no-yes' takes no value
-	EOF
-	test_expect_code 129 test-tool parse-options --no-yes=hi 2>actual &&
-	test_cmp expect actual
-
-ok 24 - superfluous value provided: boolean
-
-expecting success of 0040.25 'superfluous value provided: boolean, abbreviated': 
-	cat >expect <<-\EOF &&
-	error: option `yes' takes no value
-	EOF
-	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --ye=hi 2>actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-\EOF &&
-	error: option `no-yes' takes no value
-	EOF
-	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --no-ye=hi 2>actual &&
-	test_cmp expect actual
-
-ok 25 - superfluous value provided: boolean, abbreviated
-
-expecting success of 0040.26 'superfluous value provided: cmdmode': 
-	cat >expect <<-\EOF &&
-	error: option `mode1' takes no value
-	EOF
-	test_expect_code 129 test-tool parse-options --mode1=hi 2>actual &&
-	test_cmp expect actual
-
-ok 26 - superfluous value provided: cmdmode
-
-expecting success of 0040.27 'intermingled arguments': 
-	test-tool parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
-		>output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 27 - intermingled arguments
-
-expecting success of 0040.28 'unambiguously abbreviated option': 
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --int 2 --boolean --no-bo >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 28 - unambiguously abbreviated option
-
-expecting success of 0040.29 'unambiguously abbreviated option with "="': 
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --expect="integer: 2" --int=2
-
-ok 29 - unambiguously abbreviated option with "="
-
-expecting success of 0040.30 'ambiguously abbreviated option': 
-	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --strin 123
-
-error: ambiguous option: strin (could be --string or --string2)
-usage: test-tool parse-options <options>
-
-    A helper function for the parse-options API.
-
-    --[no-]yes            get a boolean
-    -D, --no-doubt        begins with 'no-'
-    --doubt               opposite of --no-doubt
-    -B, --no-fear         be brave
-    -b, --[no-]boolean    increment by one
-    -4, --[no-]or4        bitwise-or boolean with ...0100
-    --[no-]neg-or4        same as --no-or4
-
-    -i, --[no-]integer <n>
-                          get a integer
-    -j <n>                get a integer, too
-    -m, --magnitude <n>   get a magnitude
-    --[no-]set23          set integer to 23
-    --mode1               set integer to 1 (cmdmode option)
-    --mode2               set integer to 2 (cmdmode option)
-    --[no-]mode34 (3|4)   set integer to 3 or 4 (cmdmode option)
-    -L, --[no-]length <str>
-                          get length of <str>
-    -F, --[no-]file <file>
-                          set file to <file>
-
-String options
-    -s, --[no-]string <string>
-                          get a string
-    --[no-]string2 <str>  get another string
-    --[no-]st <st>        get another string (pervert ordering)
-    -o <str>              get another string
-    --longhelp            help text of this entry
-                          spans multiple lines
-    --[no-]list <str>     add str to list
-
-Magic arguments
-    -NUM                  set integer to NUM
-    +                     same as -b
-    --ambiguous           positive ambiguity
-    --no-ambiguous        negative ambiguity
-
-Standard options
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-    -v, --[no-]verbose    be verbose
-    -n, --[no-]dry-run    dry run
-    -q, --[no-]quiet      be quiet
-    --[no-]expect <string>
-                          expected output in the variable dump
-
-Alias
-    -A, --[no-]alias-source <string>
-                          get a string
-    -Z, --[no-]alias-target <string>
-                          alias of --alias-source
-
-ok 30 - ambiguously abbreviated option
-
-expecting success of 0040.31 'non ambiguous option (after two options it abbreviates)': 
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --expect="string: 123" --st 123
-
-ok 31 - non ambiguous option (after two options it abbreviates)
-
-expecting success of 0040.32 'Alias options do not contribute to abbreviation': 
-	test-tool parse-options --alias-source 123 >output &&
-	grep "^string: 123" output &&
-	test-tool parse-options --alias-target 123 >output &&
-	grep "^string: 123" output &&
-	test_must_fail test-tool parse-options --alias &&
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --alias 123 >output &&
-	grep "^string: 123" output
-
-string: 123
-string: 123
-fatal: disallowed abbreviated or ambiguous option 'alias'
-string: 123
-ok 32 - Alias options do not contribute to abbreviation
-
-expecting success of 0040.33 'detect possible typos': 
-	test_must_fail test-tool parse-options -boolean >output 2>output.err &&
-	test_must_be_empty output &&
-	test_cmp typo.err output.err
-
-ok 33 - detect possible typos
-
-expecting success of 0040.34 'detect possible typos': 
-	test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
-	test_must_be_empty output &&
-	test_cmp typo.err output.err
-
-ok 34 - detect possible typos
-
-expecting success of 0040.35 'OPT_CALLBACK() and OPT_BIT() work': 
-	test-tool parse-options --length=four -b -4 >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 35 - OPT_CALLBACK() and OPT_BIT() work
-
-expecting success of 0040.36 'OPT_CALLBACK() and callback errors work': 
-	test_must_fail test-tool parse-options --no-length >output 2>output.err &&
-	test_must_be_empty output &&
-	test_must_be_empty output.err
-
-ok 36 - OPT_CALLBACK() and callback errors work
-
-expecting success of 0040.37 'OPT_BIT() and OPT_SET_INT() work': 
-	test-tool parse-options --set23 -bbbbb --no-or4 >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 37 - OPT_BIT() and OPT_SET_INT() work
-
-expecting success of 0040.38 'OPT_NEGBIT() and OPT_SET_INT() work': 
-	test-tool parse-options --set23 -bbbbb --neg-or4 >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 38 - OPT_NEGBIT() and OPT_SET_INT() work
-
-expecting success of 0040.39 'OPT_BIT() works': 
-	test-tool parse-options --expect="boolean: 6" -bb --or4
-
-ok 39 - OPT_BIT() works
-
-expecting success of 0040.40 'OPT_NEGBIT() works': 
-	test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4
-
-ok 40 - OPT_NEGBIT() works
-
-expecting success of 0040.41 'OPT_CMDMODE() works': 
-	test-tool parse-options --expect="integer: 1" --mode1 &&
-	test-tool parse-options --expect="integer: 3" --mode34=3
-
-ok 41 - OPT_CMDMODE() works
-
-expecting success of 0040.42 'OPT_CMDMODE() detects incompatibility (1)': 
-	test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err &&
-	test_must_be_empty output &&
-	test_grep "mode1" output.err &&
-	test_grep "mode2" output.err &&
-	test_grep "cannot be used together" output.err
-
-error: options '--mode2' and '--mode1' cannot be used together
-error: options '--mode2' and '--mode1' cannot be used together
-error: options '--mode2' and '--mode1' cannot be used together
-ok 42 - OPT_CMDMODE() detects incompatibility (1)
-
-expecting success of 0040.43 'OPT_CMDMODE() detects incompatibility (2)': 
-	test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err &&
-	test_must_be_empty output &&
-	test_grep "mode2" output.err &&
-	test_grep "set23" output.err &&
-	test_grep "cannot be used together" output.err
-
-error: options '--mode2' and '--set23' cannot be used together
-error: options '--mode2' and '--set23' cannot be used together
-error: options '--mode2' and '--set23' cannot be used together
-ok 43 - OPT_CMDMODE() detects incompatibility (2)
-
-expecting success of 0040.44 'OPT_CMDMODE() detects incompatibility (3)': 
-	test_must_fail test-tool parse-options --mode2 --set23 >output 2>output.err &&
-	test_must_be_empty output &&
-	test_grep "mode2" output.err &&
-	test_grep "set23" output.err &&
-	test_grep "cannot be used together" output.err
-
-error: options '--set23' and '--mode2' cannot be used together
-error: options '--set23' and '--mode2' cannot be used together
-error: options '--set23' and '--mode2' cannot be used together
-ok 44 - OPT_CMDMODE() detects incompatibility (3)
-
-expecting success of 0040.45 'OPT_CMDMODE() detects incompatibility (4)': 
-	test_must_fail test-tool parse-options --mode2 --mode34=3 \
-		>output 2>output.err &&
-	test_must_be_empty output &&
-	test_grep "mode2" output.err &&
-	test_grep "mode34.3" output.err &&
-	test_grep "cannot be used together" output.err
-
-error: options '--mode34=3' and '--mode2' cannot be used together
-error: options '--mode34=3' and '--mode2' cannot be used together
-error: options '--mode34=3' and '--mode2' cannot be used together
-ok 45 - OPT_CMDMODE() detects incompatibility (4)
-
-expecting success of 0040.46 'OPT_COUNTUP() with PARSE_OPT_NODASH works': 
-	test-tool parse-options --expect="boolean: 6" + + + + + +
-
-ok 46 - OPT_COUNTUP() with PARSE_OPT_NODASH works
-
-expecting success of 0040.47 'OPT_NUMBER_CALLBACK() works': 
-	test-tool parse-options --expect="integer: 12345" -12345
-
-ok 47 - OPT_NUMBER_CALLBACK() works
-
-expecting success of 0040.48 'negation of OPT_NONEG flags is not ambiguous': 
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --no-ambig >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 48 - negation of OPT_NONEG flags is not ambiguous
-
-expecting success of 0040.49 '--list keeps list of strings': 
-	test-tool parse-options --list foo --list=bar --list=baz >output &&
-	test_cmp expect output
-
-ok 49 - --list keeps list of strings
-
-expecting success of 0040.50 '--no-list resets list': 
-	test-tool parse-options --list=other --list=irrelevant --list=options \
-		--no-list --list=foo --list=bar --list=baz >output &&
-	test_cmp expect output
-
-ok 50 - --no-list resets list
-
-expecting success of 0040.51 'multiple quiet levels': 
-	test-tool parse-options --expect="quiet: 3" -q -q -q
-
-ok 51 - multiple quiet levels
-
-expecting success of 0040.52 'multiple verbose levels': 
-	test-tool parse-options --expect="verbose: 3" -v -v -v
-
-ok 52 - multiple verbose levels
-
-expecting success of 0040.53 '--no-quiet sets --quiet to 0': 
-	test-tool parse-options --expect="quiet: 0" --no-quiet
-
-ok 53 - --no-quiet sets --quiet to 0
-
-expecting success of 0040.54 '--no-quiet resets multiple -q to 0': 
-	test-tool parse-options --expect="quiet: 0" -q -q -q --no-quiet
-
-ok 54 - --no-quiet resets multiple -q to 0
-
-expecting success of 0040.55 '--no-verbose sets verbose to 0': 
-	test-tool parse-options --expect="verbose: 0" --no-verbose
-
-ok 55 - --no-verbose sets verbose to 0
-
-expecting success of 0040.56 '--no-verbose resets multiple verbose to 0': 
-	test-tool parse-options --expect="verbose: 0" -v -v -v --no-verbose
-
-ok 56 - --no-verbose resets multiple verbose to 0
-
-expecting success of 0040.57 'GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works': 
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-		test-tool parse-options --ye &&
-	test_must_fail env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=true \
-		test-tool parse-options --ye
-
-boolean: 1
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: -1
-quiet: 0
-dry run: no
-file: (not set)
-fatal: disallowed abbreviated or ambiguous option 'ye'
-ok 57 - GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works
-
-expecting success of 0040.58 '--end-of-options treats remainder as args': 
-	test-tool parse-options \
-	    --expect="verbose: -1" \
-	    --expect="arg 00: --verbose" \
-	    --end-of-options --verbose
-
-ok 58 - --end-of-options treats remainder as args
-
-expecting success of 0040.59 'KEEP_DASHDASH works': 
-	test-tool parse-options-flags --keep-dashdash cmd --opt=1 -- --opt=2 --unknown >actual &&
-	cat >expect <<-\EOF &&
-	opt: 1
-	arg 00: --
-	arg 01: --opt=2
-	arg 02: --unknown
-	EOF
-	test_cmp expect actual
-
-ok 59 - KEEP_DASHDASH works
-
-expecting success of 0040.60 'KEEP_ARGV0 works': 
-	test-tool parse-options-flags --keep-argv0 cmd arg0 --opt=3 >actual &&
-	cat >expect <<-\EOF &&
-	opt: 3
-	arg 00: cmd
-	arg 01: arg0
-	EOF
-	test_cmp expect actual
-
-ok 60 - KEEP_ARGV0 works
-
-expecting success of 0040.61 'STOP_AT_NON_OPTION works': 
-	test-tool parse-options-flags --stop-at-non-option cmd --opt=4 arg0 --opt=5 --unknown >actual &&
-	cat >expect <<-\EOF &&
-	opt: 4
-	arg 00: arg0
-	arg 01: --opt=5
-	arg 02: --unknown
-	EOF
-	test_cmp expect actual
-
-ok 61 - STOP_AT_NON_OPTION works
-
-expecting success of 0040.62 'KEEP_UNKNOWN_OPT works': 
-	test-tool parse-options-flags --keep-unknown-opt cmd --unknown=1 --opt=6 -u2 >actual &&
-	cat >expect <<-\EOF &&
-	opt: 6
-	arg 00: --unknown=1
-	arg 01: -u2
-	EOF
-	test_cmp expect actual
-
-ok 62 - KEEP_UNKNOWN_OPT works
-
-expecting success of 0040.63 'NO_INTERNAL_HELP works for -h': 
-	test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd -h 2>err &&
-	grep "^error: unknown switch \`h$SQ" err &&
-	grep "^usage: " err
-
-error: unknown switch `h'
-usage: <...> cmd [options]
-ok 63 - NO_INTERNAL_HELP works for -h
-
-expecting success of 0040.64 'NO_INTERNAL_HELP works for --help': 
-		test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd --help 2>err &&
-		grep '^error: unknown option `'help\' err &&
-		grep '^usage: ' err
-	
-error: unknown option `help'
-usage: <...> cmd [options]
-ok 64 - NO_INTERNAL_HELP works for --help
-
-expecting success of 0040.65 'NO_INTERNAL_HELP works for --help-all': 
-		test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd --help-all 2>err &&
-		grep '^error: unknown option `'help-all\' err &&
-		grep '^usage: ' err
-	
-error: unknown option `help-all'
-usage: <...> cmd [options]
-ok 65 - NO_INTERNAL_HELP works for --help-all
-
-expecting success of 0040.66 'KEEP_UNKNOWN_OPT | NO_INTERNAL_HELP works': 
-	test-tool parse-options-flags --keep-unknown-opt --no-internal-help cmd -h --help --help-all >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	arg 00: -h
-	arg 01: --help
-	arg 02: --help-all
-	EOF
-	test_cmp expect actual
-
-ok 66 - KEEP_UNKNOWN_OPT | NO_INTERNAL_HELP works
-
-expecting success of 0040.67 'subcommand - no subcommand shows error and usage': 
-	test_expect_code 129 test-tool parse-subcommand cmd 2>err &&
-	grep "^error: need a subcommand" err &&
-	grep ^usage: err
-
-error: need a subcommand
-usage: <...> cmd subcmd-one
-ok 67 - subcommand - no subcommand shows error and usage
-
-expecting success of 0040.68 'subcommand - subcommand after -- shows error and usage': 
-	test_expect_code 129 test-tool parse-subcommand cmd -- subcmd-one 2>err &&
-	grep "^error: need a subcommand" err &&
-	grep ^usage: err
-
-error: need a subcommand
-usage: <...> cmd subcmd-one
-ok 68 - subcommand - subcommand after -- shows error and usage
-
-expecting success of 0040.69 'subcommand - subcommand after --end-of-options shows error and usage': 
-	test_expect_code 129 test-tool parse-subcommand cmd --end-of-options subcmd-one 2>err &&
-	grep "^error: need a subcommand" err &&
-	grep ^usage: err
-
-error: need a subcommand
-usage: <...> cmd subcmd-one
-ok 69 - subcommand - subcommand after --end-of-options shows error and usage
-
-expecting success of 0040.70 'subcommand - unknown subcommand shows error and usage': 
-	test_expect_code 129 test-tool parse-subcommand cmd nope 2>err &&
-	grep "^error: unknown subcommand: \`nope$SQ" err &&
-	grep ^usage: err
-
-error: unknown subcommand: `nope'
-usage: <...> cmd subcmd-one
-ok 70 - subcommand - unknown subcommand shows error and usage
-
-expecting success of 0040.71 'subcommand - subcommands cannot be abbreviated': 
-	test_expect_code 129 test-tool parse-subcommand cmd subcmd-o 2>err &&
-	grep "^error: unknown subcommand: \`subcmd-o$SQ$" err &&
-	grep ^usage: err
-
-error: unknown subcommand: `subcmd-o'
-usage: <...> cmd subcmd-one
-ok 71 - subcommand - subcommands cannot be abbreviated
-
-expecting success of 0040.72 'subcommand - no negated subcommands': 
-	test_expect_code 129 test-tool parse-subcommand cmd no-subcmd-one 2>err &&
-	grep "^error: unknown subcommand: \`no-subcmd-one$SQ" err &&
-	grep ^usage: err
-
-error: unknown subcommand: `no-subcmd-one'
-usage: <...> cmd subcmd-one
-ok 72 - subcommand - no negated subcommands
-
-expecting success of 0040.73 'subcommand - simple': 
-	test-tool parse-subcommand cmd subcmd-two >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_two
-	arg 00: subcmd-two
-	EOF
-	test_cmp expect actual
-
-ok 73 - subcommand - simple
-
-expecting success of 0040.74 'subcommand - stop parsing at the first subcommand': 
-	test-tool parse-subcommand cmd --opt=1 subcmd-two subcmd-one --opt=2 >actual &&
-	cat >expect <<-\EOF &&
-	opt: 1
-	fn: subcmd_two
-	arg 00: subcmd-two
-	arg 01: subcmd-one
-	arg 02: --opt=2
-	EOF
-	test_cmp expect actual
-
-ok 74 - subcommand - stop parsing at the first subcommand
-
-expecting success of 0040.75 'subcommand - KEEP_ARGV0': 
-	test-tool parse-subcommand --keep-argv0 cmd subcmd-two >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_two
-	arg 00: cmd
-	arg 01: subcmd-two
-	EOF
-	test_cmp expect actual
-
-ok 75 - subcommand - KEEP_ARGV0
-
-expecting success of 0040.76 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given': 
-	test-tool parse-subcommand --subcommand-optional cmd >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	EOF
-	test_cmp expect actual
-
-ok 76 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given
-
-expecting success of 0040.77 'subcommand - SUBCOMMAND_OPTIONAL + given subcommand': 
-	test-tool parse-subcommand --subcommand-optional cmd subcmd-two branch file >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_two
-	arg 00: subcmd-two
-	arg 01: branch
-	arg 02: file
-	EOF
-	test_cmp expect actual
-
-ok 77 - subcommand - SUBCOMMAND_OPTIONAL + given subcommand
-
-expecting success of 0040.78 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown dashless args': 
-	test-tool parse-subcommand --subcommand-optional cmd branch file >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: branch
-	arg 01: file
-	EOF
-	test_cmp expect actual
-
-ok 78 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown dashless args
-
-expecting success of 0040.79 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown option': 
-	test_expect_code 129 test-tool parse-subcommand --subcommand-optional cmd --subcommand-opt 2>err &&
-	grep "^error: unknown option" err &&
-	grep ^usage: err
-
-error: unknown option `subcommand-opt'
-usage: <...> cmd subcmd-one
-ok 79 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown option
-
-expecting success of 0040.80 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand not given + unknown option': 
-	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: --subcommand-opt
-	EOF
-	test_cmp expect actual
-
-ok 80 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand not given + unknown option
-
-expecting success of 0040.81 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand ignored after unknown option': 
-	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt subcmd-two >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: --subcommand-opt
-	arg 01: subcmd-two
-	EOF
-	test_cmp expect actual
-
-ok 81 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand ignored after unknown option
-
-expecting success of 0040.82 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + command and subcommand options cannot be mixed': 
-	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt branch --opt=1 >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: --subcommand-opt
-	arg 01: branch
-	arg 02: --opt=1
-	EOF
-	test_cmp expect actual
-
-ok 82 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + command and subcommand options cannot be mixed
-
-expecting success of 0040.83 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_ARGV0': 
-	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt --keep-argv0 cmd --subcommand-opt branch >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: cmd
-	arg 01: --subcommand-opt
-	arg 02: branch
-	EOF
-	test_cmp expect actual
-
-ok 83 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_ARGV0
-
-expecting success of 0040.84 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_DASHDASH': 
-	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt --keep-dashdash cmd -- --subcommand-opt file >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: --
-	arg 01: --subcommand-opt
-	arg 02: file
-	EOF
-	test_cmp expect actual
-
-ok 84 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_DASHDASH
-
-expecting success of 0040.85 'subcommand - completion helper': 
-	test-tool parse-subcommand cmd --git-completion-helper >actual &&
-	echo "subcmd-one subcmd-two --opt= --no-opt" >expect &&
-	test_cmp expect actual
-
-ok 85 - subcommand - completion helper
-
-expecting success of 0040.86 'subcommands are incompatible with STOP_AT_NON_OPTION': 
-	test_must_fail test-tool parse-subcommand --stop-at-non-option cmd subcmd-one 2>err &&
-	grep ^BUG err
-
-BUG: parse-options.c:610: subcommands are incompatible with PARSE_OPT_STOP_AT_NON_OPTION
-ok 86 - subcommands are incompatible with STOP_AT_NON_OPTION
-
-expecting success of 0040.87 'subcommands are incompatible with KEEP_UNKNOWN_OPT unless in combination with SUBCOMMAND_OPTIONAL': 
-	test_must_fail test-tool parse-subcommand --keep-unknown-opt cmd subcmd-two 2>err &&
-	grep ^BUG err
-
-BUG: parse-options.c:613: subcommands are incompatible with PARSE_OPT_KEEP_UNKNOWN_OPT unless in combination with PARSE_OPT_SUBCOMMAND_OPTIONAL
-ok 87 - subcommands are incompatible with KEEP_UNKNOWN_OPT unless in combination with SUBCOMMAND_OPTIONAL
-
-expecting success of 0040.88 'subcommands are incompatible with KEEP_DASHDASH unless in combination with SUBCOMMAND_OPTIONAL': 
-	test_must_fail test-tool parse-subcommand --keep-dashdash cmd subcmd-two 2>err &&
-	grep ^BUG err
-
-BUG: parse-options.c:615: subcommands are incompatible with PARSE_OPT_KEEP_DASHDASH unless in combination with PARSE_OPT_SUBCOMMAND_OPTIONAL
-ok 88 - subcommands are incompatible with KEEP_DASHDASH unless in combination with SUBCOMMAND_OPTIONAL
-
-expecting success of 0040.89 'negative magnitude': 
-	test_must_fail test-tool parse-options --magnitude -1 >out 2>err &&
-	grep "non-negative integer" err &&
-	test_must_be_empty out
-
-error: option `magnitude' expects a non-negative integer value with an optional k/m/g suffix
-ok 89 - negative magnitude
-
-expecting success of 0040.90 'magnitude with units but no numbers': 
-	test_must_fail test-tool parse-options --magnitude m >out 2>err &&
-	grep "non-negative integer" err &&
-	test_must_be_empty out
-
-error: option `magnitude' expects a non-negative integer value with an optional k/m/g suffix
-ok 90 - magnitude with units but no numbers
-
-# passed all 90 test(s)
-1..90
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0063-string-list.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0063-string-list/.git/
 expecting success of 0063.1 'split foo:bar:baz at :, max -1': 
@@ -20168,140 +20172,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0068-for-each-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0068-for-each-repo/.git/
-expecting success of 0068.1 'run based on configured value': 
-	git init one &&
-	git init two &&
-	git init three &&
-	git init ~/four &&
-	git -C two commit --allow-empty -m "DID NOT RUN" &&
-	git config run.key "$TRASH_DIRECTORY/one" &&
-	git config --add run.key "$TRASH_DIRECTORY/three" &&
-	git config --add run.key "~/four" &&
-	git for-each-repo --config=run.key commit --allow-empty -m "ran" &&
-	git -C one log -1 --pretty=format:%s >message &&
-	grep ran message &&
-	git -C two log -1 --pretty=format:%s >message &&
-	! grep ran message &&
-	git -C three log -1 --pretty=format:%s >message &&
-	grep ran message &&
-	git -C ~/four log -1 --pretty=format:%s >message &&
-	grep ran message &&
-	git for-each-repo --config=run.key -- commit --allow-empty -m "ran again" &&
-	git -C one log -1 --pretty=format:%s >message &&
-	grep again message &&
-	git -C two log -1 --pretty=format:%s >message &&
-	! grep again message &&
-	git -C three log -1 --pretty=format:%s >message &&
-	grep again message &&
-	git -C ~/four log -1 --pretty=format:%s >message &&
-	grep again message
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0068-for-each-repo/one/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0068-for-each-repo/two/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0068-for-each-repo/three/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0068-for-each-repo/four/.git/
-[master (root-commit) 20fd2df] DID NOT RUN
- Author: A U Thor <author@example.com>
-[master (root-commit) 3c2529d] ran
- Author: A U Thor <author@example.com>
-[master (root-commit) 3c2529d] ran
- Author: A U Thor <author@example.com>
-[master (root-commit) 3c2529d] ran
- Author: A U Thor <author@example.com>
-ran
-ran
-ran
-[master 3fc5dd1] ran again
- Author: A U Thor <author@example.com>
-[master 3fc5dd1] ran again
- Author: A U Thor <author@example.com>
-[master 3fc5dd1] ran again
- Author: A U Thor <author@example.com>
-ran again
-ran again
-ran again
-ok 1 - run based on configured value
-
-expecting success of 0068.2 'do nothing on empty config': 
-	# the whole thing would fail if for-each-ref iterated even
-	# once, because "git help --no-such-option" would fail
-	git for-each-repo --config=bogus.config -- help --no-such-option
-
-ok 2 - do nothing on empty config
-
-expecting success of 0068.3 'error on bad config keys': 
-	test_expect_code 129 git for-each-repo --config=a &&
-	test_expect_code 129 git for-each-repo --config=a.b. &&
-	test_expect_code 129 git for-each-repo --config="'.b"
-
-error: key does not contain a section: a
-fatal: got bad config --config=a
-
-usage: git for-each-repo --config=<config> [--] <arguments>
-
-    --[no-]config <config>
-                          config key storing a list of repository paths
-    --[no-]keep-going     keep going even if command fails in a repository
-
-error: key does not contain variable name: a.b.
-fatal: got bad config --config=a.b.
-
-usage: git for-each-repo --config=<config> [--] <arguments>
-
-    --[no-]config <config>
-                          config key storing a list of repository paths
-    --[no-]keep-going     keep going even if command fails in a repository
-
-error: invalid key: '.b
-fatal: got bad config --config='.b
-
-usage: git for-each-repo --config=<config> [--] <arguments>
-
-    --[no-]config <config>
-                          config key storing a list of repository paths
-    --[no-]keep-going     keep going even if command fails in a repository
-
-ok 3 - error on bad config keys
-
-expecting success of 0068.4 'error on NULL value for config keys': 
-	cat >>.git/config <<-\EOF &&
-	[empty]
-		key
-	EOF
-	cat >expect <<-\EOF &&
-	error: missing value for 'empty.key'
-	EOF
-	test_expect_code 129 git for-each-repo --config=empty.key 2>actual.raw &&
-	grep ^error actual.raw >actual &&
-	test_cmp expect actual
-
-ok 4 - error on NULL value for config keys
-
-expecting success of 0068.5 '--keep-going': 
-	git config keep.going non-existing &&
-	git config --add keep.going . &&
-
-	test_must_fail git for-each-repo --config=keep.going \
-		-- branch >out 2>err &&
-	test_grep "cannot change to .*non-existing" err &&
-	test_must_be_empty out &&
-
-	test_must_fail git for-each-repo --config=keep.going --keep-going \
-		-- branch >out 2>err &&
-	test_grep "cannot change to .*non-existing" err &&
-	git branch >expect &&
-	test_cmp expect out
-
-fatal: cannot change to 'non-existing': No such file or directory
-fatal: cannot change to 'non-existing': No such file or directory
-ok 5 - --keep-going
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0061-run-command.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0061-run-command/.git/
 ok 1 # skip subprocess inherits only std handles (missing MINGW)
@@ -20553,13 +20423,147 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0068-for-each-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0068-for-each-repo/.git/
+expecting success of 0068.1 'run based on configured value': 
+	git init one &&
+	git init two &&
+	git init three &&
+	git init ~/four &&
+	git -C two commit --allow-empty -m "DID NOT RUN" &&
+	git config run.key "$TRASH_DIRECTORY/one" &&
+	git config --add run.key "$TRASH_DIRECTORY/three" &&
+	git config --add run.key "~/four" &&
+	git for-each-repo --config=run.key commit --allow-empty -m "ran" &&
+	git -C one log -1 --pretty=format:%s >message &&
+	grep ran message &&
+	git -C two log -1 --pretty=format:%s >message &&
+	! grep ran message &&
+	git -C three log -1 --pretty=format:%s >message &&
+	grep ran message &&
+	git -C ~/four log -1 --pretty=format:%s >message &&
+	grep ran message &&
+	git for-each-repo --config=run.key -- commit --allow-empty -m "ran again" &&
+	git -C one log -1 --pretty=format:%s >message &&
+	grep again message &&
+	git -C two log -1 --pretty=format:%s >message &&
+	! grep again message &&
+	git -C three log -1 --pretty=format:%s >message &&
+	grep again message &&
+	git -C ~/four log -1 --pretty=format:%s >message &&
+	grep again message
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0068-for-each-repo/one/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0068-for-each-repo/two/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0068-for-each-repo/three/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0068-for-each-repo/four/.git/
+[master (root-commit) 20fd2df] DID NOT RUN
+ Author: A U Thor <author@example.com>
+[master (root-commit) 3c2529d] ran
+ Author: A U Thor <author@example.com>
+[master (root-commit) 3c2529d] ran
+ Author: A U Thor <author@example.com>
+[master (root-commit) 3c2529d] ran
+ Author: A U Thor <author@example.com>
+ran
+ran
+ran
+[master 3fc5dd1] ran again
+ Author: A U Thor <author@example.com>
+[master 3fc5dd1] ran again
+ Author: A U Thor <author@example.com>
+[master 3fc5dd1] ran again
+ Author: A U Thor <author@example.com>
+ran again
+ran again
+ran again
+ok 1 - run based on configured value
+
+expecting success of 0068.2 'do nothing on empty config': 
+	# the whole thing would fail if for-each-ref iterated even
+	# once, because "git help --no-such-option" would fail
+	git for-each-repo --config=bogus.config -- help --no-such-option
+
+ok 2 - do nothing on empty config
+
+expecting success of 0068.3 'error on bad config keys': 
+	test_expect_code 129 git for-each-repo --config=a &&
+	test_expect_code 129 git for-each-repo --config=a.b. &&
+	test_expect_code 129 git for-each-repo --config="'.b"
+
+error: key does not contain a section: a
+fatal: got bad config --config=a
+
+usage: git for-each-repo --config=<config> [--] <arguments>
+
+    --[no-]config <config>
+                          config key storing a list of repository paths
+    --[no-]keep-going     keep going even if command fails in a repository
+
+error: key does not contain variable name: a.b.
+fatal: got bad config --config=a.b.
+
+usage: git for-each-repo --config=<config> [--] <arguments>
+
+    --[no-]config <config>
+                          config key storing a list of repository paths
+    --[no-]keep-going     keep going even if command fails in a repository
+
+error: invalid key: '.b
+fatal: got bad config --config='.b
+
+usage: git for-each-repo --config=<config> [--] <arguments>
+
+    --[no-]config <config>
+                          config key storing a list of repository paths
+    --[no-]keep-going     keep going even if command fails in a repository
+
+ok 3 - error on bad config keys
+
+expecting success of 0068.4 'error on NULL value for config keys': 
+	cat >>.git/config <<-\EOF &&
+	[empty]
+		key
+	EOF
+	cat >expect <<-\EOF &&
+	error: missing value for 'empty.key'
+	EOF
+	test_expect_code 129 git for-each-repo --config=empty.key 2>actual.raw &&
+	grep ^error actual.raw >actual &&
+	test_cmp expect actual
+
+ok 4 - error on NULL value for config keys
+
+expecting success of 0068.5 '--keep-going': 
+	git config keep.going non-existing &&
+	git config --add keep.going . &&
+
+	test_must_fail git for-each-repo --config=keep.going \
+		-- branch >out 2>err &&
+	test_grep "cannot change to .*non-existing" err &&
+	test_must_be_empty out &&
+
+	test_must_fail git for-each-repo --config=keep.going --keep-going \
+		-- branch >out 2>err &&
+	test_grep "cannot change to .*non-existing" err &&
+	git branch >expect &&
+	test_cmp expect out
+
+fatal: cannot change to 'non-existing': No such file or directory
+fatal: cannot change to 'non-existing': No such file or directory
+ok 5 - --keep-going
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0070-fundamental.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t0070-fundamental/doesnotexist/testm0iuvX': No such file or directory
+fatal: Unable to create temporary file '/build/reproducible-path/git-2.47.2/t/trash directory.t0070-fundamental/doesnotexist/testjxz9ws': No such file or directory
 ok 1 - mktemp to nonexistent directory prints filename
 
 checking prerequisite: SANITY
@@ -20595,7 +20599,7 @@
 	test_must_fail test-tool mktemp cannotwrite/testXXXXXX 2>err &&
 	grep "cannotwrite/test" err
 
-fatal: Unable to create temporary file '/build/reproducible-path/git-2.47.2/t/trash directory.t0070-fundamental/cannotwrite/testZybaSl': Permission denied
+fatal: Unable to create temporary file '/build/reproducible-path/git-2.47.2/t/trash directory.t0070-fundamental/cannotwrite/testnFczIg': 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': 
@@ -22486,164 +22490,6 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0092-diagnose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0092-diagnose/.git/
-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 0092.1 'creates diagnostics zip archive': 
-	test_when_finished rm -rf report &&
-
-	git diagnose -o report -s test >out &&
-	grep "Available space" out &&
-
-	zip_path=report/git-diagnostics-test.zip &&
-	test_path_is_file "$zip_path" &&
-
-	# Check zipped archive content
-	"$GIT_UNZIP" -p "$zip_path" diagnostics.log >out &&
-	test_file_not_empty out &&
-
-	"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
-	grep ".git/objects" out &&
-
-	"$GIT_UNZIP" -p "$zip_path" objects-local.txt >out &&
-	grep "^Total: [0-9][0-9]*" out &&
-
-	# Should not include .git directory contents by default
-	! "$GIT_UNZIP" -l "$zip_path" | grep ".git/"
-
-
-Diagnostics complete.
-All of the gathered info is captured in 'report/git-diagnostics-test.zip'
-Available space on '/build/reproducible-path/git-2.47.2/t/trash directory.t0092-diagnose': 71.46 GiB (mount flags 0x1000)
-Contents of .git/objects:
-Total: 0 loose objects
-ok 1 - creates diagnostics zip archive
-
-expecting success of 0092.2 'counts loose objects': 
-	test_commit A &&
-
-	# After committing, should have non-zero loose objects
-	git diagnose -o test-count -s 1 >out &&
-	zip_path=test-count/git-diagnostics-1.zip &&
-	"$GIT_UNZIP" -p "$zip_path" objects-local.txt >out &&
-	grep "^Total: [1-9][0-9]* loose objects" out
-
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-
-Diagnostics complete.
-All of the gathered info is captured in 'test-count/git-diagnostics-1.zip'
-Total: 3 loose objects
-ok 2 - counts loose objects
-
-expecting success of 0092.3 '--mode=stats excludes .git dir contents': 
-	test_when_finished rm -rf report &&
-
-	git diagnose -o report -s test --mode=stats >out &&
-
-	# Includes pack quantity/size info
-	zip_path=report/git-diagnostics-test.zip &&
-	"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
-	grep ".git/objects" out &&
-
-	# Does not include .git directory contents
-	! "$GIT_UNZIP" -l "$zip_path" | grep ".git/"
-
-
-Diagnostics complete.
-All of the gathered info is captured in 'report/git-diagnostics-test.zip'
-Contents of .git/objects:
-ok 3 - --mode=stats excludes .git dir contents
-
-expecting success of 0092.4 '--mode=all includes .git dir contents': 
-	test_when_finished rm -rf report &&
-
-	git diagnose -o report -s test --mode=all >out &&
-
-	# Includes pack quantity/size info
-	zip_path=report/git-diagnostics-test.zip &&
-	"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
-	grep ".git/objects" out &&
-
-	# Includes .git directory contents
-	"$GIT_UNZIP" -l "$zip_path" | grep ".git/" &&
-
-	"$GIT_UNZIP" -p "$zip_path" .git/HEAD >out &&
-	test_file_not_empty out
-
-
-Diagnostics complete.
-All of the gathered info is captured in 'report/git-diagnostics-test.zip'
-Contents of .git/objects:
-        2  2026-03-04 07:55   .git/COMMIT_EDITMSG
-      137  2026-03-04 07:55   .git/index
-       23  2026-03-04 07:55   .git/HEAD
-       92  2026-03-04 07:55   .git/config
-       73  2026-03-04 07:55   .git/description
-      478  2026-03-04 07:55   .git/hooks/applypatch-msg.sample
-      896  2026-03-04 07:55   .git/hooks/commit-msg.sample
-     4726  2026-03-04 07:55   .git/hooks/fsmonitor-watchman.sample
-      189  2026-03-04 07:55   .git/hooks/post-update.sample
-      424  2026-03-04 07:55   .git/hooks/pre-applypatch.sample
-     1649  2026-03-04 07:55   .git/hooks/pre-commit.sample
-      416  2026-03-04 07:55   .git/hooks/pre-merge-commit.sample
-     1374  2026-03-04 07:55   .git/hooks/pre-push.sample
-     4898  2026-03-04 07:55   .git/hooks/pre-rebase.sample
-      544  2026-03-04 07:55   .git/hooks/pre-receive.sample
-     1492  2026-03-04 07:55   .git/hooks/prepare-commit-msg.sample
-     2783  2026-03-04 07:55   .git/hooks/push-to-checkout.sample
-     2308  2026-03-04 07:55   .git/hooks/sendemail-validate.sample
-     3650  2026-03-04 07:55   .git/hooks/update.sample
-      240  2026-03-04 07:55   .git/info/exclude
-      154  2026-03-04 07:55   .git/logs/refs/heads/master
-      154  2026-03-04 07:55   .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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0081-find-pack.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0081-find-pack/.git/
 expecting success of 0081.1 'setup': 
@@ -22778,148 +22624,162 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0095-bloom.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0095-bloom/.git/
-expecting success of 0095.1 'compute unseeded murmur3 hash for empty string': 
-	cat >expect <<-\EOF &&
-	Murmur3 Hash with seed=0:0x00000000
-	EOF
-	test-tool bloom get_murmur3 "" >actual &&
-	test_cmp expect actual
+*** t0092-diagnose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0092-diagnose/.git/
+checking prerequisite: UNZIP
 
-ok 1 - compute unseeded murmur3 hash for empty string
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+	"$GIT_UNZIP" -v
+	test $? -ne 127
 
-expecting success of 0095.2 'compute unseeded murmur3 hash for test string 1': 
-	cat >expect <<-\EOF &&
-	Murmur3 Hash with seed=0:0x627b0c2c
-	EOF
-	test-tool bloom get_murmur3 "Hello world!" >actual &&
-	test_cmp expect actual
+)
+UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
 
-ok 2 - compute unseeded murmur3 hash for test string 1
+Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
+see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
 
-expecting success of 0095.3 'compute unseeded murmur3 hash for test string 2': 
-	cat >expect <<-\EOF &&
-	Murmur3 Hash with seed=0:0x2e4ff723
-	EOF
-	test-tool bloom get_murmur3 "The quick brown fox jumps over the lazy dog" >actual &&
-	test_cmp expect actual
+Compiled with gcc 14.2.0 for Unix (Linux ELF).
 
-ok 3 - compute unseeded murmur3 hash for test string 2
+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]
 
-expecting success of 0095.4 'compute unseeded murmur3 hash for test string 3': 
-	cat >expect <<-\EOF &&
-	Murmur3 Hash with seed=0:0xa183ccfd
-	EOF
-	test-tool bloom get_murmur3_seven_highbit >actual &&
-	test_cmp expect actual
+UnZip and ZipInfo environment options:
+           UNZIP:  [none]
+        UNZIPOPT:  [none]
+         ZIPINFO:  [none]
+      ZIPINFOOPT:  [none]
+prerequisite UNZIP ok
+expecting success of 0092.1 'creates diagnostics zip archive': 
+	test_when_finished rm -rf report &&
 
-ok 4 - compute unseeded murmur3 hash for test string 3
+	git diagnose -o report -s test >out &&
+	grep "Available space" out &&
 
-expecting success of 0095.5 'compute bloom key for empty string': 
-	cat >expect <<-\EOF &&
-	Hashes:0x5615800c|0x5b966560|0x61174ab4|0x66983008|0x6c19155c|0x7199fab0|0x771ae004|
-	Filter_Length:2
-	Filter_Data:11|11|
-	EOF
-	test-tool bloom generate_filter "" >actual &&
-	test_cmp expect actual
+	zip_path=report/git-diagnostics-test.zip &&
+	test_path_is_file "$zip_path" &&
 
-ok 5 - compute bloom key for empty string
+	# Check zipped archive content
+	"$GIT_UNZIP" -p "$zip_path" diagnostics.log >out &&
+	test_file_not_empty out &&
 
-expecting success of 0095.6 'compute bloom key for whitespace': 
-	cat >expect <<-\EOF &&
-	Hashes:0xf178874c|0x5f3d6eb6|0xcd025620|0x3ac73d8a|0xa88c24f4|0x16510c5e|0x8415f3c8|
-	Filter_Length:2
-	Filter_Data:51|55|
-	EOF
-	test-tool bloom generate_filter " " >actual &&
-	test_cmp expect actual
+	"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
+	grep ".git/objects" out &&
 
-ok 6 - compute bloom key for whitespace
+	"$GIT_UNZIP" -p "$zip_path" objects-local.txt >out &&
+	grep "^Total: [0-9][0-9]*" out &&
 
-expecting success of 0095.7 'compute bloom key for test string 1': 
-	cat >expect <<-\EOF &&
-	Hashes:0xb270de9b|0x1bb6f26e|0x84fd0641|0xee431a14|0x57892de7|0xc0cf41ba|0x2a15558d|
-	Filter_Length:2
-	Filter_Data:92|6c|
-	EOF
-	test-tool bloom generate_filter "Hello world!" >actual &&
-	test_cmp expect actual
+	# Should not include .git directory contents by default
+	! "$GIT_UNZIP" -l "$zip_path" | grep ".git/"
 
-ok 7 - compute bloom key for test string 1
 
-expecting success of 0095.8 'compute bloom key for test string 2': 
-	cat >expect <<-\EOF &&
-	Hashes:0x20ab385b|0xf5237fe2|0xc99bc769|0x9e140ef0|0x728c5677|0x47049dfe|0x1b7ce585|
-	Filter_Length:2
-	Filter_Data:a5|4a|
-	EOF
-	test-tool bloom generate_filter "file.txt" >actual &&
-	test_cmp expect actual
+Diagnostics complete.
+All of the gathered info is captured in 'report/git-diagnostics-test.zip'
+Available space on '/build/reproducible-path/git-2.47.2/t/trash directory.t0092-diagnose': 73.64 GiB (mount flags 0x1000)
+Contents of .git/objects:
+Total: 0 loose objects
+ok 1 - creates diagnostics zip archive
 
-ok 8 - compute bloom key for test string 2
+expecting success of 0092.2 'counts loose objects': 
+	test_commit A &&
 
-expecting success of 0095.9 'get bloom filters for commit with no changes': 
-	git init &&
-	git commit --allow-empty -m "c0" &&
-	cat >expect <<-\EOF &&
-	Filter_Length:1
-	Filter_Data:00|
-	EOF
-	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
-	test_cmp expect actual
+	# After committing, should have non-zero loose objects
+	git diagnose -o test-count -s 1 >out &&
+	zip_path=test-count/git-diagnostics-1.zip &&
+	"$GIT_UNZIP" -p "$zip_path" objects-local.txt >out &&
+	grep "^Total: [1-9][0-9]* loose objects" out
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0095-bloom/.git/
-[master (root-commit) c7bd1a3] c0
+[master (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
-ok 9 - get bloom filters for commit with no changes
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
 
-expecting success of 0095.10 'get bloom filter for commit with 10 changes': 
-	rm actual &&
-	rm expect &&
-	mkdir smallDir &&
-	for i in $(test_seq 0 9)
-	do
-		echo $i >smallDir/$i || return 1
-	done &&
-	git add smallDir &&
-	git commit -m "commit with 10 changes" &&
-	cat >expect <<-\EOF &&
-	Filter_Length:14
-	Filter_Data:02|b3|c4|a0|34|e7|fe|eb|cb|47|fe|a0|e8|72|
-	EOF
-	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
-	test_cmp expect actual
+Diagnostics complete.
+All of the gathered info is captured in 'test-count/git-diagnostics-1.zip'
+Total: 3 loose objects
+ok 2 - counts loose objects
 
-[master 2444bb6] commit with 10 changes
- Author: A U Thor <author@example.com>
- 10 files changed, 10 insertions(+)
- create mode 100644 smallDir/0
- create mode 100644 smallDir/1
- create mode 100644 smallDir/2
- create mode 100644 smallDir/3
- create mode 100644 smallDir/4
- create mode 100644 smallDir/5
- create mode 100644 smallDir/6
- create mode 100644 smallDir/7
- create mode 100644 smallDir/8
- create mode 100644 smallDir/9
-ok 10 - get bloom filter for commit with 10 changes
+expecting success of 0092.3 '--mode=stats excludes .git dir contents': 
+	test_when_finished rm -rf report &&
 
-checking prerequisite: EXPENSIVE
+	git diagnose -o report -s test --mode=stats >out &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
+	# Includes pack quantity/size info
+	zip_path=report/git-diagnostics-test.zip &&
+	"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
+	grep ".git/objects" out &&
 
-)
-prerequisite EXPENSIVE not satisfied
-ok 11 # skip get bloom filter for commit with 513 changes (missing EXPENSIVE)
+	# Does not include .git directory contents
+	! "$GIT_UNZIP" -l "$zip_path" | grep ".git/"
 
-# passed all 11 test(s)
-1..11
+
+Diagnostics complete.
+All of the gathered info is captured in 'report/git-diagnostics-test.zip'
+Contents of .git/objects:
+ok 3 - --mode=stats excludes .git dir contents
+
+expecting success of 0092.4 '--mode=all includes .git dir contents': 
+	test_when_finished rm -rf report &&
+
+	git diagnose -o report -s test --mode=all >out &&
+
+	# Includes pack quantity/size info
+	zip_path=report/git-diagnostics-test.zip &&
+	"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
+	grep ".git/objects" out &&
+
+	# Includes .git directory contents
+	"$GIT_UNZIP" -l "$zip_path" | grep ".git/" &&
+
+	"$GIT_UNZIP" -p "$zip_path" .git/HEAD >out &&
+	test_file_not_empty out
+
+
+Diagnostics complete.
+All of the gathered info is captured in 'report/git-diagnostics-test.zip'
+Contents of .git/objects:
+        2  2025-01-30 02:07   .git/COMMIT_EDITMSG
+      137  2025-01-30 02:07   .git/index
+       23  2025-01-30 02:07   .git/HEAD
+       92  2025-01-30 02:07   .git/config
+       73  2025-01-30 02:07   .git/description
+      478  2025-01-30 02:07   .git/hooks/applypatch-msg.sample
+      896  2025-01-30 02:07   .git/hooks/commit-msg.sample
+     4726  2025-01-30 02:07   .git/hooks/fsmonitor-watchman.sample
+      189  2025-01-30 02:07   .git/hooks/post-update.sample
+      424  2025-01-30 02:07   .git/hooks/pre-applypatch.sample
+     1649  2025-01-30 02:07   .git/hooks/pre-commit.sample
+      416  2025-01-30 02:07   .git/hooks/pre-merge-commit.sample
+     1374  2025-01-30 02:07   .git/hooks/pre-push.sample
+     4898  2025-01-30 02:07   .git/hooks/pre-rebase.sample
+      544  2025-01-30 02:07   .git/hooks/pre-receive.sample
+     1492  2025-01-30 02:07   .git/hooks/prepare-commit-msg.sample
+     2783  2025-01-30 02:07   .git/hooks/push-to-checkout.sample
+     2308  2025-01-30 02:07   .git/hooks/sendemail-validate.sample
+     3650  2025-01-30 02:07   .git/hooks/update.sample
+      240  2025-01-30 02:07   .git/info/exclude
+      154  2025-01-30 02:07   .git/logs/refs/heads/master
+      154  2025-01-30 02:07   .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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0091-bugreport.sh ***
@@ -22991,7 +22851,7 @@
 	git bugreport -o foo/ &&
 	test_path_is_file foo/git-bugreport-*
 
-Created new report at 'foo/git-bugreport-2026-03-04-0755.txt'.
+Created new report at 'foo/git-bugreport-2025-01-30-0207.txt'.
 ok 5 - --output-directory puts the report in the provided dir
 
 expecting success of 0091.6 'incorrect arguments abort with usage': 
@@ -23016,14 +22876,14 @@
 	test_when_finished rm non-repo/git-bugreport-* &&
 	nongit git bugreport
 
-Created new report at 'git-bugreport-2026-03-04-0755.txt'.
+Created new report at 'git-bugreport-2025-01-30-0207.txt'.
 ok 8 - runs outside of a git dir
 
 expecting success of 0091.9 'can create leading directories outside of a git dir': 
 	test_when_finished rm -fr foo/bar/baz &&
 	nongit git bugreport -o foo/bar/baz
 
-Created new report at 'foo/bar/baz/git-bugreport-2026-03-04-0755.txt'.
+Created new report at 'foo/bar/baz/git-bugreport-2025-01-30-0207.txt'.
 ok 9 - can create leading directories outside of a git dir
 
 expecting success of 0091.10 'indicates populated hooks': 
@@ -23114,7 +22974,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.47.2/t/trash directory.t0091-bugreport': 71.46 GiB (mount flags 0x1000)
+Available space on '/build/reproducible-path/git-2.47.2/t/trash directory.t0091-bugreport': 73.63 GiB (mount flags 0x1000)
 Contents of .git/objects:
 Total: 0 loose objects
 ok 11 - --diagnose creates diagnostics zip archive
@@ -23154,30 +23014,174 @@
 Diagnostics complete.
 All of the gathered info is captured in 'report/git-diagnostics-test.zip'
 Created new report at 'report/git-bugreport-test.txt'.
-       23  2026-03-04 07:55   .git/HEAD
-       92  2026-03-04 07:55   .git/config
-       73  2026-03-04 07:55   .git/description
-      478  2026-03-04 07:55   .git/hooks/applypatch-msg.sample
-      896  2026-03-04 07:55   .git/hooks/commit-msg.sample
-     4726  2026-03-04 07:55   .git/hooks/fsmonitor-watchman.sample
-      189  2026-03-04 07:55   .git/hooks/post-update.sample
-      424  2026-03-04 07:55   .git/hooks/pre-applypatch.sample
-     1649  2026-03-04 07:55   .git/hooks/pre-commit.sample
-      416  2026-03-04 07:55   .git/hooks/pre-merge-commit.sample
-     1374  2026-03-04 07:55   .git/hooks/pre-push.sample
-     4898  2026-03-04 07:55   .git/hooks/pre-rebase.sample
-      544  2026-03-04 07:55   .git/hooks/pre-receive.sample
-     1492  2026-03-04 07:55   .git/hooks/prepare-commit-msg.sample
-     2783  2026-03-04 07:55   .git/hooks/push-to-checkout.sample
-     2308  2026-03-04 07:55   .git/hooks/sendemail-validate.sample
-     3650  2026-03-04 07:55   .git/hooks/update.sample
-      240  2026-03-04 07:55   .git/info/exclude
+       23  2025-01-30 02:07   .git/HEAD
+       92  2025-01-30 02:07   .git/config
+       73  2025-01-30 02:07   .git/description
+      478  2025-01-30 02:07   .git/hooks/applypatch-msg.sample
+      896  2025-01-30 02:07   .git/hooks/commit-msg.sample
+     4726  2025-01-30 02:07   .git/hooks/fsmonitor-watchman.sample
+      189  2025-01-30 02:07   .git/hooks/post-update.sample
+      424  2025-01-30 02:07   .git/hooks/pre-applypatch.sample
+     1649  2025-01-30 02:07   .git/hooks/pre-commit.sample
+      416  2025-01-30 02:07   .git/hooks/pre-merge-commit.sample
+     1374  2025-01-30 02:07   .git/hooks/pre-push.sample
+     4898  2025-01-30 02:07   .git/hooks/pre-rebase.sample
+      544  2025-01-30 02:07   .git/hooks/pre-receive.sample
+     1492  2025-01-30 02:07   .git/hooks/prepare-commit-msg.sample
+     2783  2025-01-30 02:07   .git/hooks/push-to-checkout.sample
+     2308  2025-01-30 02:07   .git/hooks/sendemail-validate.sample
+     3650  2025-01-30 02:07   .git/hooks/update.sample
+      240  2025-01-30 02:07   .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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0095-bloom.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0095-bloom/.git/
+expecting success of 0095.1 'compute unseeded murmur3 hash for empty string': 
+	cat >expect <<-\EOF &&
+	Murmur3 Hash with seed=0:0x00000000
+	EOF
+	test-tool bloom get_murmur3 "" >actual &&
+	test_cmp expect actual
+
+ok 1 - compute unseeded murmur3 hash for empty string
+
+expecting success of 0095.2 'compute unseeded murmur3 hash for test string 1': 
+	cat >expect <<-\EOF &&
+	Murmur3 Hash with seed=0:0x627b0c2c
+	EOF
+	test-tool bloom get_murmur3 "Hello world!" >actual &&
+	test_cmp expect actual
+
+ok 2 - compute unseeded murmur3 hash for test string 1
+
+expecting success of 0095.3 'compute unseeded murmur3 hash for test string 2': 
+	cat >expect <<-\EOF &&
+	Murmur3 Hash with seed=0:0x2e4ff723
+	EOF
+	test-tool bloom get_murmur3 "The quick brown fox jumps over the lazy dog" >actual &&
+	test_cmp expect actual
+
+ok 3 - compute unseeded murmur3 hash for test string 2
+
+expecting success of 0095.4 'compute unseeded murmur3 hash for test string 3': 
+	cat >expect <<-\EOF &&
+	Murmur3 Hash with seed=0:0xa183ccfd
+	EOF
+	test-tool bloom get_murmur3_seven_highbit >actual &&
+	test_cmp expect actual
+
+ok 4 - compute unseeded murmur3 hash for test string 3
+
+expecting success of 0095.5 'compute bloom key for empty string': 
+	cat >expect <<-\EOF &&
+	Hashes:0x5615800c|0x5b966560|0x61174ab4|0x66983008|0x6c19155c|0x7199fab0|0x771ae004|
+	Filter_Length:2
+	Filter_Data:11|11|
+	EOF
+	test-tool bloom generate_filter "" >actual &&
+	test_cmp expect actual
+
+ok 5 - compute bloom key for empty string
+
+expecting success of 0095.6 'compute bloom key for whitespace': 
+	cat >expect <<-\EOF &&
+	Hashes:0xf178874c|0x5f3d6eb6|0xcd025620|0x3ac73d8a|0xa88c24f4|0x16510c5e|0x8415f3c8|
+	Filter_Length:2
+	Filter_Data:51|55|
+	EOF
+	test-tool bloom generate_filter " " >actual &&
+	test_cmp expect actual
+
+ok 6 - compute bloom key for whitespace
+
+expecting success of 0095.7 'compute bloom key for test string 1': 
+	cat >expect <<-\EOF &&
+	Hashes:0xb270de9b|0x1bb6f26e|0x84fd0641|0xee431a14|0x57892de7|0xc0cf41ba|0x2a15558d|
+	Filter_Length:2
+	Filter_Data:92|6c|
+	EOF
+	test-tool bloom generate_filter "Hello world!" >actual &&
+	test_cmp expect actual
+
+ok 7 - compute bloom key for test string 1
+
+expecting success of 0095.8 'compute bloom key for test string 2': 
+	cat >expect <<-\EOF &&
+	Hashes:0x20ab385b|0xf5237fe2|0xc99bc769|0x9e140ef0|0x728c5677|0x47049dfe|0x1b7ce585|
+	Filter_Length:2
+	Filter_Data:a5|4a|
+	EOF
+	test-tool bloom generate_filter "file.txt" >actual &&
+	test_cmp expect actual
+
+ok 8 - compute bloom key for test string 2
+
+expecting success of 0095.9 'get bloom filters for commit with no changes': 
+	git init &&
+	git commit --allow-empty -m "c0" &&
+	cat >expect <<-\EOF &&
+	Filter_Length:1
+	Filter_Data:00|
+	EOF
+	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
+	test_cmp expect actual
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0095-bloom/.git/
+[master (root-commit) c7bd1a3] c0
+ Author: A U Thor <author@example.com>
+ok 9 - get bloom filters for commit with no changes
+
+expecting success of 0095.10 'get bloom filter for commit with 10 changes': 
+	rm actual &&
+	rm expect &&
+	mkdir smallDir &&
+	for i in $(test_seq 0 9)
+	do
+		echo $i >smallDir/$i || return 1
+	done &&
+	git add smallDir &&
+	git commit -m "commit with 10 changes" &&
+	cat >expect <<-\EOF &&
+	Filter_Length:14
+	Filter_Data:02|b3|c4|a0|34|e7|fe|eb|cb|47|fe|a0|e8|72|
+	EOF
+	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
+	test_cmp expect actual
+
+[master 2444bb6] commit with 10 changes
+ Author: A U Thor <author@example.com>
+ 10 files changed, 10 insertions(+)
+ create mode 100644 smallDir/0
+ create mode 100644 smallDir/1
+ create mode 100644 smallDir/2
+ create mode 100644 smallDir/3
+ create mode 100644 smallDir/4
+ create mode 100644 smallDir/5
+ create mode 100644 smallDir/6
+ create mode 100644 smallDir/7
+ create mode 100644 smallDir/8
+ create mode 100644 smallDir/9
+ok 10 - get bloom filter for commit with 10 changes
+
+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 11 # skip get bloom filter for commit with 513 changes (missing EXPENSIVE)
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0100-previous.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0100-previous/.git/
 expecting success of 0100.1 'branch -d @{-1}': 
@@ -23386,116 +23390,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0201-gettext-fallbacks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0203-gettext-setlocale-sanity.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0203-gettext-setlocale-sanity/.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 0203.1 'git show a ISO-8859-1 commit under C locale': 
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-	test_commit "iso-c-commit" iso-under-c &&
-	git show >out 2>err &&
-	test_must_be_empty err &&
-	grep -q "iso-c-commit" out
-
-Warning: commit message did not conform to UTF-8.
-You may want to amend it after fixing the message, or set the config
-variable i18n.commitEncoding to the encoding your project uses.
-[master (root-commit) f2030b4] iso-c-commit
- Author: �éí óú <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 iso-under-c
-ok 1 - git show a ISO-8859-1 commit under C locale
-
-expecting success of 0203.2 'git show a ISO-8859-1 commit under a UTF-8 locale': 
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-	test_commit "iso-utf8-commit" iso-under-utf8 &&
-	LANGUAGE=is LC_ALL="$is_IS_locale" git show >out 2>err &&
-	test_must_be_empty err &&
-	grep -q "iso-utf8-commit" out
-
-Warning: commit message did not conform to UTF-8.
-You may want to amend it after fixing the message, or set the config
-variable i18n.commitEncoding to the encoding your project uses.
-[master 7495ea2] iso-utf8-commit
- Author: �éí óú <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 iso-under-utf8
-ok 2 - git show a ISO-8859-1 commit under a UTF-8 locale
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0200-gettext-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0200-gettext-basic/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -23618,6 +23512,76 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0201-gettext-fallbacks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0202-gettext-perl.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0202-gettext-perl/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -23641,8 +23605,8 @@
 ok 3 - sanity: Git::I18N has 3 export(s)
 ok 4 - sanity: Git::I18N exports everything by default
 ok 5 - sanity: __ has a $ prototype
-ok 6 - sanity: __n has a $$$ prototype
-ok 7 - sanity: N__ has a $ prototype
+ok 6 - sanity: N__ has a $ prototype
+ok 7 - sanity: __n has a $$$ prototype
 ok 8 - Passing a string through __() in the C locale works
 ok 9 - Get singular string through __n() in C locale
 ok 10 - Get plural string through __n() in C locale
@@ -23655,6 +23619,46 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0203-gettext-setlocale-sanity.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0203-gettext-setlocale-sanity/.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 0203.1 'git show a ISO-8859-1 commit under C locale': 
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+	test_commit "iso-c-commit" iso-under-c &&
+	git show >out 2>err &&
+	test_must_be_empty err &&
+	grep -q "iso-c-commit" out
+
+Warning: commit message did not conform to UTF-8.
+You may want to amend it after fixing the message, or set the config
+variable i18n.commitEncoding to the encoding your project uses.
+[master (root-commit) f2030b4] iso-c-commit
+ Author: �éí óú <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 iso-under-c
+ok 1 - git show a ISO-8859-1 commit under C locale
+
+expecting success of 0203.2 'git show a ISO-8859-1 commit under a UTF-8 locale': 
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+	test_commit "iso-utf8-commit" iso-under-utf8 &&
+	LANGUAGE=is LC_ALL="$is_IS_locale" git show >out 2>err &&
+	test_must_be_empty err &&
+	grep -q "iso-utf8-commit" out
+
+Warning: commit message did not conform to UTF-8.
+You may want to amend it after fixing the message, or set the config
+variable i18n.commitEncoding to the encoding your project uses.
+[master 7495ea2] iso-utf8-commit
+ Author: �éí óú <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 iso-under-utf8
+ok 2 - git show a ISO-8859-1 commit under a UTF-8 locale
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0204-gettext-reencode-sanity.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0204-gettext-reencode-sanity/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -23701,590 +23705,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0212-trace2-event.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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":"20260304T075512.877600Z-H8d819085-P0004fe6f","thread":"main","time":"2026-03-04T07:55:12.877698Z","file":"common-main.c","line":57,"evt":"4","exe":"2.47.2"}
-{"event":"too_many_files","sid":"20260304T075512.877600Z-H8d819085-P0004fe6f","thread":"main","time":"2026-03-04T07:55:12.877709Z","file":"common-main.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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0210-trace2-normal.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0210-trace2-normal/.git/
-expecting success of 0210.1 'normal stream, return code 0': 
-	test_when_finished "rm trace.normal actual expect" &&
-	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 1 - normal stream, return code 0
-
-expecting success of 0210.2 'normal stream, return code 1': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 1 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 1
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:1
-		atexit elapsed:_TIME_ code:1
-	EOF
-	test_cmp expect actual
-
-ok 2 - normal stream, return code 1
-
-expecting success of 0210.3 'automatic filename': 
-	test_when_finished "rm -r traces actual expect" &&
-	mkdir traces &&
-	GIT_TRACE2="$(pwd)/traces" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <"$(ls traces/*)" >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 3 - automatic filename
-
-expecting success of 0210.4 'normal stream, exit code 0': 
-	test_when_finished "rm trace.normal actual expect" &&
-	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 002exit 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 4 - normal stream, exit code 0
-
-expecting success of 0210.5 'normal stream, exit code 1': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 1 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 002exit 1
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:1
-		atexit elapsed:_TIME_ code:1
-	EOF
-	test_cmp expect actual
-
-ok 5 - normal stream, exit code 1
-
-expecting success of 0210.6 'normal stream, error event': 
-	test_when_finished "rm trace.normal actual expect" &&
-	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 003error "hello world" "this is a test" &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 003error 'hello world' 'this is a test'
-		cmd_name trace2 (trace2)
-		error hello world
-		error this is a test
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-error: hello world
-error: this is a test
-ok 6 - normal stream, error event
-
-expecting success of 0210.7 'BUG messages are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 007bug &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 007bug
-		cmd_name trace2 (trace2)
-		error the bug message
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-BUG: t/helper/test-trace2.c:212: the bug message
-ok 7 - BUG messages are written to trace2
-
-expecting success of 0210.8 'bug messages with BUG_if_bug() are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
-		test-tool trace2 008bug 2>err &&
-	cat >expect <<-\EOF &&
-	a bug message
-	another bug message
-	an explicit BUG_if_bug() following bug() call(s) is nice, but not required
-	EOF
-	sed "s/^.*: //" <err >actual &&
-	test_cmp expect actual &&
-
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 008bug
-		cmd_name trace2 (trace2)
-		error a bug message
-		error another bug message
-		error an explicit BUG_if_bug() following bug() call(s) is nice, but not required
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-ok 8 - bug messages with BUG_if_bug() are written to trace2
-
-expecting success of 0210.9 'bug messages without explicit BUG_if_bug() are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
-		test-tool trace2 009bug_BUG 2>err &&
-	cat >expect <<-\EOF &&
-	a bug message
-	another bug message
-	had bug() call(s) in this process without explicit BUG_if_bug()
-	EOF
-	sed "s/^.*: //" <err >actual &&
-	test_cmp expect actual &&
-
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 009bug_BUG
-		cmd_name trace2 (trace2)
-		error a bug message
-		error another bug message
-		error on exit(): had bug() call(s) in this process without explicit BUG_if_bug()
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-ok 9 - bug messages without explicit BUG_if_bug() are written to trace2
-
-expecting success of 0210.10 'bug messages followed by BUG() are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
-		test-tool trace2 010bug_BUG 2>err &&
-	cat >expect <<-\EOF &&
-	a bug message
-	a BUG message
-	EOF
-	sed "s/^.*: //" <err >actual &&
-	test_cmp expect actual &&
-
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 010bug_BUG
-		cmd_name trace2 (trace2)
-		error a bug message
-		error a BUG message
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-ok 10 - bug messages followed by BUG() are written to trace2
-
-expecting success of 0210.11 'using global config, normal stream, return code 0': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_config_global trace2.normalBrief 1 &&
-	test_config_global trace2.normalTarget "$(pwd)/trace.normal" &&
-	test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 11 - using global config, normal stream, return code 0
-
-expecting success of 0210.12 'using global config with include': 
-	test_when_finished "rm trace.normal actual expect real.gitconfig" &&
-	test_config_global trace2.normalBrief 1 &&
-	test_config_global trace2.normalTarget "$(pwd)/trace.normal" &&
-	mv "$(pwd)/.gitconfig" "$(pwd)/real.gitconfig" &&
-	test_config_global include.path "$(pwd)/real.gitconfig" &&
-	test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 12 - using global config with include
-
-expecting success of 0210.13 'unsafe URLs are redacted by default': 
-	test_when_finished \
-		"rm -r trace.normal unredacted.normal clone clone2" &&
-
-	test_config_global \
-		"url.$(pwd).insteadOf" https://user:pwd@example.com/ &&
-	test_config_global trace2.configParams "core.*,remote.*.url" &&
-
-	GIT_TRACE2="$(pwd)/trace.normal" \
-		git clone https://user:pwd@example.com/ clone &&
-	! grep user:pwd trace.normal &&
-
-	GIT_TRACE2_REDACT=0 GIT_TRACE2="$(pwd)/unredacted.normal" \
-		git clone https://user:pwd@example.com/ clone2 &&
-	grep "start .* clone https://user:pwd@example.com" unredacted.normal &&
-	grep "remote.origin.url=https://user:pwd@example.com" unredacted.normal
-
-Cloning into 'clone'...
-warning: You appear to have cloned an empty repository.
-done.
-Cloning into 'clone2'...
-warning: You appear to have cloned an empty repository.
-done.
-07:55:13.366735 common-main.c:58                  start /build/reproducible-path/git-2.47.2/git clone https://user:pwd@example.com/ clone2
-07:55:13.368117 config.c:3119                     def_param scope:unknown remote.origin.url=https://user:pwd@example.com/
-ok 13 - unsafe URLs are redacted by default
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0021-conversion.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0021-conversion/.git/
 expecting success of 0021.1 'setup': 
@@ -24603,7 +24023,7 @@
 
 [main 2e1b3a0] one
  Author: A U Thor <author@example.com>
- 9 files changed, 10 insertions(+)
+ 9 files changed, 8 insertions(+)
  create mode 100644 30MB
  create mode 100644 big
  create mode 100644 empty-in-repo
@@ -25073,8 +24493,8 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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-03-04 07:55:07.575352315 +0000
-+++ smudge-write-fail.r	2026-03-04 07:55:07.843352315 +0000
+--- smudge-write-fail.o	2025-01-30 02:07:14.486478488 +0000
++++ smudge-write-fail.r	2025-01-30 02:07:14.838480598 +0000
 @@ -1 +1 @@
 -this is going to fail
 +guvf vf tbvat gb snvy
@@ -25520,58 +24940,642 @@
 1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0090-cache-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t0212-trace2-event.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-ok 2 - read-tree HEAD establishes cache-tree
+error: hello world
+error: this is a test
+ok 1 - event stream, error event
 
-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
+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
 
-HEAD is now at ddd63c9 foo
-ok 3 - git-add invalidates cache-tree
+ok 2 - event stream, return code 0
 
-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
+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
 
-error: invalid object 040000 59d259507ddf2acc00997a8b70c61d7bdc240440 for 'dirx'
-HEAD is now at ddd63c9 foo
-ok 4 - git-add in subdir invalidates cache-tree
+ok 3 - event stream, list config
 
-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 &&
+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":"20250130T020723.017339Z-H5c947e1c-P0018ea0c","thread":"main","time":"2025-01-30T02:07:23.017439Z","file":"common-main.c","line":57,"evt":"4","exe":"2.47.2"}
+{"event":"too_many_files","sid":"20250130T020723.017339Z-H5c947e1c-P0018ea0c","thread":"main","time":"2025-01-30T02:07:23.017453Z","file":"common-main.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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0210-trace2-normal.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0210-trace2-normal/.git/
+expecting success of 0210.1 'normal stream, return code 0': 
+	test_when_finished "rm trace.normal actual expect" &&
+	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
+
+ok 1 - normal stream, return code 0
+
+expecting success of 0210.2 'normal stream, return code 1': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 1 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 1
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:1
+		atexit elapsed:_TIME_ code:1
+	EOF
+	test_cmp expect actual
+
+ok 2 - normal stream, return code 1
+
+expecting success of 0210.3 'automatic filename': 
+	test_when_finished "rm -r traces actual expect" &&
+	mkdir traces &&
+	GIT_TRACE2="$(pwd)/traces" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <"$(ls traces/*)" >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
+
+ok 3 - automatic filename
+
+expecting success of 0210.4 'normal stream, exit code 0': 
+	test_when_finished "rm trace.normal actual expect" &&
+	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 002exit 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
+
+ok 4 - normal stream, exit code 0
+
+expecting success of 0210.5 'normal stream, exit code 1': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 1 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 002exit 1
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:1
+		atexit elapsed:_TIME_ code:1
+	EOF
+	test_cmp expect actual
+
+ok 5 - normal stream, exit code 1
+
+expecting success of 0210.6 'normal stream, error event': 
+	test_when_finished "rm trace.normal actual expect" &&
+	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 003error "hello world" "this is a test" &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 003error 'hello world' 'this is a test'
+		cmd_name trace2 (trace2)
+		error hello world
+		error this is a test
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
+
+error: hello world
+error: this is a test
+ok 6 - normal stream, error event
+
+expecting success of 0210.7 'BUG messages are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 007bug &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 007bug
+		cmd_name trace2 (trace2)
+		error the bug message
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+
+BUG: t/helper/test-trace2.c:212: the bug message
+ok 7 - BUG messages are written to trace2
+
+expecting success of 0210.8 'bug messages with BUG_if_bug() are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 008bug 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	another bug message
+	an explicit BUG_if_bug() following bug() call(s) is nice, but not required
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
+
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 008bug
+		cmd_name trace2 (trace2)
+		error a bug message
+		error another bug message
+		error an explicit BUG_if_bug() following bug() call(s) is nice, but not required
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+
+ok 8 - bug messages with BUG_if_bug() are written to trace2
+
+expecting success of 0210.9 'bug messages without explicit BUG_if_bug() are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 009bug_BUG 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	another bug message
+	had bug() call(s) in this process without explicit BUG_if_bug()
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
+
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 009bug_BUG
+		cmd_name trace2 (trace2)
+		error a bug message
+		error another bug message
+		error on exit(): had bug() call(s) in this process without explicit BUG_if_bug()
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+
+ok 9 - bug messages without explicit BUG_if_bug() are written to trace2
+
+expecting success of 0210.10 'bug messages followed by BUG() are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 010bug_BUG 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	a BUG message
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
+
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 010bug_BUG
+		cmd_name trace2 (trace2)
+		error a bug message
+		error a BUG message
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+
+ok 10 - bug messages followed by BUG() are written to trace2
+
+expecting success of 0210.11 'using global config, normal stream, return code 0': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_config_global trace2.normalBrief 1 &&
+	test_config_global trace2.normalTarget "$(pwd)/trace.normal" &&
+	test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
+
+ok 11 - using global config, normal stream, return code 0
+
+expecting success of 0210.12 'using global config with include': 
+	test_when_finished "rm trace.normal actual expect real.gitconfig" &&
+	test_config_global trace2.normalBrief 1 &&
+	test_config_global trace2.normalTarget "$(pwd)/trace.normal" &&
+	mv "$(pwd)/.gitconfig" "$(pwd)/real.gitconfig" &&
+	test_config_global include.path "$(pwd)/real.gitconfig" &&
+	test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
+
+ok 12 - using global config with include
+
+expecting success of 0210.13 'unsafe URLs are redacted by default': 
+	test_when_finished \
+		"rm -r trace.normal unredacted.normal clone clone2" &&
+
+	test_config_global \
+		"url.$(pwd).insteadOf" https://user:pwd@example.com/ &&
+	test_config_global trace2.configParams "core.*,remote.*.url" &&
+
+	GIT_TRACE2="$(pwd)/trace.normal" \
+		git clone https://user:pwd@example.com/ clone &&
+	! grep user:pwd trace.normal &&
+
+	GIT_TRACE2_REDACT=0 GIT_TRACE2="$(pwd)/unredacted.normal" \
+		git clone https://user:pwd@example.com/ clone2 &&
+	grep "start .* clone https://user:pwd@example.com" unredacted.normal &&
+	grep "remote.origin.url=https://user:pwd@example.com" unredacted.normal
+
+Cloning into 'clone'...
+warning: You appear to have cloned an empty repository.
+done.
+Cloning into 'clone2'...
+warning: You appear to have cloned an empty repository.
+done.
+02:07:23.380564 common-main.c:58                  start /build/reproducible-path/git-2.47.2/git clone https://user:pwd@example.com/ clone2
+02:07:23.381896 config.c:3119                     def_param scope:unknown remote.origin.url=https://user:pwd@example.com/
+ok 13 - unsafe URLs are redacted by default
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0090-cache-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
@@ -27768,100 +27772,98 @@
 1..218
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0411-clone-from-partial.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+*** t0052-simple-ipc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	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 &&
+ok 1 - start simple command server
 
-	# empty shallow file disables local clone optimization
-	>evil/.git/shallow
+expecting success of 0052.2 'simple command server': 
+	test-tool simple-ipc send --token=ping >actual &&
+	echo pong >expect &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+ok 2 - simple command server
 
-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 "detected dubious ownership" err &&
-	test_grep ! "fake-upload-pack running" err &&
-	test_path_is_missing script-executed
+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
 
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0411-clone-from-partial/evil/.git'
-ok 2 - local clone must not fetch from promisor remote and execute script
+error: socket/pipe already in use: 'ipc-test'
+ok 3 - servers cannot share the same path
 
-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 "detected dubious ownership" err &&
-	test_grep ! "fake-upload-pack running" err &&
-	test_path_is_missing script-executed
+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: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0411-clone-from-partial/evil/.git'
-ok 3 - clone from file://... must not fetch from promisor remote and execute script
+ok 4 - big response
 
-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 "detected dubious ownership" err &&
-	test_grep ! "fake-upload-pack running" err &&
-	test_path_is_missing script-executed
+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
 
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0411-clone-from-partial/evil/.git'
-ok 4 - fetch from file://... must not fetch from promisor remote and execute script
+ok 5 - chunk response
 
-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
+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
 
-fake-upload-pack running
-ok 5 - pack-objects should fetch from promisor remote and execute script
+ok 6 - slow response
 
-expecting success of 0411.6 'clone from promisor remote does not lazy-fetch by default': 
-	rm -f script-executed &&
-	test_must_fail git clone evil no-lazy 2>err &&
-	test_grep "lazy fetching disabled" err &&
-	test_path_is_missing script-executed
+expecting success of 0052.7 'sendbytes': 
+	test-tool simple-ipc sendbytes --bytecount=100000 --byte=A >actual &&
+	grep "sent:A00100000 rcvd:A00100000" actual
 
-remote: warning: lazy fetching disabled; some objects may not be available        
-ok 6 - clone from promisor remote does not lazy-fetch by default
+sent:A00100000 rcvd:A00100000
+ok 7 - sendbytes
 
-expecting success of 0411.7 'promisor lazy-fetching can be re-enabled': 
-	rm -f script-executed &&
-	test_must_fail env GIT_NO_LAZY_FETCH=0 \
-		git clone evil lazy-ok 2>err &&
-	test_grep "fake-upload-pack running" err &&
-	test_path_is_file script-executed
+expecting success of 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
 
-remote: fake-upload-pack running        
-ok 7 - promisor lazy-fetching can be re-enabled
+client (good 91) (join 0), (errors 0)
+ok 8 - stress test threads
 
-# passed all 7 test(s)
-1..7
+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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0211-trace2-perf.sh ***
@@ -28063,26 +28065,26 @@
 Cloning into 'clone2'...
 warning: You appear to have cloned an empty repository.
 done.
-07:55:13.503826 common-main.c:58|d0|main|start||_T_REL_|||/build/reproducible-path/git-2.47.2/git clone https://user:pwd@example.com/ clone2
-07:55:13.505215 config.c:3119|d0|main|def_param||||scope:unknow|remote.origin.url:https://user:pwd@example.com/
+02:07:23.208439 common-main.c:58|d0|main|start||_T_REL_|||/build/reproducible-path/git-2.47.2/git clone https://user:pwd@example.com/ clone2
+02:07:23.209783 config.c:3119|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.47.2
-07:55:13.710515 git.c:480|d0|main|cmd_name|||||version (version)
-07:55:13.710606 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:13.710622 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:23.484180 git.c:480|d0|main|cmd_name|||||version (version)
+02:07:23.484274 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:23.484289 trace2.c:438|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
-07:55:13.917928 git.c:188|d0|main|cmd_name|||||_query_ (_query_)
-07:55:13.918020 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:13.918036 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:23.738352 git.c:188|d0|main|cmd_name|||||_query_ (_query_)
+02:07:23.738441 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:23.738458 trace2.c:438|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_': 
@@ -28110,12 +28112,12 @@
 
 warning: url has no scheme: y/
 fatal: credential url cannot be parsed: y/
-07:55:14.135899 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-07:55:14.135948 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:14.135962 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-07:55:14.197929 remote-curl.c:1572|d1|main|cmd_name|||||remote-curl (_run_dashed_/remote-curl)
-07:55:14.197954 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:14.197973 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:24.056945 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+02:07:24.056996 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:24.057011 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:24.094675 remote-curl.c:1572|d1|main|cmd_name|||||remote-curl (_run_dashed_/remote-curl)
+02:07:24.094700 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:24.094716 trace2.c:438|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_': 
@@ -28142,12 +28144,12 @@
 	grep "d1|main|def_param|.*|cfg.prop.foo:red" actual &&
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
-07:55:14.572133 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-07:55:14.572184 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:14.572199 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-07:55:14.612659 http-fetch.c:151|d1|main|cmd_name|||||http-fetch (_run_dashed_/http-fetch)
-07:55:14.612683 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:14.612699 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:24.437622 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+02:07:24.437674 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:24.437689 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:24.471737 http-fetch.c:151|d1|main|cmd_name|||||http-fetch (_run_dashed_/http-fetch)
+02:07:24.471764 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:24.471780 trace2.c:438|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': 
@@ -28185,13 +28187,13 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.47.2
-07:55:15.020568 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-07:55:15.020753 git.c:831|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_git_alias_)
-07:55:15.020624 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:15.020640 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-07:55:15.030860 git.c:480|d1|main|cmd_name|||||version (_run_dashed_/_run_git_alias_/version)
-07:55:15.030950 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:15.030968 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:24.812153 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+02:07:24.812339 git.c:831|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_git_alias_)
+02:07:24.812205 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:24.812225 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:24.828997 git.c:480|d1|main|cmd_name|||||version (_run_dashed_/_run_git_alias_/version)
+02:07:24.829083 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:24.829100 trace2.c:438|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': 
@@ -28232,13 +28234,13 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.47.2
-07:55:15.422937 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-07:55:15.423161 git.c:396|d0|main|cmd_name|||||_run_shell_alias_ (_run_dashed_/_run_shell_alias_)
-07:55:15.422989 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:15.423004 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-07:55:15.444910 git.c:480|d1|main|cmd_name|||||version (_run_dashed_/_run_shell_alias_/version)
-07:55:15.445025 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:15.445044 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:25.260102 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+02:07:25.260357 git.c:396|d0|main|cmd_name|||||_run_shell_alias_ (_run_dashed_/_run_shell_alias_)
+02:07:25.260158 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:25.260175 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:25.277935 git.c:480|d1|main|cmd_name|||||version (_run_dashed_/_run_shell_alias_/version)
+02:07:25.278028 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:25.278045 trace2.c:438|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': 
@@ -28289,23 +28291,119 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.47.2
-07:55:15.859917 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-07:55:15.859995 run-command.c:733|d0|main|child_start||_T_REL_|||[ch0] class:dashed argv:[git-xxx]
-07:55:15.860081 git.c:431|d0|main|alias|||||alias:xxx argv:[yyy]
-07:55:15.860136 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_/_run_dashed_)
-07:55:15.860140 run-command.c:733|d0|main|child_start||_T_REL_|||[ch1] class:dashed argv:[git-yyy]
-07:55:15.860210 git.c:431|d0|main|alias|||||alias:yyy argv:[version]
-07:55:15.860216 git.c:831|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_dashed_/_run_git_alias_)
-07:55:15.859985 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-07:55:15.870415 git.c:480|d1|main|cmd_name|||||version (_run_dashed_/_run_dashed_/_run_git_alias_/version)
-07:55:15.870508 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
-07:55:15.870525 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:25.684440 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+02:07:25.684519 run-command.c:733|d0|main|child_start||_T_REL_|||[ch0] class:dashed argv:[git-xxx]
+02:07:25.684632 git.c:431|d0|main|alias|||||alias:xxx argv:[yyy]
+02:07:25.684698 git.c:775|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_/_run_dashed_)
+02:07:25.684702 run-command.c:733|d0|main|child_start||_T_REL_|||[ch1] class:dashed argv:[git-yyy]
+02:07:25.684780 git.c:431|d0|main|alias|||||alias:yyy argv:[version]
+02:07:25.684787 git.c:831|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_dashed_/_run_git_alias_)
+02:07:25.684509 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+02:07:25.696972 git.c:480|d1|main|cmd_name|||||version (_run_dashed_/_run_dashed_/_run_git_alias_/version)
+02:07:25.697068 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
+02:07:25.697086 trace2.c:438|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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0411-clone-from-partial.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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 "detected dubious ownership" err &&
+	test_grep ! "fake-upload-pack running" err &&
+	test_path_is_missing script-executed
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0411-clone-from-partial/evil/.git'
+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 "detected dubious ownership" err &&
+	test_grep ! "fake-upload-pack running" err &&
+	test_path_is_missing script-executed
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0411-clone-from-partial/evil/.git'
+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 "detected dubious ownership" err &&
+	test_grep ! "fake-upload-pack running" err &&
+	test_path_is_missing script-executed
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t0411-clone-from-partial/evil/.git'
+ok 4 - fetch from file://... must not fetch from promisor remote and execute script
+
+expecting success of 0411.5 'pack-objects should fetch from promisor remote and execute script': 
+	rm -f script-executed &&
+	echo "HEAD" | test_must_fail git -C evil pack-objects --revs --stdout >/dev/null 2>err &&
+	test_grep "fake-upload-pack running" err &&
+	test_path_is_file script-executed
+
+fake-upload-pack running
+ok 5 - pack-objects should fetch from promisor remote and execute script
+
+expecting success of 0411.6 'clone from promisor remote does not lazy-fetch by default': 
+	rm -f script-executed &&
+	test_must_fail git clone evil no-lazy 2>err &&
+	test_grep "lazy fetching disabled" err &&
+	test_path_is_missing script-executed
+
+remote: warning: lazy fetching disabled; some objects may not be available        
+ok 6 - clone from promisor remote does not lazy-fetch by default
+
+expecting success of 0411.7 'promisor lazy-fetching can be re-enabled': 
+	rm -f script-executed &&
+	test_must_fail env GIT_NO_LAZY_FETCH=0 \
+		git clone evil lazy-ok 2>err &&
+	test_grep "fake-upload-pack running" err &&
+	test_path_is_file script-executed
+
+remote: fake-upload-pack running        
+ok 7 - promisor lazy-fetching can be re-enabled
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0500-progress-display.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0500-progress-display/.git/
 expecting success of 0500.1 'simple progress display': 
@@ -28633,10 +28731,10 @@
 	grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event &&
 	grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
 
-{"event":"region_enter","sid":"20260304T075517.497727Z-H8d819085-P00051270","thread":"main","time":"2026-03-04T07:55:17.498147Z","file":"progress.c","line":272,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"region_leave","sid":"20260304T075517.497727Z-H8d819085-P00051270","thread":"main","time":"2026-03-04T07:55:17.498189Z","file":"progress.c","line":350,"repo":0,"t_rel":0.000043,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"data","sid":"20260304T075517.497727Z-H8d819085-P00051270","thread":"main","time":"2026-03-04T07:55:17.498178Z","file":"progress.c","line":343,"repo":0,"t_abs":0.000639,"t_rel":0.000032,"nesting":2,"category":"progress","key":"total_objects","value":"40"}
-{"event":"data","sid":"20260304T075517.497727Z-H8d819085-P00051270","thread":"main","time":"2026-03-04T07:55:17.498184Z","file":"progress.c","line":347,"repo":0,"t_abs":0.000645,"t_rel":0.000038,"nesting":2,"category":"progress","key":"total_bytes","value":"409600"}
+{"event":"region_enter","sid":"20250130T020727.078347Z-H5c947e1c-P0018f6b1","thread":"main","time":"2025-01-30T02:07:27.078732Z","file":"progress.c","line":272,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_leave","sid":"20250130T020727.078347Z-H5c947e1c-P0018f6b1","thread":"main","time":"2025-01-30T02:07:27.078773Z","file":"progress.c","line":350,"repo":0,"t_rel":0.000041,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"data","sid":"20250130T020727.078347Z-H5c947e1c-P0018f6b1","thread":"main","time":"2025-01-30T02:07:27.078762Z","file":"progress.c","line":343,"repo":0,"t_abs":0.000622,"t_rel":0.000030,"nesting":2,"category":"progress","key":"total_objects","value":"40"}
+{"event":"data","sid":"20250130T020727.078347Z-H5c947e1c-P0018f6b1","thread":"main","time":"2025-01-30T02:07:27.078768Z","file":"progress.c","line":347,"repo":0,"t_abs":0.000628,"t_rel":0.000036,"nesting":2,"category":"progress","key":"total_bytes","value":"409600"}
 ok 12 - progress generates traces
 
 expecting success of 0500.13 'progress generates traces: stop / start': 
@@ -28649,8 +28747,8 @@
 		<in 2>stderr &&
 	test_region progress "Working hard" trace-startstop.event
 
-{"event":"region_enter","sid":"20260304T075517.524742Z-H8d819085-P000512a7","thread":"main","time":"2026-03-04T07:55:17.525165Z","file":"progress.c","line":272,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"region_leave","sid":"20260304T075517.524742Z-H8d819085-P000512a7","thread":"main","time":"2026-03-04T07:55:17.525180Z","file":"progress.c","line":350,"repo":0,"t_rel":0.000015,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_enter","sid":"20250130T020727.181931Z-H5c947e1c-P0018f713","thread":"main","time":"2025-01-30T02:07:27.182292Z","file":"progress.c","line":272,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_leave","sid":"20250130T020727.181931Z-H5c947e1c-P0018f713","thread":"main","time":"2025-01-30T02:07:27.182305Z","file":"progress.c","line":350,"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': 
@@ -28665,7 +28763,7 @@
 	grep region_enter.*progress trace-start.event &&
 	! grep region_leave.*progress trace-start.event
 
-{"event":"region_enter","sid":"20260304T075517.574536Z-H8d819085-P000512dc","thread":"main","time":"2026-03-04T07:55:17.574910Z","file":"progress.c","line":272,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_enter","sid":"20250130T020727.288367Z-H5c947e1c-P0018f763","thread":"main","time":"2025-01-30T02:07:27.288756Z","file":"progress.c","line":272,"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': 
@@ -28694,8 +28792,8 @@
 	grep region_enter.*progress.*Two trace-2start.event &&
 	! grep region_leave trace-2start.event
 
-{"event":"region_enter","sid":"20260304T075517.712134Z-H8d819085-P00051378","thread":"main","time":"2026-03-04T07:55:17.712532Z","file":"progress.c","line":272,"repo":0,"nesting":1,"category":"progress","label":"One"}
-{"event":"region_enter","sid":"20260304T075517.712134Z-H8d819085-P00051378","thread":"main","time":"2026-03-04T07:55:17.712537Z","file":"progress.c","line":272,"repo":0,"nesting":2,"category":"progress","label":"Two"}
+{"event":"region_enter","sid":"20250130T020727.425982Z-H5c947e1c-P0018f7d4","thread":"main","time":"2025-01-30T02:07:27.426342Z","file":"progress.c","line":272,"repo":0,"nesting":1,"category":"progress","label":"One"}
+{"event":"region_enter","sid":"20250130T020727.425982Z-H5c947e1c-P0018f7d4","thread":"main","time":"2025-01-30T02:07:27.426347Z","file":"progress.c","line":272,"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)
@@ -29188,100 +29286,6 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0052-simple-ipc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0602-reffiles-fsck.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0602-reffiles-fsck/.git/
 expecting success of 0602.1 'ref name should be checked': 
@@ -30500,11 +30504,1675 @@
 	jgit --version
 
 )
-t0612-reftable-jgit-compatibility.sh: 7: eval: jgit: not found
+./test-lib.sh: line 1056: 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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0600-reffiles-backend.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t0600-reffiles-backend/subdir/
+--- subdir.dir	2025-01-30 02:07:33.158590457 +0000
++++ our.dir	2025-01-30 02:07:33.170590529 +0000
+@@ -1 +1 @@
+-/build/reproducible-path/git-2.47.2/t/trash directory.t0600-reffiles-backend/subdir
++/build/reproducible-path/git-2.47.2/t/trash directory.t0600-reffiles-backend/.git
+commit 89a3a1dedc5a76d0eefcd624dfb8d4f8004a1994
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    first
+
+commit c2327cb6b086a944f739ef59ddcffd3d45998884
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Third
+
+commit e6940ad615916edba236dd73cb432b3598c8537f
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Second
+
+commit d31adcd248e1f85d12741183d231fa5260dcfd5e
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Initial
+Deleted branch rename-dest (was 89a3a1d).
+ok 29 - git branch -m with symlinked .git/refs
+
+checking prerequisite: SYMLINKS_WINDOWS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS_WINDOWS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS_WINDOWS" &&
+	# test whether symbolic links are enabled on Windows
+	test_have_prereq MINGW &&
+	cmd //c "mklink y x" &> /dev/null && test -h y
+
+)
+prerequisite SYMLINKS_WINDOWS not satisfied
+ok 30 # skip rebase when .git/logs is a symlink (missing SYMLINKS_WINDOWS,MINGW of MINGW,SYMLINKS_WINDOWS)
+
+expecting success of 0600.31 'git reflog expire honors core.sharedRepository': 
+	umask 077 &&
+	git config core.sharedRepository group &&
+	git reflog expire --all &&
+	actual="$(ls -l .git/logs/refs/heads/main)" &&
+	case "$actual" in
+	-rw-rw-*)
+		: happy
+		;;
+	*)
+		echo Ooops, .git/logs/refs/heads/main is not 066x [$actual]
+		false
+		;;
+	esac
+
+ok 31 - git reflog expire honors core.sharedRepository
+
+expecting success of 0600.32 'symref transaction supports symlinks': 
+	test_when_finished "git symbolic-ref -d TEST_SYMREF_HEAD" &&
+	git update-ref refs/heads/new @ &&
+	test_config core.prefersymlinkrefs true &&
+	cat >stdin <<-EOF &&
+	start
+	symref-create TEST_SYMREF_HEAD refs/heads/new
+	prepare
+	commit
+	EOF
+	git update-ref --no-deref --stdin <stdin &&
+	test_path_is_symlink .git/TEST_SYMREF_HEAD &&
+	test "$(test_readlink .git/TEST_SYMREF_HEAD)" = refs/heads/new
+
+start: ok
+prepare: ok
+commit: ok
+ok 32 - symref transaction supports symlinks
+
+expecting success of 0600.33 'symref transaction supports false symlink config': 
+	test_when_finished "git symbolic-ref -d TEST_SYMREF_HEAD" &&
+	git update-ref refs/heads/new @ &&
+	test_config core.prefersymlinkrefs false &&
+	cat >stdin <<-EOF &&
+	start
+	symref-create TEST_SYMREF_HEAD refs/heads/new
+	prepare
+	commit
+	EOF
+	git update-ref --no-deref --stdin <stdin &&
+	test_path_is_file .git/TEST_SYMREF_HEAD &&
+	git symbolic-ref TEST_SYMREF_HEAD >actual &&
+	echo refs/heads/new >expect &&
+	test_cmp expect actual
+
+start: ok
+prepare: ok
+commit: ok
+ok 33 - symref transaction supports false symlink config
+
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0301-credential-cache.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0301-credential-cache/.git/
+expecting success of 0301.1 'helper (cache) has no existing data': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 1 - helper (cache) has no existing data
+
+expecting success of 0301.2 'helper (cache) stores password': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=store-user
+		password=store-pass
+		EOF
+	
+ok 2 - helper (cache) stores password
+
+expecting success of 0301.3 'helper (cache) can retrieve password': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=store-user
+		password=store-pass
+		--
+		EOF
+	
+ok 3 - helper (cache) can retrieve password
+
+expecting success of 0301.4 'helper (cache) requires matching protocol': 
+		check fill $HELPER <<-\EOF
+		protocol=http
+		host=example.com
+		--
+		protocol=http
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'http://example.com':
+		askpass: Password for 'http://askpass-username@example.com':
+		EOF
+	
+ok 4 - helper (cache) requires matching protocol
+
+expecting success of 0301.5 'helper (cache) requires matching host': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=other.tld
+		--
+		protocol=https
+		host=other.tld
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://other.tld':
+		askpass: Password for 'https://askpass-username@other.tld':
+		EOF
+	
+ok 5 - helper (cache) requires matching host
+
+expecting success of 0301.6 'helper (cache) requires matching username': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=other
+		--
+		protocol=https
+		host=example.com
+		username=other
+		password=askpass-password
+		--
+		askpass: Password for 'https://other@example.com':
+		EOF
+	
+ok 6 - helper (cache) requires matching username
+
+expecting success of 0301.7 'helper (cache) requires matching path': 
+		test_config credential.usehttppath true &&
+		check approve $HELPER <<-\EOF &&
+		protocol=http
+		host=path.tld
+		path=foo.git
+		username=user
+		password=pass
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=http
+		host=path.tld
+		path=bar.git
+		--
+		protocol=http
+		host=path.tld
+		path=bar.git
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'http://path.tld/bar.git':
+		askpass: Password for 'http://askpass-username@path.tld/bar.git':
+		EOF
+	
+ok 7 - helper (cache) requires matching path
+
+expecting success of 0301.8 'helper (cache) overwrites on store': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=askpass-password
+		--
+		askpass: Password for 'https://user-overwrite@example.com':
+		EOF
+	
+ok 8 - helper (cache) overwrites on store
+
+expecting success of 0301.9 'helper (cache) can forget host': 
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 9 - helper (cache) can forget host
+
+expecting success of 0301.10 'helper (cache) can store multiple users': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		--
+		protocol=https
+		host=example.com
+		username=user1
+		password=pass1
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user2
+		--
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+	
+ok 10 - helper (cache) can store multiple users
+
+expecting success of 0301.11 'helper (cache) does not erase a password distinct from input': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass1
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		--
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass1
+		EOF
+	
+ok 11 - helper (cache) does not erase a password distinct from input
+
+expecting success of 0301.12 'helper (cache) can forget user': 
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user1
+		--
+		protocol=https
+		host=example.com
+		username=user1
+		password=askpass-password
+		--
+		askpass: Password for 'https://user1@example.com':
+		EOF
+	
+ok 12 - helper (cache) can forget user
+
+expecting success of 0301.13 'helper (cache) remembers other user': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user2
+		--
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+	
+ok 13 - helper (cache) remembers other user
+
+expecting success of 0301.14 'helper (cache) can store empty username': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=sso.tld
+		username=
+		password=
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=sso.tld
+		--
+		protocol=https
+		host=sso.tld
+		username=
+		password=
+		EOF
+	
+ok 14 - helper (cache) can store empty username
+
+expecting success of 0301.15 'helper (cache) erases all matching credentials': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-erase1
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-erase2
+		password=pass1
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 15 - helper (cache) erases all matching credentials
+
+expecting success of 0301.16 'helper (cache) not confused by long header': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=victim.example.com
+		username=user
+		password=to-be-stolen
+		EOF
+
+		check fill $HELPER <<-EOF
+		protocol=https
+		host=badguy.example.com
+		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
+		--
+		protocol=https
+		host=badguy.example.com
+		username=askpass-username
+		password=askpass-password
+		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
+		--
+		askpass: Username for 'https://badguy.example.com':
+		askpass: Password for 'https://askpass-username@badguy.example.com':
+		EOF
+	
+ok 16 - helper (cache) not confused by long header
+
+expecting success of 0301.17 'helper (cache) stores password_expiry_utc': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-expiry
+		password=pass
+		password_expiry_utc=9999999999
+		EOF
+	
+ok 17 - helper (cache) stores password_expiry_utc
+
+expecting success of 0301.18 'helper (cache) gets password_expiry_utc': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-expiry
+		--
+		protocol=https
+		host=example.com
+		username=user-expiry
+		password=pass
+		password_expiry_utc=9999999999
+		--
+		EOF
+	
+ok 18 - helper (cache) gets password_expiry_utc
+
+expecting success of 0301.19 'helper (cache) overwrites when password_expiry_utc changes': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass1
+		password_expiry_utc=9999999998
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass2
+		password_expiry_utc=9999999999
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass2
+		password_expiry_utc=9999999999
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=askpass-password
+		--
+		askpass: Password for 'https://user-expiry-overwrite@example.com':
+		EOF
+	
+ok 19 - helper (cache) overwrites when password_expiry_utc changes
+
+expecting success of 0301.20 'helper (cache) stores oauth_refresh_token': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user4
+		password=pass
+		oauth_refresh_token=xyzzy
+		EOF
+	
+ok 20 - helper (cache) stores oauth_refresh_token
+
+expecting success of 0301.21 'helper (cache) gets oauth_refresh_token': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user4
+		--
+		protocol=https
+		host=example.com
+		username=user4
+		password=pass
+		oauth_refresh_token=xyzzy
+		--
+		EOF
+	
+ok 21 - helper (cache) gets oauth_refresh_token
+
+expecting success of 0301.22 'helper (cache) stores authtype and credential': 
+		check approve $HELPER <<-\EOF
+		capability[]=authtype
+		authtype=Bearer
+		credential=random-token
+		protocol=https
+		host=git.example.com
+		EOF
+	
+ok 22 - helper (cache) stores authtype and credential
+
+expecting success of 0301.23 'helper (cache) gets authtype and credential': 
+		check fill $HELPER <<-\EOF
+		capability[]=authtype
+		protocol=https
+		host=git.example.com
+		--
+		capability[]=authtype
+		authtype=Bearer
+		credential=random-token
+		protocol=https
+		host=git.example.com
+		--
+		EOF
+	
+ok 23 - helper (cache) gets authtype and credential
+
+expecting success of 0301.24 'helper (cache) 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 24 - helper (cache) stores authtype and credential with username
+
+expecting success of 0301.25 '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 25 - helper (cache) gets authtype and credential with username
+
+expecting success of 0301.26 '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 26 - helper (cache) does not get authtype and credential with different username
+
+expecting success of 0301.27 'helper (cache) does not store ephemeral authtype and credential': 
+		check approve $HELPER <<-\EOF &&
+		capability[]=authtype
+		authtype=Bearer
+		credential=git2-token
+		protocol=https
+		host=git2.example.com
+		ephemeral=1
+		EOF
+
+		check fill $HELPER <<-\EOF
+		capability[]=authtype
+		protocol=https
+		host=git2.example.com
+		--
+		protocol=https
+		host=git2.example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://git2.example.com':
+		askpass: Password for 'https://askpass-username@git2.example.com':
+		EOF
+	
+ok 27 - helper (cache) does not store ephemeral authtype and credential
+
+expecting success of 0301.28 'helper (cache) does not store ephemeral username and password': 
+		check approve $HELPER <<-\EOF &&
+		capability[]=authtype
+		protocol=https
+		host=git2.example.com
+		user=barbaz
+		password=secret
+		ephemeral=1
+		EOF
+
+		check fill $HELPER <<-\EOF
+		capability[]=authtype
+		protocol=https
+		host=git2.example.com
+		--
+		protocol=https
+		host=git2.example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://git2.example.com':
+		askpass: Password for 'https://askpass-username@git2.example.com':
+		EOF
+	
+ok 28 - helper (cache) does not store ephemeral username and password
+
+expecting success of 0301.29 'socket defaults to ~/.cache/git/credential/socket': 
+	test_when_finished "
+		git credential-cache exit &&
+		rmdir -p .cache/git/credential/
+	" &&
+	test_path_is_missing "$HOME/.git-credential-cache" &&
+	test_path_is_socket "$HOME/.cache/git/credential/socket"
+
+ok 29 - socket defaults to ~/.cache/git/credential/socket
+
+expecting success of 0301.30 '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 30 - helper (cache) has no existing data
+
+expecting success of 0301.31 'helper (cache) stores password': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=store-user
+		password=store-pass
+		EOF
+	
+ok 31 - helper (cache) stores password
+
+expecting success of 0301.32 '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 32 - helper (cache) can retrieve password
+
+expecting success of 0301.33 '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 33 - helper (cache) requires matching protocol
+
+expecting success of 0301.34 '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 34 - helper (cache) requires matching host
+
+expecting success of 0301.35 '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 35 - helper (cache) requires matching username
+
+expecting success of 0301.36 '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 36 - helper (cache) requires matching path
+
+expecting success of 0301.37 '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 37 - helper (cache) overwrites on store
+
+expecting success of 0301.38 '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 38 - helper (cache) can forget host
+
+expecting success of 0301.39 '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 39 - helper (cache) can store multiple users
+
+expecting success of 0301.40 '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 40 - helper (cache) does not erase a password distinct from input
+
+expecting success of 0301.41 '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 41 - helper (cache) can forget user
+
+expecting success of 0301.42 '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 42 - helper (cache) remembers other user
+
+expecting success of 0301.43 '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 43 - helper (cache) can store empty username
+
+expecting success of 0301.44 '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 44 - helper (cache) erases all matching credentials
+
+expecting success of 0301.45 '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 45 - helper (cache) not confused by long header
+
+expecting success of 0301.46 '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 46 - use custom XDG_CACHE_HOME if set and default sockets are not created
+
+expecting success of 0301.47 '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 47 - credential-cache --socket option overrides default location
+
+expecting success of 0301.48 '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 48 - use custom XDG_CACHE_HOME even if xdg socket exists
+
+expecting success of 0301.49 '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 49 - 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.50 '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 50 - use user socket if user directory is a symlink to a directory
+
+expecting success of 0301.51 '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 51 - helper (cache --timeout=1) times out
+
+# passed all 51 test(s)
+1..51
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0008-ignores.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0008-ignores/.git/
 expecting success of 0008.1 'setup': 
@@ -33886,389 +35554,702 @@
 1..397
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0600-reffiles-backend.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+*** t0613-reftable-write-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	)
 
-[main (root-commit) d31adcd] Initial
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
-[main e6940ad] Second
+ 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.47.2/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
-[main c2327cb] Third
+ 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 &&
+		for i in $(test_seq 200)
+		do
+			printf "update refs/heads/branch-%d HEAD\n" "$i" ||
+			return 1
+		done >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
+		EOF
+		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0613-reftable-write-options/repo/.git/
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
-ok 1 - setup
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 3 - many refs results in multiple blocks
 
-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
+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 2 - empty directory should not fool rev-parse
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 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 &&
 
-ok 3 - empty directory should not fool for-each-ref
+		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
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-ok 4 - empty directory should not fool create
+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 &&
+		perl -e "print \"a\" x 500" >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
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 5 - empty directory should not fool verify
+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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6 - empty directory should not fool 1-arg update
+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 &&
+		for i in $(test_seq 10)
+		do
+			printf "update refs/heads/branch-%d HEAD\n" "$i" ||
+			return 1
+		done >input &&
+		git update-ref --stdin <input &&
+		git -c reftable.restartInterval=1 pack-refs &&
 
-expecting success of 0600.7 'empty directory should not fool 2-arg update': 
-	prefix=refs/e-update-2 &&
-	git update-ref $prefix/foo $C &&
+		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.47.2/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.47.2/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 &&
+		for i in $(test_seq 5)
+		do
+			printf "update refs/heads/branch-%d HEAD\n" "$i" ||
+			return 1
+		done >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
+		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.47.2/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 &&
+		for i in $(test_seq 5)
+		do
+			printf "update refs/heads/branch-%d HEAD\n" "$i" ||
+			return 1
+		done >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
+		EOF
+		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0601-reffiles-pack-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	printf "update %s $D $C\n" $prefix/foo |
-	git update-ref --stdin
+	rm -f .git/refs/heads/b &&
+	echo "$SHA1 refs/heads/b" >expect &&
+	git show-ref b >result &&
+	test_cmp expect result
 
-ok 7 - empty directory should not fool 2-arg update
+ok 5 - see if a branch still exists when packed
 
-expecting success of 0600.8 'empty directory should not fool 0-arg delete': 
-	prefix=refs/e-delete-0 &&
-	git update-ref $prefix/foo $C &&
+expecting success of 0601.6 'git branch c/d should barf if branch c exists': 
+	git branch c &&
 	git pack-refs --all &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	printf "delete %s\n" $prefix/foo |
-	git update-ref --stdin
+	rm -f .git/refs/heads/c &&
+	test_must_fail git branch c/d
 
-ok 8 - empty directory should not fool 0-arg delete
+fatal: cannot lock ref 'refs/heads/c/d': 'refs/heads/c' exists; cannot create 'refs/heads/c/d'
+ok 6 - git branch c/d should barf if branch c exists
 
-expecting success of 0600.9 'empty directory should not fool 1-arg delete': 
-	prefix=refs/e-delete-1 &&
-	git update-ref $prefix/foo $C &&
+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 &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	printf "delete %s $C\n" $prefix/foo |
-	git update-ref --stdin
+	git branch -d g
 
-ok 9 - empty directory should not fool 1-arg delete
+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 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
+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
 
-ok 10 - non-empty directory blocks create
+fatal: cannot lock ref 'refs/heads/i/j/k': 'refs/heads/i' exists; cannot create 'refs/heads/i/j/k'
+ok 11 - git branch i/j/k should barf if branch i exists
 
-expecting success of 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
+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
 
-ok 11 - broken reference blocks create
+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 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
+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
 
-ok 12 - non-empty directory blocks indirect create
+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 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 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
 
-ok 13 - broken reference blocks indirect create
+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 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
+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
 
-ok 14 - no bogus intermediate values during delete
+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 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 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
 
-error: Unable to create '/build/reproducible-path/git-2.47.2/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 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 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 &&
+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 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
+	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
 
-error: unable to create file /build/reproducible-path/git-2.47.2/t/trash directory.t0600-reffiles-backend/.git/packed-refs.new: File exists
-ok 16 - delete fails cleanly if packed-refs.new write fails
+[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 0600.17 'setup worktree': 
-	test_commit first &&
-	git worktree add -b wt-main wt &&
-	(
-		cd wt &&
-		test_commit second
-	)
+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
 
-[main 89a3a1d] first
+Switched to a new branch 'lamb'
+[lamb ce057e0] future garbage
  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
+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>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 17 - setup worktree
+HEAD is now at 2daebe9 Initial commit.
+Deleted branch lamb (was 2daebe9).
+ok 23 - delete ref while another dangling packed ref
 
-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 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
 
-	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 &&
+2daebe96d7fd03d28875d852f87c06a18f4a6639 refs/top
+ok 24 - pack ref directly below refs/
 
-	$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 &&
+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
 
-	$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 25 - do not pack ref in refs/bisect
 
-ok 18 - for_each_reflog()
+expecting success of 0601.26 'disable reflogs': 
+	git config core.logallrefupdates false &&
+	rm -rf .git/logs
 
-checking prerequisite: SHA1
+ok 26 - disable reflogs
 
-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 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
 
-)
-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
+ok 27 - create packed foo/bar/baz branch
 
-Switched to a new branch 'reflogskip'
-ok 19 - parsing reverse reflogs at BUFSIZ boundaries
+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
 
-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
+fatal: cannot lock ref 'refs/heads/foo': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
+fatal: cannot lock ref 'refs/heads/foo/bar': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar'
+ok 28 - notice d/f conflict with existing directory
 
-ok 20 - reflog expire operates on symref not referrent
+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
 
-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
+fatal: cannot lock ref 'refs/heads/foo': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
+ok 29 - existing directory reports concrete ref
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+expecting success of 0601.30 'notice d/f conflict with existing ref': 
+	test_must_fail git branch foo/bar/baz/extra &&
+	test_must_fail git branch foo/bar/baz/lots/of/extra/components
+
+fatal: cannot lock ref 'refs/heads/foo/bar/baz/extra': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar/baz/extra'
+fatal: cannot lock ref 'refs/heads/foo/bar/baz/lots/of/extra/components': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar/baz/lots/of/extra/components'
+ok 30 - notice d/f conflict with existing ref
+
+expecting success of 0601.31 'reject packed-refs with unterminated line': 
+	cp .git/packed-refs .git/packed-refs.bak &&
+	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+	printf "%s" "$HEAD refs/zzzzz" >>.git/packed-refs &&
+	echo "fatal: unterminated line in .git/packed-refs: $HEAD refs/zzzzz" >expected_err &&
+	test_must_fail git for-each-ref >out 2>err &&
+	test_cmp expected_err err
+
+ok 31 - reject packed-refs with unterminated line
+
+expecting success of 0601.32 'reject packed-refs containing junk': 
+	cp .git/packed-refs .git/packed-refs.bak &&
+	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+	printf "%s\n" "bogus content" >>.git/packed-refs &&
+	echo "fatal: unexpected line in .git/packed-refs: bogus content" >expected_err &&
+	test_must_fail git for-each-ref >out 2>err &&
+	test_cmp expected_err err
+
+ok 32 - reject packed-refs containing junk
+
+expecting success of 0601.33 'reject packed-refs with a short SHA-1': 
+	cp .git/packed-refs .git/packed-refs.bak &&
+	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+	printf "%.7s %s\n" $HEAD refs/zzzzz >>.git/packed-refs &&
+	printf "fatal: unexpected line in .git/packed-refs: %.7s %s\n" $HEAD refs/zzzzz >expected_err &&
+	test_must_fail git for-each-ref >out 2>err &&
+	test_cmp expected_err err
+
+ok 33 - reject packed-refs with a short SHA-1
+
+expecting success of 0601.34 'timeout if packed-refs.lock exists': 
+	LOCK=.git/packed-refs.lock &&
+	>"$LOCK" &&
+	test_when_finished "rm -f $LOCK" &&
+	test_must_fail git pack-refs --all --prune
+
+fatal: Unable to create '/build/reproducible-path/git-2.47.2/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
 
@@ -34280,219 +36261,343 @@
 
 )
 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
+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"
 
-fatal: Needed a single revision
-ok 22 - ref resolution not confused by broken symlinks
+ok 36 - pack symlinked packed-refs
 
-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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0600-reffiles-backend/empty/.git/
-fatal: your current branch appears to be broken
-ok 23 - log diagnoses bogus HEAD hash
+[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'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.47.2/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
+If you want to 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 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
+  git switch -c <new-branch-name>
 
-Deleted branch d1/d2/r1 (was 89a3a1d).
-ok 25 - empty directory removal
+Or undo this operation with:
 
-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
+  git switch -
 
-Switched to branch 'e1/e2/r1'
-Switched to branch 'main'
-ok 26 - symref empty directory removal
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 68c0c7f initial
+ok 37 - refs/worktree must not be packed
 
-ok 27 - directory not created deleting packed ref
+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
 
-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
+[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
 
-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 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
 
-expecting success of 0600.29 'git branch -m with symlinked .git/refs': 
-	test_when_finished "rm -rf subdir" &&
-	git init --bare subdir &&
+ok 39 - pack-refs does not silently delete broken packed ref
 
-	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 &&
+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
 
-	git -C subdir rev-parse --absolute-git-dir >subdir.dir &&
-	git rev-parse --absolute-git-dir >our.dir &&
-	! test_cmp subdir.dir our.dir &&
+ok 40 - pack-refs does not drop broken refs during deletion
 
-	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
+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" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0600-reffiles-backend/subdir/
---- subdir.dir	2026-03-04 07:55:22.311352315 +0000
-+++ our.dir	2026-03-04 07:55:22.323352315 +0000
-@@ -1 +1 @@
--/build/reproducible-path/git-2.47.2/t/trash directory.t0600-reffiles-backend/subdir
-+/build/reproducible-path/git-2.47.2/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
+			# 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 &&
 
-    first
+			# 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.47.2/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
 
-commit c2327cb6b086a944f739ef59ddcffd3d45998884
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+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" &&
 
-    Third
+			git pack-refs --all &&
+			test_line_count = 2 .git/packed-refs &&
 
-commit e6940ad615916edba236dd73cb432b3598c8537f
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+			# 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 &&
 
-    Second
+			# 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.47.2/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
 
-commit d31adcd248e1f85d12741183d231fa5260dcfd5e
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+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" &&
 
-    Initial
-Deleted branch rename-dest (was 89a3a1d).
-ok 29 - git branch -m with symlinked .git/refs
+			# 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 &&
 
-checking prerequisite: SYMLINKS_WINDOWS
+			# 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 &&
 
-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
+			# 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.47.2/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
 
-)
-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 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" &&
 
-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
+			# 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 31 - git reflog expire honors core.sharedRepository
+			# 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.47.2/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 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
+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" &&
 
-start: ok
-prepare: ok
-commit: ok
-ok 32 - symref transaction supports symlinks
+			git pack-refs --all &&
+			test_line_count = 2 .git/packed-refs &&
 
-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
+			# 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 &&
 
-start: ok
-prepare: ok
-commit: ok
-ok 33 - symref transaction supports false symlink config
+			# 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.47.2/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
 
-# passed all 33 test(s)
-1..33
+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.47.2/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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0301-credential-cache.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0301-credential-cache/.git/
-expecting success of 0301.1 'helper (cache) has no existing data': 
+*** t1003-read-tree-prefix.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1003-read-tree-prefix/.git/
+expecting success of 1003.1 'setup': 
+	echo hello >one &&
+	git update-index --add one &&
+	tree=$(git write-tree) &&
+	echo tree is $tree
+
+tree is 700196ec4e5b1c75e9f5481e5b545d78533ff917
+ok 1 - setup
+
+expecting success of 1003.2 'read-tree --prefix': 
+	git read-tree --prefix=two/ $tree &&
+	git ls-files >actual &&
+	cmp expect actual
+
+ok 2 - read-tree --prefix
+
+expecting success of 1003.3 'read-tree --prefix with leading slash exits with error': 
+	git rm -rf . &&
+	test_must_fail git read-tree --prefix=/two/ $tree &&
+	git read-tree --prefix=two/ $tree &&
+
+	git rm -rf . &&
+	test_must_fail git read-tree --prefix=/ $tree &&
+	git read-tree --prefix= $tree
+
+rm 'one'
+rm 'two/one'
+fatal: Invalid prefix, prefix cannot start with '/'
+rm 'two/one'
+fatal: Invalid prefix, prefix cannot start with '/'
+ok 3 - read-tree --prefix with leading slash exits with error
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0302-credential-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0302-credential-store/.git/
+expecting success of 0302.1 'helper (store) has no existing data': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34506,9 +36611,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 1 - helper (cache) has no existing data
+ok 1 - helper (store) has no existing data
 
-expecting success of 0301.2 'helper (cache) stores password': 
+expecting success of 0302.2 'helper (store) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34516,9 +36621,9 @@
 		password=store-pass
 		EOF
 	
-ok 2 - helper (cache) stores password
+ok 2 - helper (store) stores password
 
-expecting success of 0301.3 'helper (cache) can retrieve password': 
+expecting success of 0302.3 'helper (store) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34530,9 +36635,9 @@
 		--
 		EOF
 	
-ok 3 - helper (cache) can retrieve password
+ok 3 - helper (store) can retrieve password
 
-expecting success of 0301.4 'helper (cache) requires matching protocol': 
+expecting success of 0302.4 'helper (store) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -34546,9 +36651,9 @@
 		askpass: Password for 'http://askpass-username@example.com':
 		EOF
 	
-ok 4 - helper (cache) requires matching protocol
+ok 4 - helper (store) requires matching protocol
 
-expecting success of 0301.5 'helper (cache) requires matching host': 
+expecting success of 0302.5 'helper (store) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -34562,9 +36667,9 @@
 		askpass: Password for 'https://askpass-username@other.tld':
 		EOF
 	
-ok 5 - helper (cache) requires matching host
+ok 5 - helper (store) requires matching host
 
-expecting success of 0301.6 'helper (cache) requires matching username': 
+expecting success of 0302.6 'helper (store) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34578,9 +36683,9 @@
 		askpass: Password for 'https://other@example.com':
 		EOF
 	
-ok 6 - helper (cache) requires matching username
+ok 6 - helper (store) requires matching username
 
-expecting success of 0301.7 'helper (cache) requires matching path': 
+expecting success of 0302.7 'helper (store) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -34604,9 +36709,9 @@
 		askpass: Password for 'http://askpass-username@path.tld/bar.git':
 		EOF
 	
-ok 7 - helper (cache) requires matching path
+ok 7 - helper (store) requires matching path
 
-expecting success of 0301.8 'helper (cache) overwrites on store': 
+expecting success of 0302.8 'helper (store) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34648,9 +36753,9 @@
 		askpass: Password for 'https://user-overwrite@example.com':
 		EOF
 	
-ok 8 - helper (cache) overwrites on store
+ok 8 - helper (store) overwrites on store
 
-expecting success of 0301.9 'helper (cache) can forget host': 
+expecting success of 0302.9 'helper (store) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34668,9 +36773,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 9 - helper (cache) can forget host
+ok 9 - helper (store) can forget host
 
-expecting success of 0301.10 'helper (cache) can store multiple users': 
+expecting success of 0302.10 'helper (store) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34704,9 +36809,9 @@
 		password=pass2
 		EOF
 	
-ok 10 - helper (cache) can store multiple users
+ok 10 - helper (store) can store multiple users
 
-expecting success of 0301.11 'helper (cache) does not erase a password distinct from input': 
+expecting success of 0302.11 'helper (store) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34730,9 +36835,9 @@
 		password=pass1
 		EOF
 	
-ok 11 - helper (cache) does not erase a password distinct from input
+ok 11 - helper (store) does not erase a password distinct from input
 
-expecting success of 0301.12 'helper (cache) can forget user': 
+expecting success of 0302.12 'helper (store) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34751,9 +36856,9 @@
 		askpass: Password for 'https://user1@example.com':
 		EOF
 	
-ok 12 - helper (cache) can forget user
+ok 12 - helper (store) can forget user
 
-expecting success of 0301.13 'helper (cache) remembers other user': 
+expecting success of 0302.13 'helper (store) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34765,9 +36870,9 @@
 		password=pass2
 		EOF
 	
-ok 13 - helper (cache) remembers other user
+ok 13 - helper (store) remembers other user
 
-expecting success of 0301.14 'helper (cache) can store empty username': 
+expecting success of 0302.14 'helper (store) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -34784,9 +36889,9 @@
 		password=
 		EOF
 	
-ok 14 - helper (cache) can store empty username
+ok 14 - helper (store) can store empty username
 
-expecting success of 0301.15 'helper (cache) erases all matching credentials': 
+expecting success of 0302.15 'helper (store) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34816,9 +36921,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 15 - helper (cache) erases all matching credentials
+ok 15 - helper (store) erases all matching credentials
 
-expecting success of 0301.16 'helper (cache) not confused by long header': 
+expecting success of 0302.16 'helper (store) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -34841,2199 +36946,98 @@
 		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': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-expiry
-		password=pass
-		password_expiry_utc=9999999999
-		EOF
-	
-ok 17 - helper (cache) stores password_expiry_utc
+expecting success of 0302.17 'when xdg file does not exist, xdg file not created': 
+	test_path_is_missing "$HOME/.config/git/credentials" &&
+	test -s "$HOME/.git-credentials"
 
-expecting success of 0301.18 'helper (cache) gets password_expiry_utc': 
+ok 17 - when xdg file does not exist, xdg file not created
+
+expecting success of 0302.18 'setup xdg file': 
+	rm -f "$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	>"$HOME/.config/git/credentials"
+
+ok 18 - setup xdg file
+
+expecting success of 0302.19 'helper (store) has no existing data': 
 		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
+		username=askpass-username
+		password=askpass-password
 		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 18 - helper (cache) gets password_expiry_utc
+ok 19 - helper (store) has no existing data
 
-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 &&
+expecting success of 0302.20 'helper (store) stores password': 
+		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
-		username=user-expiry-overwrite
-		password=pass2
-		password_expiry_utc=9999999999
+		username=store-user
+		password=store-pass
 		EOF
-		check fill $HELPER <<-\EOF &&
+	
+ok 20 - helper (store) stores password
+
+expecting success of 0302.21 'helper (store) can retrieve password': 
+		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
+		username=store-user
+		password=store-pass
+		--
 		EOF
+	
+ok 21 - helper (store) can retrieve password
+
+expecting success of 0302.22 'helper (store) requires matching protocol': 
 		check fill $HELPER <<-\EOF
-		protocol=https
+		protocol=http
 		host=example.com
-		username=user-expiry-overwrite
 		--
-		protocol=https
+		protocol=http
 		host=example.com
-		username=user-expiry-overwrite
+		username=askpass-username
 		password=askpass-password
 		--
-		askpass: Password for 'https://user-expiry-overwrite@example.com':
+		askpass: Username for 'http://example.com':
+		askpass: Password for 'http://askpass-username@example.com':
 		EOF
 	
-ok 19 - helper (cache) overwrites when password_expiry_utc changes
+ok 22 - helper (store) requires matching protocol
 
-expecting success of 0301.20 'helper (cache) stores oauth_refresh_token': 
-		check approve $HELPER <<-\EOF
+expecting success of 0302.23 'helper (store) requires matching host': 
+		check fill $HELPER <<-\EOF
 		protocol=https
-		host=example.com
-		username=user4
-		password=pass
-		oauth_refresh_token=xyzzy
+		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 20 - helper (cache) stores oauth_refresh_token
+ok 23 - helper (store) requires matching host
 
-expecting success of 0301.21 'helper (cache) gets oauth_refresh_token': 
+expecting success of 0302.24 'helper (store) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
-		username=user4
-		--
-		protocol=https
-		host=example.com
-		username=user4
-		password=pass
-		oauth_refresh_token=xyzzy
-		--
-		EOF
-	
-ok 21 - helper (cache) gets oauth_refresh_token
-
-expecting success of 0301.22 'helper (cache) stores authtype and credential': 
-		check approve $HELPER <<-\EOF
-		capability[]=authtype
-		authtype=Bearer
-		credential=random-token
-		protocol=https
-		host=git.example.com
-		EOF
-	
-ok 22 - helper (cache) stores authtype and credential
-
-expecting success of 0301.23 'helper (cache) gets authtype and credential': 
-		check fill $HELPER <<-\EOF
-		capability[]=authtype
-		protocol=https
-		host=git.example.com
-		--
-		capability[]=authtype
-		authtype=Bearer
-		credential=random-token
-		protocol=https
-		host=git.example.com
-		--
-		EOF
-	
-ok 23 - helper (cache) gets authtype and credential
-
-expecting success of 0301.24 'helper (cache) 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 24 - helper (cache) stores authtype and credential with username
-
-expecting success of 0301.25 '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 25 - helper (cache) gets authtype and credential with username
-
-expecting success of 0301.26 '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 26 - helper (cache) does not get authtype and credential with different username
-
-expecting success of 0301.27 'helper (cache) does not store ephemeral authtype and credential': 
-		check approve $HELPER <<-\EOF &&
-		capability[]=authtype
-		authtype=Bearer
-		credential=git2-token
-		protocol=https
-		host=git2.example.com
-		ephemeral=1
-		EOF
-
-		check fill $HELPER <<-\EOF
-		capability[]=authtype
-		protocol=https
-		host=git2.example.com
-		--
-		protocol=https
-		host=git2.example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://git2.example.com':
-		askpass: Password for 'https://askpass-username@git2.example.com':
-		EOF
-	
-ok 27 - helper (cache) does not store ephemeral authtype and credential
-
-expecting success of 0301.28 'helper (cache) does not store ephemeral username and password': 
-		check approve $HELPER <<-\EOF &&
-		capability[]=authtype
-		protocol=https
-		host=git2.example.com
-		user=barbaz
-		password=secret
-		ephemeral=1
-		EOF
-
-		check fill $HELPER <<-\EOF
-		capability[]=authtype
-		protocol=https
-		host=git2.example.com
-		--
-		protocol=https
-		host=git2.example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://git2.example.com':
-		askpass: Password for 'https://askpass-username@git2.example.com':
-		EOF
-	
-ok 28 - helper (cache) does not store ephemeral username and password
-
-expecting success of 0301.29 'socket defaults to ~/.cache/git/credential/socket': 
-	test_when_finished "
-		git credential-cache exit &&
-		rmdir -p .cache/git/credential/
-	" &&
-	test_path_is_missing "$HOME/.git-credential-cache" &&
-	test_path_is_socket "$HOME/.cache/git/credential/socket"
-
-ok 29 - socket defaults to ~/.cache/git/credential/socket
-
-expecting success of 0301.30 '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 30 - helper (cache) has no existing data
-
-expecting success of 0301.31 'helper (cache) stores password': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=store-user
-		password=store-pass
-		EOF
-	
-ok 31 - helper (cache) stores password
-
-expecting success of 0301.32 '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 32 - helper (cache) can retrieve password
-
-expecting success of 0301.33 '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 33 - helper (cache) requires matching protocol
-
-expecting success of 0301.34 '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 34 - helper (cache) requires matching host
-
-expecting success of 0301.35 '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 35 - helper (cache) requires matching username
-
-expecting success of 0301.36 '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 36 - helper (cache) requires matching path
-
-expecting success of 0301.37 '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 37 - helper (cache) overwrites on store
-
-expecting success of 0301.38 '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 38 - helper (cache) can forget host
-
-expecting success of 0301.39 '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 39 - helper (cache) can store multiple users
-
-expecting success of 0301.40 '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 40 - helper (cache) does not erase a password distinct from input
-
-expecting success of 0301.41 '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 41 - helper (cache) can forget user
-
-expecting success of 0301.42 '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 42 - helper (cache) remembers other user
-
-expecting success of 0301.43 '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 43 - helper (cache) can store empty username
-
-expecting success of 0301.44 '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 44 - helper (cache) erases all matching credentials
-
-expecting success of 0301.45 '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 45 - helper (cache) not confused by long header
-
-expecting success of 0301.46 '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 46 - use custom XDG_CACHE_HOME if set and default sockets are not created
-
-expecting success of 0301.47 '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 47 - credential-cache --socket option overrides default location
-
-expecting success of 0301.48 '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 48 - use custom XDG_CACHE_HOME even if xdg socket exists
-
-expecting success of 0301.49 '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 49 - 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.50 '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 50 - use user socket if user directory is a symlink to a directory
-
-expecting success of 0301.51 '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 51 - helper (cache --timeout=1) times out
-
-# passed all 51 test(s)
-1..51
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0613-reftable-write-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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 &&
-		for i in $(test_seq 200)
-		do
-			printf "update refs/heads/branch-%d HEAD\n" "$i" ||
-			return 1
-		done >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
-		EOF
-		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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 &&
-		perl -e "print \"a\" x 500" >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.47.2/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.47.2/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 &&
-		for i in $(test_seq 10)
-		do
-			printf "update refs/heads/branch-%d HEAD\n" "$i" ||
-			return 1
-		done >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.47.2/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.47.2/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 &&
-		for i in $(test_seq 5)
-		do
-			printf "update refs/heads/branch-%d HEAD\n" "$i" ||
-			return 1
-		done >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
-		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.47.2/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 &&
-		for i in $(test_seq 5)
-		do
-			printf "update refs/heads/branch-%d HEAD\n" "$i" ||
-			return 1
-		done >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
-		EOF
-		test-tool dump-reftable -b .git/reftable/*.ref >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1003-read-tree-prefix.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1003-read-tree-prefix/.git/
-expecting success of 1003.1 'setup': 
-	echo hello >one &&
-	git update-index --add one &&
-	tree=$(git write-tree) &&
-	echo tree is $tree
-
-tree is 700196ec4e5b1c75e9f5481e5b545d78533ff917
-ok 1 - setup
-
-expecting success of 1003.2 'read-tree --prefix': 
-	git read-tree --prefix=two/ $tree &&
-	git ls-files >actual &&
-	cmp expect actual
-
-ok 2 - read-tree --prefix
-
-expecting success of 1003.3 'read-tree --prefix with leading slash exits with error': 
-	git rm -rf . &&
-	test_must_fail git read-tree --prefix=/two/ $tree &&
-	git read-tree --prefix=two/ $tree &&
-
-	git rm -rf . &&
-	test_must_fail git read-tree --prefix=/ $tree &&
-	git read-tree --prefix= $tree
-
-rm 'one'
-rm 'two/one'
-fatal: Invalid prefix, prefix cannot start with '/'
-rm 'two/one'
-fatal: Invalid prefix, prefix cannot start with '/'
-ok 3 - read-tree --prefix with leading slash exits with error
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0601-reffiles-pack-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0601-reffiles-pack-refs/.git/
-expecting success of 0601.1 'enable reflogs': 
-	git config core.logallrefupdates true
-
-ok 1 - enable reflogs
-
-expecting success of 0601.2 'prepare a trivial repository': 
-	echo Hello > A &&
-	git update-index --add A &&
-	git commit -m "Initial commit." &&
-	HEAD=$(git rev-parse --verify HEAD)
-
-[main (root-commit) 2daebe9] Initial commit.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-ok 2 - prepare a trivial repository
-
-expecting success of 0601.3 'pack-refs --prune --all': 
-	test_path_is_missing .git/packed-refs &&
-	git pack-refs --no-prune --all &&
-	test_path_is_file .git/packed-refs &&
-	N=$(find .git/refs -type f | wc -l) &&
-	test "$N" != 0 &&
-
-	git pack-refs --prune --all &&
-	test_path_is_file .git/packed-refs &&
-	N=$(find .git/refs -type f) &&
-	test -z "$N"
-
-ok 3 - pack-refs --prune --all
-
-expecting success of 0601.4 'see if git show-ref works as expected': 
-	git branch a &&
-	SHA1=$(cat .git/refs/heads/a) &&
-	echo "$SHA1 refs/heads/a" >expect &&
-	git show-ref a >result &&
-	test_cmp expect result
-
-ok 4 - see if git show-ref works as expected
-
-expecting success of 0601.5 'see if a branch still exists when packed': 
-	git branch b &&
-	git pack-refs --all &&
-	rm -f .git/refs/heads/b &&
-	echo "$SHA1 refs/heads/b" >expect &&
-	git show-ref b >result &&
-	test_cmp expect result
-
-ok 5 - see if a branch still exists when packed
-
-expecting success of 0601.6 'git branch c/d should barf if branch c exists': 
-	git branch c &&
-	git pack-refs --all &&
-	rm -f .git/refs/heads/c &&
-	test_must_fail git branch c/d
-
-fatal: cannot lock ref 'refs/heads/c/d': 'refs/heads/c' exists; cannot create 'refs/heads/c/d'
-ok 6 - git branch c/d should barf if branch c exists
-
-expecting success of 0601.7 'see if a branch still exists after git pack-refs --prune': 
-	git branch e &&
-	git pack-refs --all --prune &&
-	echo "$SHA1 refs/heads/e" >expect &&
-	git show-ref e >result &&
-	test_cmp expect result
-
-ok 7 - see if a branch still exists after git pack-refs --prune
-
-expecting success of 0601.8 'see if git pack-refs --prune remove ref files': 
-	git branch f &&
-	git pack-refs --all --prune &&
-	! test -f .git/refs/heads/f
-
-ok 8 - see if git pack-refs --prune remove ref files
-
-expecting success of 0601.9 'see if git pack-refs --prune removes empty dirs': 
-	git branch r/s/t &&
-	git pack-refs --all --prune &&
-	! test -e .git/refs/heads/r
-
-ok 9 - see if git pack-refs --prune removes empty dirs
-
-expecting success of 0601.10 'git branch g should work when git branch g/h has been deleted': 
-	git branch g/h &&
-	git pack-refs --all --prune &&
-	git branch -d g/h &&
-	git branch g &&
-	git pack-refs --all &&
-	git branch -d g
-
-Deleted branch g/h (was 2daebe9).
-Deleted branch g (was 2daebe9).
-ok 10 - git branch g should work when git branch g/h has been deleted
-
-expecting success of 0601.11 'git branch i/j/k should barf if branch i exists': 
-	git branch i &&
-	git pack-refs --all --prune &&
-	test_must_fail git branch i/j/k
-
-fatal: cannot lock ref 'refs/heads/i/j/k': 'refs/heads/i' exists; cannot create 'refs/heads/i/j/k'
-ok 11 - git branch i/j/k should barf if branch i exists
-
-expecting success of 0601.12 'test git branch k after branch k/l/m and k/lm have been deleted': 
-	git branch k/l &&
-	git branch k/lm &&
-	git branch -d k/l &&
-	git branch k/l/m &&
-	git branch -d k/l/m &&
-	git branch -d k/lm &&
-	git branch k
-
-Deleted branch k/l (was 2daebe9).
-Deleted branch k/l/m (was 2daebe9).
-Deleted branch k/lm (was 2daebe9).
-ok 12 - test git branch k after branch k/l/m and k/lm have been deleted
-
-expecting success of 0601.13 'test git branch n after some branch deletion and pruning': 
-	git branch n/o &&
-	git branch n/op &&
-	git branch -d n/o &&
-	git branch n/o/p &&
-	git branch -d n/op &&
-	git pack-refs --all --prune &&
-	git branch -d n/o/p &&
-	git branch n
-
-Deleted branch n/o (was 2daebe9).
-Deleted branch n/op (was 2daebe9).
-Deleted branch n/o/p (was 2daebe9).
-ok 13 - test git branch n after some branch deletion and pruning
-
-expecting success of 0601.14 'test excluded refs are not packed': 
-	git branch dont_pack1 &&
-	git branch dont_pack2 &&
-	git branch pack_this &&
-	git pack-refs --all --exclude "refs/heads/dont_pack*" &&
-	test -f .git/refs/heads/dont_pack1 &&
-	test -f .git/refs/heads/dont_pack2 &&
-	! test -f .git/refs/heads/pack_this
-ok 14 - test excluded refs are not packed
-
-expecting success of 0601.15 'test --no-exclude refs clears excluded refs': 
-	git branch dont_pack3 &&
-	git branch dont_pack4 &&
-	git pack-refs --all --exclude "refs/heads/dont_pack*" --no-exclude &&
-	! test -f .git/refs/heads/dont_pack3 &&
-	! test -f .git/refs/heads/dont_pack4
-ok 15 - test --no-exclude refs clears excluded refs
-
-expecting success of 0601.16 'test only included refs are packed': 
-	git branch pack_this1 &&
-	git branch pack_this2 &&
-	git tag dont_pack5 &&
-	git pack-refs --include "refs/heads/pack_this*" &&
-	test -f .git/refs/tags/dont_pack5 &&
-	! test -f .git/refs/heads/pack_this1 &&
-	! test -f .git/refs/heads/pack_this2
-ok 16 - test only included refs are packed
-
-expecting success of 0601.17 'test --no-include refs clears included refs': 
-	git branch pack1 &&
-	git branch pack2 &&
-	git pack-refs --include "refs/heads/pack*" --no-include &&
-	test -f .git/refs/heads/pack1 &&
-	test -f .git/refs/heads/pack2
-ok 17 - test --no-include refs clears included refs
-
-expecting success of 0601.18 'test --exclude takes precedence over --include': 
-	git branch dont_pack5 &&
-	git pack-refs --include "refs/heads/pack*" --exclude "refs/heads/pack*" &&
-	test -f .git/refs/heads/dont_pack5
-ok 18 - test --exclude takes precedence over --include
-
-expecting success of 0601.19 'see if up-to-date packed refs are preserved': 
-	git branch q &&
-	git pack-refs --all --prune &&
-	git update-ref refs/heads/q refs/heads/q &&
-	! test -f .git/refs/heads/q
-
-ok 19 - see if up-to-date packed refs are preserved
-
-expecting success of 0601.20 'pack, prune and repack': 
-	git tag foo &&
-	git pack-refs --all --prune &&
-	git show-ref >all-of-them &&
-	git pack-refs &&
-	git show-ref >again &&
-	test_cmp all-of-them again
-
-ok 20 - pack, prune and repack
-
-expecting success of 0601.21 'explicit pack-refs with dangling packed reference': 
-	git commit --allow-empty -m "soon to be garbage-collected" &&
-	git pack-refs --all &&
-	git reset --hard HEAD^ &&
-	git reflog expire --expire=all --all &&
-	git prune --expire=all &&
-	git pack-refs --all 2>result &&
-	test_must_be_empty result
-
-[main 6d2fc87] soon to be garbage-collected
- Author: A U Thor <author@example.com>
-HEAD is now at 2daebe9 Initial commit.
-ok 21 - explicit pack-refs with dangling packed reference
-
-expecting success of 0601.22 'delete ref with dangling packed version': 
-	git checkout -b lamb &&
-	git commit --allow-empty -m "future garbage" &&
-	git pack-refs --all &&
-	git reset --hard HEAD^ &&
-	git checkout main &&
-	git reflog expire --expire=all --all &&
-	git prune --expire=all &&
-	git branch -d lamb 2>result &&
-	test_must_be_empty result
-
-Switched to a new branch 'lamb'
-[lamb ce057e0] future garbage
- Author: A U Thor <author@example.com>
-HEAD is now at 2daebe9 Initial commit.
-Switched to branch 'main'
-Deleted branch lamb (was 2daebe9).
-ok 22 - delete ref with dangling packed version
-
-expecting success of 0601.23 'delete ref while another dangling packed ref': 
-	git branch lamb &&
-	git commit --allow-empty -m "future garbage" &&
-	git pack-refs --all &&
-	git reset --hard HEAD^ &&
-	git reflog expire --expire=all --all &&
-	git prune --expire=all &&
-	git branch -d lamb 2>result &&
-	test_must_be_empty result
-
-[main ce057e0] future garbage
- Author: A U Thor <author@example.com>
-HEAD is now at 2daebe9 Initial commit.
-Deleted branch lamb (was 2daebe9).
-ok 23 - delete ref while another dangling packed ref
-
-expecting success of 0601.24 'pack ref directly below refs/': 
-	git update-ref refs/top HEAD &&
-	git pack-refs --all --prune &&
-	grep refs/top .git/packed-refs &&
-	test_path_is_missing .git/refs/top
-
-2daebe96d7fd03d28875d852f87c06a18f4a6639 refs/top
-ok 24 - pack ref directly below refs/
-
-expecting success of 0601.25 'do not pack ref in refs/bisect': 
-	git update-ref refs/bisect/local HEAD &&
-	git pack-refs --all --prune &&
-	! grep refs/bisect/local .git/packed-refs >/dev/null &&
-	test_path_is_file .git/refs/bisect/local
-
-ok 25 - do not pack ref in refs/bisect
-
-expecting success of 0601.26 'disable reflogs': 
-	git config core.logallrefupdates false &&
-	rm -rf .git/logs
-
-ok 26 - disable reflogs
-
-expecting success of 0601.27 'create packed foo/bar/baz branch': 
-	git branch foo/bar/baz &&
-	git pack-refs --all --prune &&
-	test_path_is_missing .git/refs/heads/foo/bar/baz &&
-	test_must_fail git reflog exists refs/heads/foo/bar/baz
-
-ok 27 - create packed foo/bar/baz branch
-
-expecting success of 0601.28 'notice d/f conflict with existing directory': 
-	test_must_fail git branch foo &&
-	test_must_fail git branch foo/bar
-
-fatal: cannot lock ref 'refs/heads/foo': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
-fatal: cannot lock ref 'refs/heads/foo/bar': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar'
-ok 28 - notice d/f conflict with existing directory
-
-expecting success of 0601.29 'existing directory reports concrete ref': 
-	test_must_fail git branch foo 2>stderr &&
-	test_grep refs/heads/foo/bar/baz stderr
-
-fatal: cannot lock ref 'refs/heads/foo': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
-ok 29 - existing directory reports concrete ref
-
-expecting success of 0601.30 'notice d/f conflict with existing ref': 
-	test_must_fail git branch foo/bar/baz/extra &&
-	test_must_fail git branch foo/bar/baz/lots/of/extra/components
-
-fatal: cannot lock ref 'refs/heads/foo/bar/baz/extra': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar/baz/extra'
-fatal: cannot lock ref 'refs/heads/foo/bar/baz/lots/of/extra/components': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar/baz/lots/of/extra/components'
-ok 30 - notice d/f conflict with existing ref
-
-expecting success of 0601.31 'reject packed-refs with unterminated line': 
-	cp .git/packed-refs .git/packed-refs.bak &&
-	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
-	printf "%s" "$HEAD refs/zzzzz" >>.git/packed-refs &&
-	echo "fatal: unterminated line in .git/packed-refs: $HEAD refs/zzzzz" >expected_err &&
-	test_must_fail git for-each-ref >out 2>err &&
-	test_cmp expected_err err
-
-ok 31 - reject packed-refs with unterminated line
-
-expecting success of 0601.32 'reject packed-refs containing junk': 
-	cp .git/packed-refs .git/packed-refs.bak &&
-	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
-	printf "%s\n" "bogus content" >>.git/packed-refs &&
-	echo "fatal: unexpected line in .git/packed-refs: bogus content" >expected_err &&
-	test_must_fail git for-each-ref >out 2>err &&
-	test_cmp expected_err err
-
-ok 32 - reject packed-refs containing junk
-
-expecting success of 0601.33 'reject packed-refs with a short SHA-1': 
-	cp .git/packed-refs .git/packed-refs.bak &&
-	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
-	printf "%.7s %s\n" $HEAD refs/zzzzz >>.git/packed-refs &&
-	printf "fatal: unexpected line in .git/packed-refs: %.7s %s\n" $HEAD refs/zzzzz >expected_err &&
-	test_must_fail git for-each-ref >out 2>err &&
-	test_cmp expected_err err
-
-ok 33 - reject packed-refs with a short SHA-1
-
-expecting success of 0601.34 'timeout if packed-refs.lock exists': 
-	LOCK=.git/packed-refs.lock &&
-	>"$LOCK" &&
-	test_when_finished "rm -f $LOCK" &&
-	test_must_fail git pack-refs --all --prune
-
-fatal: Unable to create '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0302-credential-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0302-credential-store/.git/
-expecting success of 0302.1 'helper (store) has no existing data': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.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 0302.17 'when xdg file does not exist, xdg file not created': 
-	test_path_is_missing "$HOME/.config/git/credentials" &&
-	test -s "$HOME/.git-credentials"
-
-ok 17 - when xdg file does not exist, xdg file not created
-
-expecting success of 0302.18 'setup xdg file': 
-	rm -f "$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	>"$HOME/.config/git/credentials"
-
-ok 18 - setup xdg file
-
-expecting success of 0302.19 'helper (store) has no existing data': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		EOF
-	
-ok 19 - helper (store) has no existing data
-
-expecting success of 0302.20 'helper (store) stores password': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=store-user
-		password=store-pass
-		EOF
-	
-ok 20 - helper (store) stores password
-
-expecting success of 0302.21 'helper (store) can retrieve password': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=store-user
-		password=store-pass
-		--
-		EOF
-	
-ok 21 - helper (store) can retrieve password
-
-expecting success of 0302.22 'helper (store) requires matching protocol': 
-		check fill $HELPER <<-\EOF
-		protocol=http
-		host=example.com
-		--
-		protocol=http
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'http://example.com':
-		askpass: Password for 'http://askpass-username@example.com':
-		EOF
-	
-ok 22 - helper (store) requires matching protocol
-
-expecting success of 0302.23 'helper (store) requires matching host': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=other.tld
-		--
-		protocol=https
-		host=other.tld
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://other.tld':
-		askpass: Password for 'https://askpass-username@other.tld':
-		EOF
-	
-ok 23 - helper (store) requires matching host
-
-expecting success of 0302.24 'helper (store) requires matching username': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=other
+		username=other
 		--
 		protocol=https
 		host=example.com
@@ -38062,479 +38066,385 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1001-read-tree-m-2way.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+*** t1007-hash-object.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	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
+	example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
+	EOF
 
-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
+expecting success of 1007.2 'multiple '--stdin's are rejected': 
+	echo example | test_must_fail git hash-object --stdin --stdin
 
-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
+error: Multiple --stdin arguments are not supported
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
 
-expecting success of 1001.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
+    -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
 
-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.
+ok 2 - multiple '--stdin's are rejected
 
-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
+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
 
-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.
+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]
 
-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
+    -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
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-frotz: clean
-ok 5 - 6 - local addition already has the same.
+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]
 
-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
+    -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
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-frotz: dirty
-ok 6 - 7 - local addition already has the same.
+ok 3 - Can't use --stdin and --stdin-paths together
 
-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
+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: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 7 - 8 - conflicting addition.
+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]
 
-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
+    -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: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 8 - 9 - conflicting addition.
+ok 4 - Can't pass filenames as arguments with --stdin-paths
 
-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
+expecting success of 1007.5 'Can't use --path with --stdin-paths': 
+	echo example | test_must_fail git hash-object --stdin-paths --path=foo
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-ok 9 - 10 - path removed.
+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]
 
-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
+    -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: Entry 'rezrov' not uptodate. Cannot merge.
-ok 10 - 11 - dirty path removed.
+ok 5 - Can't use --path with --stdin-paths
 
-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
+expecting success of 1007.6 'Can't use --path with --no-filters': 
+	test_must_fail git hash-object --no-filters --path=foo
 
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 11 - 12 - unmatching local changes being removed.
+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]
 
-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
+    -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: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 12 - 13 - unmatching local changes being removed.
+ok 6 - Can't use --path with --no-filters
 
-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.47.2/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.7 'hash a file': 
+	test "$(test_oid hello)" = $(git hash-object hello)
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
-nitfol: clean
-ok 13 - 14 - unchanged in two heads.
+ok 7 - hash a file
 
-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
+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
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
-nitfol: dirty
-ok 14 - 15 - unchanged in two heads.
+expecting success of 1007.9 'hash from stdin': 
+	test "$(test_oid example)" = $(git hash-object --stdin < example)
 
-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
+ok 9 - hash from stdin
 
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 15 - 16 - conflicting local change.
+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 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
+expecting success of 1007.11 'hash a file and write to database': 
+	test "$(test_oid hello)" = $(git hash-object -w hello)
 
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 16 - 17 - conflicting local change.
+ok 11 - hash a file and write to database
 
-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
+expecting success of 1007.12 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	
+Hello Worldok 12 - blob exists in database
 
-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 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"
 
-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
+ok 13 - git hash-object --stdin file1 <file0 first operates on file0, then file1
 
-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 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"
 
-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
+ok 14 - set up crlf tests
 
-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 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"
 
-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
+ok 15 - check that appropriate filter is invoke when --path is used
 
-error: Entry 'bozbar' not uptodate. Cannot merge.
-ok 20 - 21 - no local change, dirty cache.
+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"
+	)
 
-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
+ok 16 - gitattributes also work in a subdirectory
 
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 21 - 22 - local change cache updated.
+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"
+	)
 
-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 &&
+ok 17 - --path works in a subdirectory
 
-	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
+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"
 
-treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
-100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
-treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
-040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
-ok 22 - DF vs DF/DF case setup.
+ok 18 - check that --no-filters option works
 
-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 &&
-	:
+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"
 
-100644 b90ea14b2dd74b6f377c10870b3757344bbe077c 0	DF/DF
-DF/DF: dirty
-ok 23 - DF vs DF/DF case test.
+ok 19 - check that --no-filters option works with --stdin-paths
 
-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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.20 'hash from stdin and write to database (-w --stdin)': 
+		test "$(test_oid example)" = $(git hash-object $args < example)
+	
+ok 20 - hash from stdin and write to database (-w --stdin)
 
-	rm -f a &&
-	git update-index --remove a &&
-	mkdir a &&
-	: >a/b &&
-	treeH=$(git write-tree) &&
-	echo treeH $treeH &&
-	git ls-tree $treeH
+expecting success of 1007.21 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	
+This is an exampleok 21 - blob exists in database
 
-treeM 496d6428b9cf92981dc9495211e6e1120fb6f2ba
-100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a
-treeH 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 24 - a/b (untracked) vs a case setup.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.22 'hash from stdin and write to database (--stdin -w)': 
+		test "$(test_oid example)" = $(git hash-object $args < example)
+	
+ok 22 - hash from stdin and write to database (--stdin -w)
 
-expecting success of 1001.25 'a/b (untracked) vs a, plus c/d case test.': 
-	read_tree_u_must_fail -u -m "$treeH" "$treeM" &&
-	git ls-files --stage &&
-	test -f a/b
+expecting success of 1007.23 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	
+This is an exampleok 23 - blob exists in database
 
-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 1007.24 'hash two files with names on stdin': 
+	test "$oids" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
 
-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 24 - hash two files with names on stdin
 
-ok 26 - read-tree supports the super-prefix
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.25 'hash two files with names on stdin and write to database (-w --stdin-paths)': 
+		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
+	
+ok 25 - hash two files with names on stdin and write to database (-w --stdin-paths)
 
-expecting success of 1001.27 'a/b vs a, plus c/d case setup.': 
-	rm -f .git/index &&
-	rm -fr a &&
-	: >a &&
-	mkdir c &&
-	: >c/d &&
-	git update-index --add a c/d &&
-	treeM=$(git write-tree) &&
-	echo treeM $treeM &&
-	git ls-tree $treeM &&
-	git ls-files --stage >treeM.out &&
+expecting success of 1007.26 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	
+Hello Worldok 26 - blob exists in database
 
-	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
+expecting success of 1007.27 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	
+This is an exampleok 27 - blob exists in database
 
-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.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.28 'hash two files with names on stdin and write to database (--stdin-paths -w)': 
+		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
+	
+ok 28 - hash two files with names on stdin and write to database (--stdin-paths -w)
 
-expecting success of 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
+expecting success of 1007.29 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	
+Hello Worldok 29 - blob exists in database
 
-ok 28 - a/b vs a, plus c/d case test.
+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 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 &&
+expecting success of 1007.31 'too-short tree': 
+	echo abc >malformed-tree &&
+	test_must_fail git hash-object -t tree malformed-tree 2>err &&
+	grep "too-short tree object" err
+
+error: too-short tree object
+ok 31 - too-short tree
+
+expecting success of 1007.32 'malformed mode in tree': 
+	hex_oid=$(echo foo | git hash-object --stdin -w) &&
+	bin_oid=$(echo $hex_oid | hex2oct) &&
+	printf "9100644 \0$bin_oid" >tree-with-malformed-mode &&
+	test_must_fail git hash-object -t tree tree-with-malformed-mode 2>err &&
+	grep "malformed mode in tree entry" err
+
+error: malformed mode in tree entry
+ok 32 - malformed mode in tree
+
+expecting success of 1007.33 'empty filename in tree': 
+	hex_oid=$(echo foo | git hash-object --stdin -w) &&
+	bin_oid=$(echo $hex_oid | hex2oct) &&
+	printf "100644 \0$bin_oid" >tree-with-empty-filename &&
+	test_must_fail git hash-object -t tree tree-with-empty-filename 2>err &&
+	grep "empty filename in tree entry" err
+
+error: empty filename in tree entry
+ok 33 - empty filename in tree
+
+expecting success of 1007.34 'duplicate filename in tree': 
+	hex_oid=$(echo foo | git hash-object --stdin -w) &&
+	bin_oid=$(echo $hex_oid | hex2oct) &&
+	{
+		printf "100644 file\0$bin_oid" &&
+		printf "100644 file\0$bin_oid"
+	} >tree-with-duplicate-filename &&
+	test_must_fail git hash-object -t tree tree-with-duplicate-filename 2>err &&
+	grep "duplicateEntries" err
+
+error: object fails fsck: duplicateEntries: contains duplicate file entries
+ok 34 - duplicate filename in tree
+
+expecting success of 1007.35 'corrupt commit': 
+	test_must_fail git hash-object -t commit --stdin </dev/null
+
+error: object fails fsck: unterminatedHeader: unterminated header
+fatal: refusing to create malformed object
+ok 35 - corrupt commit
+
+expecting success of 1007.36 'corrupt tag': 
+	test_must_fail git hash-object -t tag --stdin </dev/null
+
+error: object fails fsck: unterminatedHeader: unterminated header
+fatal: refusing to create malformed object
+ok 36 - corrupt tag
+
+expecting success of 1007.37 'hash-object complains about bogus type name': 
+	test_must_fail git hash-object -t bogus --stdin </dev/null
+
+fatal: invalid object type "bogus"
+ok 37 - hash-object complains about bogus type name
+
+expecting success of 1007.38 'hash-object complains about truncated type name': 
+	test_must_fail git hash-object -t bl --stdin </dev/null
+
+fatal: invalid object type "bl"
+ok 38 - hash-object complains about truncated type name
+
+expecting success of 1007.39 '--literally': 
+	t=1234567890 &&
+	echo example | git hash-object -t $t --literally --stdin
+
+f78b23c3f872d473c764d5fcf4fb39af8bbf2123
+ok 39 - --literally
+
+expecting success of 1007.40 '--literally with extra-long type': 
+	t=12345678901234567890123456789012345678901234567890 &&
+	t="$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t" &&
+	echo example | git hash-object -t $t --literally --stdin
+
+2a881776ee43e849175ee7158075560ca0ae7692
+ok 40 - --literally with extra-long type
+
+expecting success of 1007.41 '--stdin outside of repository (uses SHA-1)': 
+	nongit git hash-object --stdin <hello >actual &&
+	echo "$(test_oid --hash=sha1 hello)" >expect &&
 	test_cmp expect actual
 
-[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
+ok 41 - --stdin outside of repository (uses SHA-1)
 
-# passed all 29 test(s)
-1..29
+# passed all 41 test(s)
+1..41
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1004-read-tree-m-u-wf.sh ***
@@ -38905,429 +38815,523 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1007-hash-object.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t1008-read-tree-overlay.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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]
+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
 
-    -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 - multi-read
 
-ok 5 - Can't use --path with --stdin-paths
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1001-read-tree-m-2way.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
 
-expecting success of 1007.6 'Can't use --path with --no-filters': 
-	test_must_fail git hash-object --no-filters --path=foo
+	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
 
-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]
+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
 
-    -t <type>             object type
-    -w                    write the object into the object database
-    --[no-]stdin          read the object from stdin
-    --[no-]stdin-paths    read file names from stdin
-    --no-filters          store file as is without filters
-    --filters             opposite of --no-filters
-    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
-    --[no-]path <file>    process file as it were from this path
+expecting success of 1001.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
 
-ok 6 - Can't use --path with --no-filters
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.7 'hash a file': 
-	test "$(test_oid hello)" = $(git hash-object hello)
+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
 
-ok 7 - hash a file
+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 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 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
 
-expecting success of 1007.9 'hash from stdin': 
-	test "$(test_oid example)" = $(git hash-object --stdin < example)
+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.
 
-ok 9 - hash from stdin
+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
 
-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
+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 1007.11 'hash a file and write to database': 
-	test "$(test_oid hello)" = $(git hash-object -w hello)
+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
 
-ok 11 - hash a file and write to database
+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 1007.12 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 12 - blob exists in database
+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
 
-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"
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 7 - 8 - conflicting addition.
 
-ok 13 - git hash-object --stdin file1 <file0 first operates on file0, then file1
+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
 
-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"
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 8 - 9 - conflicting addition.
 
-ok 14 - set up crlf tests
+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
 
-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"
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+ok 9 - 10 - path removed.
 
-ok 15 - check that appropriate filter is invoke when --path is used
+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
 
-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"
-	)
+error: Entry 'rezrov' not uptodate. Cannot merge.
+ok 10 - 11 - dirty path removed.
 
-ok 16 - gitattributes also work in a subdirectory
+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
 
-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"
-	)
+error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
+ok 11 - 12 - unmatching local changes being removed.
 
-ok 17 - --path works in a subdirectory
+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
 
-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"
+error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
+ok 12 - 13 - unmatching local changes being removed.
 
-ok 18 - check that --no-filters option works
+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
 
-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"
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
+nitfol: clean
+ok 13 - 14 - unchanged in two heads.
 
-ok 19 - check that --no-filters option works with --stdin-paths
+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.47.2/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.20 'hash from stdin and write to database (-w --stdin)': 
-		test "$(test_oid example)" = $(git hash-object $args < example)
-	
-ok 20 - hash from stdin and write to database (-w --stdin)
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
+nitfol: dirty
+ok 14 - 15 - unchanged in two heads.
 
-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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.22 'hash from stdin and write to database (--stdin -w)': 
-		test "$(test_oid example)" = $(git hash-object $args < example)
-	
-ok 22 - hash from stdin and write to database (--stdin -w)
+error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 15 - 16 - conflicting local change.
 
-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 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
 
-expecting success of 1007.24 'hash two files with names on stdin': 
-	test "$oids" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
+error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 16 - 17 - conflicting local change.
 
-ok 24 - hash two files with names on stdin
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.25 'hash two files with names on stdin and write to database (-w --stdin-paths)': 
-		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
-	
-ok 25 - hash two files with names on stdin and write to database (-w --stdin-paths)
+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 1007.26 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 26 - blob exists in database
+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
 
-expecting success of 1007.27 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 27 - blob exists in database
+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.
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.28 'hash two files with names on stdin and write to database (--stdin-paths -w)': 
-		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
-	
-ok 28 - hash two files with names on stdin and write to database (--stdin-paths -w)
+expecting success of 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
 
-expecting success of 1007.29 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 29 - blob exists in database
+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 1007.30 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 30 - blob exists in database
+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
 
-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: Entry 'bozbar' not uptodate. Cannot merge.
+ok 20 - 21 - no local change, dirty cache.
 
-error: too-short tree object
-ok 31 - too-short tree
+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
 
-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: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 21 - 22 - local change cache updated.
 
-error: malformed mode in tree entry
-ok 32 - malformed mode in tree
+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 &&
 
-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
+	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
 
-error: empty filename in tree entry
-ok 33 - empty filename in tree
+treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
+100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
+treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
+040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
+ok 22 - DF vs DF/DF case setup.
 
-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
+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 &&
+	:
 
-error: object fails fsck: duplicateEntries: contains duplicate file entries
-ok 34 - duplicate filename in tree
+100644 b90ea14b2dd74b6f377c10870b3757344bbe077c 0	DF/DF
+DF/DF: dirty
+ok 23 - DF vs DF/DF case test.
 
-expecting success of 1007.35 'corrupt commit': 
-	test_must_fail git hash-object -t commit --stdin </dev/null
+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 &&
 
-error: object fails fsck: unterminatedHeader: unterminated header
-fatal: refusing to create malformed object
-ok 35 - corrupt commit
+	rm -f a &&
+	git update-index --remove a &&
+	mkdir a &&
+	: >a/b &&
+	treeH=$(git write-tree) &&
+	echo treeH $treeH &&
+	git ls-tree $treeH
 
-expecting success of 1007.36 'corrupt tag': 
-	test_must_fail git hash-object -t tag --stdin </dev/null
+treeM 496d6428b9cf92981dc9495211e6e1120fb6f2ba
+100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a
+treeH 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ok 24 - a/b (untracked) vs a case setup.
 
-error: object fails fsck: unterminatedHeader: unterminated header
-fatal: refusing to create malformed object
-ok 36 - corrupt tag
+expecting success of 1001.25 'a/b (untracked) vs a, plus c/d case test.': 
+	read_tree_u_must_fail -u -m "$treeH" "$treeM" &&
+	git ls-files --stage &&
+	test -f a/b
 
-expecting success of 1007.37 'hash-object complains about bogus type name': 
-	test_must_fail git hash-object -t bogus --stdin </dev/null
+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.
 
-fatal: invalid object type "bogus"
-ok 37 - hash-object complains about bogus type name
+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
 
-expecting success of 1007.38 'hash-object complains about truncated type name': 
-	test_must_fail git hash-object -t bl --stdin </dev/null
+ok 26 - read-tree supports the super-prefix
 
-fatal: invalid object type "bl"
-ok 38 - hash-object complains about truncated type name
+expecting success of 1001.27 'a/b vs a, plus c/d case setup.': 
+	rm -f .git/index &&
+	rm -fr a &&
+	: >a &&
+	mkdir c &&
+	: >c/d &&
+	git update-index --add a c/d &&
+	treeM=$(git write-tree) &&
+	echo treeM $treeM &&
+	git ls-tree $treeM &&
+	git ls-files --stage >treeM.out &&
 
-expecting success of 1007.39 '--literally': 
-	t=1234567890 &&
-	echo example | git hash-object -t $t --literally --stdin
+	rm -f a &&
+	mkdir a &&
+	: >a/b &&
+	git update-index --add --remove a a/b &&
+	treeH=$(git write-tree) &&
+	echo treeH $treeH &&
+	git ls-tree $treeH
 
-f78b23c3f872d473c764d5fcf4fb39af8bbf2123
-ok 39 - --literally
+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 1007.40 '--literally with extra-long type': 
-	t=12345678901234567890123456789012345678901234567890 &&
-	t="$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t" &&
-	echo example | git hash-object -t $t --literally --stdin
+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
 
-2a881776ee43e849175ee7158075560ca0ae7692
-ok 40 - --literally with extra-long type
+ok 28 - a/b vs a, plus c/d case test.
 
-expecting success of 1007.41 '--stdin outside of repository (uses SHA-1)': 
-	nongit git hash-object --stdin <hello >actual &&
-	echo "$(test_oid --hash=sha1 hello)" >expect &&
+expecting success of 1001.29 '-m references the correct modified tree': 
+	echo >file-a &&
+	echo >file-b &&
+	git add file-a file-b &&
+	git commit -a -m "test for correct modified tree" &&
+	git branch initial-mod &&
+	echo b >file-b &&
+	git commit -a -m "B" &&
+	echo a >file-a &&
+	git add file-a &&
+	git ls-tree $(git write-tree) file-a >expect &&
+	read_tree_must_succeed -m HEAD initial-mod &&
+	git ls-tree $(git write-tree) file-a >actual &&
 	test_cmp expect actual
 
-ok 41 - --stdin outside of repository (uses SHA-1)
-
-# passed all 41 test(s)
-1..41
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1008-read-tree-overlay.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+[master (root-commit) 0d16b8a] test for correct modified tree
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 4 files changed, 2 insertions(+)
  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
+ 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(+)
- 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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 29 - -m references the correct modified tree
 
-# passed all 2 test(s)
-1..2
+# passed all 29 test(s)
+1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1009-read-tree-new-index.sh ***
@@ -39360,84 +39364,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1010-mktree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1010-mktree/.git/
-expecting success of 1010.1 'setup': 
-	for d in a a- a0
-	do
-		mkdir "$d" && echo "$d/one" >"$d/one" &&
-		git add "$d" || return 1
-	done &&
-	echo zero >one &&
-	git update-index --add --info-only one &&
-	git write-tree --missing-ok >tree.missing &&
-	git ls-tree $(cat tree.missing) >top.missing &&
-	git ls-tree -r $(cat tree.missing) >all.missing &&
-	echo one >one &&
-	git add one &&
-	git write-tree >tree &&
-	git ls-tree $(cat tree) >top &&
-	git ls-tree -r $(cat tree) >all &&
-	test_tick &&
-	git commit -q -m one &&
-	H=$(git rev-parse HEAD) &&
-	git update-index --add --cacheinfo 160000 $H sub &&
-	test_tick &&
-	git commit -q -m two &&
-	git rev-parse HEAD^{tree} >tree.withsub &&
-	git ls-tree HEAD >top.withsub &&
-	git ls-tree -r HEAD >all.withsub
-
-ok 1 - setup
-
-expecting success of 1010.2 'ls-tree piped to mktree (1)': 
-	git mktree <top >actual &&
-	test_cmp tree actual
-
-ok 2 - ls-tree piped to mktree (1)
-
-expecting success of 1010.3 'ls-tree piped to mktree (2)': 
-	git mktree <top.withsub >actual &&
-	test_cmp tree.withsub actual
-
-ok 3 - ls-tree piped to mktree (2)
-
-expecting success of 1010.4 'ls-tree output in wrong order given to mktree (1)': 
-	perl -e "print reverse <>" <top |
-	git mktree >actual &&
-	test_cmp tree actual
-
-ok 4 - ls-tree output in wrong order given to mktree (1)
-
-expecting success of 1010.5 'ls-tree output in wrong order given to mktree (2)': 
-	perl -e "print reverse <>" <top.withsub |
-	git mktree >actual &&
-	test_cmp tree.withsub actual
-
-ok 5 - ls-tree output in wrong order given to mktree (2)
-
-expecting success of 1010.6 'allow missing object with --missing': 
-	git mktree --missing <top.missing >actual &&
-	test_cmp tree.missing actual
-
-ok 6 - allow missing object with --missing
-
-expecting success of 1010.7 'mktree refuses to read ls-tree -r output (1)': 
-	test_must_fail git mktree <all
-
-fatal: path a-/one contains slash
-ok 7 - mktree refuses to read ls-tree -r output (1)
-
-expecting success of 1010.8 'mktree refuses to read ls-tree -r output (2)': 
-	test_must_fail git mktree <all.withsub
-
-fatal: path a-/one contains slash
-ok 8 - mktree refuses to read ls-tree -r output (2)
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1000-read-tree-m-3way.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1000-read-tree-m-3way/.git/
 expecting success of 1000.1 'adding test file NN and Z/NN': 
@@ -40080,6 +40006,84 @@
 1..83
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1010-mktree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1010-mktree/.git/
+expecting success of 1010.1 'setup': 
+	for d in a a- a0
+	do
+		mkdir "$d" && echo "$d/one" >"$d/one" &&
+		git add "$d" || return 1
+	done &&
+	echo zero >one &&
+	git update-index --add --info-only one &&
+	git write-tree --missing-ok >tree.missing &&
+	git ls-tree $(cat tree.missing) >top.missing &&
+	git ls-tree -r $(cat tree.missing) >all.missing &&
+	echo one >one &&
+	git add one &&
+	git write-tree >tree &&
+	git ls-tree $(cat tree) >top &&
+	git ls-tree -r $(cat tree) >all &&
+	test_tick &&
+	git commit -q -m one &&
+	H=$(git rev-parse HEAD) &&
+	git update-index --add --cacheinfo 160000 $H sub &&
+	test_tick &&
+	git commit -q -m two &&
+	git rev-parse HEAD^{tree} >tree.withsub &&
+	git ls-tree HEAD >top.withsub &&
+	git ls-tree -r HEAD >all.withsub
+
+ok 1 - setup
+
+expecting success of 1010.2 'ls-tree piped to mktree (1)': 
+	git mktree <top >actual &&
+	test_cmp tree actual
+
+ok 2 - ls-tree piped to mktree (1)
+
+expecting success of 1010.3 'ls-tree piped to mktree (2)': 
+	git mktree <top.withsub >actual &&
+	test_cmp tree.withsub actual
+
+ok 3 - ls-tree piped to mktree (2)
+
+expecting success of 1010.4 'ls-tree output in wrong order given to mktree (1)': 
+	perl -e "print reverse <>" <top |
+	git mktree >actual &&
+	test_cmp tree actual
+
+ok 4 - ls-tree output in wrong order given to mktree (1)
+
+expecting success of 1010.5 'ls-tree output in wrong order given to mktree (2)': 
+	perl -e "print reverse <>" <top.withsub |
+	git mktree >actual &&
+	test_cmp tree.withsub actual
+
+ok 5 - ls-tree output in wrong order given to mktree (2)
+
+expecting success of 1010.6 'allow missing object with --missing': 
+	git mktree --missing <top.missing >actual &&
+	test_cmp tree.missing actual
+
+ok 6 - allow missing object with --missing
+
+expecting success of 1010.7 'mktree refuses to read ls-tree -r output (1)': 
+	test_must_fail git mktree <all
+
+fatal: path a-/one contains slash
+ok 7 - mktree refuses to read ls-tree -r output (1)
+
+expecting success of 1010.8 'mktree refuses to read ls-tree -r output (2)': 
+	test_must_fail git mktree <all.withsub
+
+fatal: path a-/one contains slash
+ok 8 - mktree refuses to read ls-tree -r output (2)
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1002-read-tree-m-u-2way.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1002-read-tree-m-u-2way/.git/
 expecting success of 1002.1 'setup': 
@@ -41302,8 +41306,8 @@
  create mode 100644 two.t
 80b0d61182f42d417d3f1080999c86acd16276f7
 4f4b1c441e35611dff006a309fbda4370b40fc90
-a7cddf35737959e1438bc929b665619e9e79bfee tree   33 44 12
-2f00a404aed7e63d867313d504bd0fccea53fd25 tree   66 73 56
+a7cddf35737959e1438bc929b665619e9e79bfee tree   33 44 85
+2f00a404aed7e63d867313d504bd0fccea53fd25 tree   66 73 12
 ef23b68d4e6487c3b82203365a1ad71966a7c795 commit 167 127 168
 b399ab2167d8b39d1885d639c028321b5d84b0da commit 215 156 12
 ok 26 - gc repacks promisor objects separately from non-promisor objects
@@ -41643,7 +41647,7 @@
 
 Cloning into 'repo'...
 foo
-Receiving objects: 100% (1/1)
Receiving objects: 100% (1/1), 45 bytes | 22.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': 
@@ -42168,6 +42172,80 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1012-read-tree-df.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1011-read-tree-sparse-checkout.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1011-read-tree-sparse-checkout/.git/
 expecting success of 1011.1 'setup': 
@@ -42543,78 +42621,123 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1012-read-tree-df.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+*** 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" &&
 
-	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: &&
+	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}) &&
 
-	maketree O-020 ds/dma/ioat.c ds/dma/ioat_dca.c &&
-	maketree A-020 ds/dma/ioat/Makefile ds/dma/ioat/registers.h &&
-	:
+	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 &&
 
-ok 1 - setup
+	# "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
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-ok 2 - 3-way (1)
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1021-rerere-in-workdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1021-rerere-in-workdir/.git/
+checking prerequisite: SYMLINKS
 
-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
+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 3 - 3-way (2)
+)
+prerequisite SYMLINKS ok
+expecting success of 1021.1 'setup': 
+	git config rerere.enabled true &&
+	>world &&
+	git add world &&
+	test_tick &&
+	git commit -m initial &&
 
-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
+	echo hello >world &&
+	test_tick &&
+	git commit -a -m hello &&
 
-ok 4 - 3-way (3)
+	git checkout -b side HEAD^ &&
+	echo goodbye >world &&
+	test_tick &&
+	git commit -a -m goodbye &&
 
-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
+	git checkout main
 
-ok 5 - 2-way (1)
+[main (root-commit) 21975ff] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 world
+[main 02943d2] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'side'
+[side 5611ff9] goodbye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+ok 1 - setup
 
-# passed all 5 test(s)
-1..5
+expecting success of 1021.2 'rerere in workdir': 
+	rm -rf .git/rr-cache &&
+	"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . work &&
+	(
+		cd work &&
+		test_must_fail git merge side &&
+		git rerere status >actual &&
+		echo world >expect &&
+		test_cmp expect actual
+	)
+
+Auto-merging world
+CONFLICT (content): Merge conflict in world
+Recorded preimage for 'world'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - rerere in workdir
+
+checking known breakage of 1021.3 'rerere in workdir (relative)': 
+	rm -rf .git/rr-cache &&
+	"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . krow &&
+	(
+		cd krow &&
+		rm -f .git/rr-cache &&
+		ln -s ../.git/rr-cache .git/rr-cache &&
+		test_must_fail git merge side &&
+		git rerere status >actual &&
+		echo world >expect &&
+		test_cmp expect actual
+	)
+
+Auto-merging world
+CONFLICT (content): Merge conflict in world
+fatal: could not create directory '.git/rr-cache'
+fatal: could not create directory '.git/rr-cache'
+not ok 3 - rerere in workdir (relative) # TODO known breakage
+
+# still have 1 known breakage(s)
+# passed all remaining 2 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1020-subdirectory.sh ***
@@ -42914,158 +43037,39 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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" &&
+*** t1051-large-conversion.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1051-large-conversion/.git/
+expecting success of 1051.1 'setup input tests': 
+	printf "\$Id: foo\$\\r\\n" >small &&
+	cat small small >large &&
+	git config core.bigfilethreshold 20 &&
+	git config filter.test.clean "sed s/.*/CLEAN/"
 
-	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}) &&
+ok 1 - setup input tests
 
-	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 1051.2 'autocrlf=true converts on input': 
+	test_config core.autocrlf true &&
+	check_input
 
-	# "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 2 - autocrlf=true converts on input
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 1051.3 'eol=crlf converts on input': 
+	set_attr eol=crlf &&
+	check_input
 
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1021-rerere-in-workdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1021-rerere-in-workdir/.git/
-checking prerequisite: SYMLINKS
+ok 3 - eol=crlf converts on 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
+expecting success of 1051.4 'ident converts on input': 
+	set_attr ident &&
+	check_input
 
-)
-prerequisite SYMLINKS ok
-expecting success of 1021.1 'setup': 
-	git config rerere.enabled true &&
-	>world &&
-	git add world &&
-	test_tick &&
-	git commit -m initial &&
+ok 4 - ident converts on input
 
-	echo hello >world &&
-	test_tick &&
-	git commit -a -m hello &&
+expecting success of 1051.5 'user-defined filters convert on input': 
+	set_attr filter=test &&
+	check_input
 
-	git checkout -b side HEAD^ &&
-	echo goodbye >world &&
-	test_tick &&
-	git commit -a -m goodbye &&
-
-	git checkout main
-
-[main (root-commit) 21975ff] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 world
-[main 02943d2] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'side'
-[side 5611ff9] goodbye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 1021.2 'rerere in workdir': 
-	rm -rf .git/rr-cache &&
-	"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . work &&
-	(
-		cd work &&
-		test_must_fail git merge side &&
-		git rerere status >actual &&
-		echo world >expect &&
-		test_cmp expect actual
-	)
-
-Auto-merging world
-CONFLICT (content): Merge conflict in world
-Recorded preimage for 'world'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - rerere in workdir
-
-checking known breakage of 1021.3 'rerere in workdir (relative)': 
-	rm -rf .git/rr-cache &&
-	"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . krow &&
-	(
-		cd krow &&
-		rm -f .git/rr-cache &&
-		ln -s ../.git/rr-cache .git/rr-cache &&
-		test_must_fail git merge side &&
-		git rerere status >actual &&
-		echo world >expect &&
-		test_cmp expect actual
-	)
-
-Auto-merging world
-CONFLICT (content): Merge conflict in world
-fatal: could not create directory '.git/rr-cache'
-fatal: could not create directory '.git/rr-cache'
-not ok 3 - rerere in workdir (relative) # TODO known breakage
-
-# still have 1 known breakage(s)
-# passed all remaining 2 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1051-large-conversion.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1051-large-conversion/.git/
-expecting success of 1051.1 'setup input tests': 
-	printf "\$Id: foo\$\\r\\n" >small &&
-	cat small small >large &&
-	git config core.bigfilethreshold 20 &&
-	git config filter.test.clean "sed s/.*/CLEAN/"
-
-ok 1 - setup input tests
-
-expecting success of 1051.2 'autocrlf=true converts on input': 
-	test_config core.autocrlf true &&
-	check_input
-
-ok 2 - autocrlf=true converts on input
-
-expecting success of 1051.3 'eol=crlf converts on input': 
-	set_attr eol=crlf &&
-	check_input
-
-ok 3 - eol=crlf converts on input
-
-expecting success of 1051.4 'ident converts on input': 
-	set_attr ident &&
-	check_input
-
-ok 4 - ident converts on input
-
-expecting success of 1051.5 'user-defined filters convert on input': 
-	set_attr filter=test &&
-	check_input
-
-ok 5 - user-defined filters convert on input
+ok 5 - user-defined filters convert on input
 
 expecting success of 1051.6 'setup output tests': 
 	echo "\$Id\$" >small &&
@@ -43327,7 +43331,7 @@
  create mode 100644 content.t
 1+0 records in
 1+0 records out
-1 byte copied, 0.00056964 s, 1.8 kB/s
+1 byte copied, 3.804e-05 s, 26.3 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1060-object-corruption/no-bit-error/.git/
 [master (root-commit) f374eba] content
  Author: A U Thor <author@example.com>
@@ -43424,12 +43428,12 @@
 
 Cloning into bare repository 'corrupt-transport'...
 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: inflate: data stream error (invalid distance too far back)        
 remote: error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header        
 remote: error: inflate: data stream error (invalid distance too far back)        
 remote: error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header        
 remote: fatal: loose object d95f3ad14dee633a758d2e331151e950dd13e4ed (stored in ./objects/d9/5f3ad14dee633a758d2e331151e950dd13e4ed) is corrupt        
+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
@@ -43540,46 +43544,6 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1100-commit-tree-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1100-commit-tree-options/.git/
-expecting success of 1100.1 'test preparation: write empty tree': git write-tree >treeid
-ok 1 - test preparation: write empty tree
-
-expecting success of 1100.2 'construct commit': echo comment text |
-     GIT_AUTHOR_NAME="Author Name" \
-     GIT_AUTHOR_EMAIL="author@email" \
-     GIT_AUTHOR_DATE="2005-05-26 23:00" \
-     GIT_COMMITTER_NAME="Committer Name" \
-     GIT_COMMITTER_EMAIL="committer@email" \
-     GIT_COMMITTER_DATE="2005-05-26 23:30" \
-     TZ=GMT git commit-tree $(cat treeid) >commitid 2>/dev/null
-ok 2 - construct commit
-
-expecting success of 1100.3 'read commit': git cat-file commit $(cat commitid) >commit
-ok 3 - read commit
-
-expecting success of 1100.4 'compare commit': test_cmp expected commit
-ok 4 - compare commit
-
-expecting success of 1100.5 'flags and then non flags': 
-	test_tick &&
-	echo comment text |
-	git commit-tree $(cat treeid) >commitid &&
-	echo comment text |
-	git commit-tree $(cat treeid) -p $(cat commitid) >childid-1 &&
-	echo comment text |
-	git commit-tree -p $(cat commitid) $(cat treeid) >childid-2 &&
-	test_cmp childid-1 childid-2 &&
-	git commit-tree $(cat treeid) -m foo >childid-3 &&
-	git commit-tree -m foo $(cat treeid) >childid-4 &&
-	test_cmp childid-3 childid-4
-
-ok 5 - flags and then non flags
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1050-large.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1050-large/.git/
 expecting success of 1050.1 'core.bigFileThreshold must be non-negative': 
@@ -43897,6 +43861,46 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1100-commit-tree-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1100-commit-tree-options/.git/
+expecting success of 1100.1 'test preparation: write empty tree': git write-tree >treeid
+ok 1 - test preparation: write empty tree
+
+expecting success of 1100.2 'construct commit': echo comment text |
+     GIT_AUTHOR_NAME="Author Name" \
+     GIT_AUTHOR_EMAIL="author@email" \
+     GIT_AUTHOR_DATE="2005-05-26 23:00" \
+     GIT_COMMITTER_NAME="Committer Name" \
+     GIT_COMMITTER_EMAIL="committer@email" \
+     GIT_COMMITTER_DATE="2005-05-26 23:30" \
+     TZ=GMT git commit-tree $(cat treeid) >commitid 2>/dev/null
+ok 2 - construct commit
+
+expecting success of 1100.3 'read commit': git cat-file commit $(cat commitid) >commit
+ok 3 - read commit
+
+expecting success of 1100.4 'compare commit': test_cmp expected commit
+ok 4 - compare commit
+
+expecting success of 1100.5 'flags and then non flags': 
+	test_tick &&
+	echo comment text |
+	git commit-tree $(cat treeid) >commitid &&
+	echo comment text |
+	git commit-tree $(cat treeid) -p $(cat commitid) >childid-1 &&
+	echo comment text |
+	git commit-tree -p $(cat commitid) $(cat treeid) >childid-2 &&
+	test_cmp childid-1 childid-2 &&
+	git commit-tree $(cat treeid) -m foo >childid-3 &&
+	git commit-tree -m foo $(cat treeid) >childid-4 &&
+	test_cmp childid-3 childid-4
+
+ok 5 - flags and then non flags
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1302-repo-version.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1302-repo-version/.git/
 expecting success of 1302.1 'setup': 
@@ -45470,6 +45474,30 @@
 1..202
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1304-default-acl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 1053: 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0610-reftable-basics.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0610-reftable-basics/.git/
 expecting success of 0610.1 'init: creates basic reftable structures': 
@@ -47547,6 +47575,432 @@
 1..89
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1303-wacky-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1307-config-blob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1307-config-blob/.git/
+expecting success of 1307.1 'create config blob': 
+	cat >config <<-\EOF &&
+	[some]
+		value = 1
+	EOF
+	git add config &&
+	git commit -m foo
+
+[master (root-commit) 5571afa] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 config
+ok 1 - create config blob
+
+expecting success of 1307.2 'list config blob contents': 
+	echo some.value=1 >expect &&
+	git config --blob=HEAD:config --list >actual &&
+	test_cmp expect actual
+
+ok 2 - list config blob contents
+
+expecting success of 1307.3 'fetch value from blob': 
+	echo true >expect &&
+	git config --blob=HEAD:config --bool some.value >actual &&
+	test_cmp expect actual
+
+ok 3 - fetch value from blob
+
+expecting success of 1307.4 'reading non-existing value from blob is an error': 
+	test_must_fail git config --blob=HEAD:config non.existing
+
+ok 4 - reading non-existing value from blob is an error
+
+expecting success of 1307.5 'reading from blob and file is an error': 
+	test_must_fail git config --blob=HEAD:config --system --list
+
+error: only one config file at a time
+ok 5 - reading from blob and file is an error
+
+expecting success of 1307.6 'reading from missing ref is an error': 
+	test_must_fail git config --blob=HEAD:doesnotexist --list
+
+error: unable to resolve config blob 'HEAD:doesnotexist'
+fatal: error processing config file(s)
+ok 6 - reading from missing ref is an error
+
+expecting success of 1307.7 'reading from non-blob is an error': 
+	test_must_fail git config --blob=HEAD --list
+
+error: reference 'HEAD' does not point to a blob
+fatal: error processing config file(s)
+ok 7 - reading from non-blob is an error
+
+expecting success of 1307.8 'setting a value in a blob is an error': 
+	test_must_fail git config --blob=HEAD:config some.value foo
+
+fatal: writing config blobs is not supported
+ok 8 - setting a value in a blob is an error
+
+expecting success of 1307.9 'deleting a value in a blob is an error': 
+	test_must_fail git config --blob=HEAD:config --unset some.value
+
+fatal: writing config blobs is not supported
+ok 9 - deleting a value in a blob is an error
+
+expecting success of 1307.10 'editing a blob is an error': 
+	test_must_fail git config --blob=HEAD:config --edit
+
+fatal: editing blobs is not supported
+ok 10 - editing a blob is an error
+
+expecting success of 1307.11 'parse errors in blobs are properly attributed': 
+	cat >config <<-\EOF &&
+	[some]
+		value = "
+	EOF
+	git add config &&
+	git commit -m broken &&
+
+	test_must_fail git config --blob=HEAD:config some.value 2>err &&
+	test_grep "HEAD:config" err
+
+[master 91b4611] broken
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: bad config line 2 in blob HEAD:config
+ok 11 - parse errors in blobs are properly attributed
+
+expecting success of 1307.12 'can parse blob ending with CR': 
+	test_commit --printf CR config "[some]key = value\\r" &&
+	echo value >expect &&
+	git config --blob=HEAD:config some.key >actual &&
+	test_cmp expect actual
+
+[master f02e06a] CR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 12 - can parse blob ending with CR
+
+expecting success of 1307.13 'config --blob outside of a repository is an error': 
+	nongit test_must_fail git config --blob=foo --list
+
+fatal: --blob can only be used inside a git repository
+ok 13 - config --blob outside of a repository is an error
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1306-xdg-files.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1306-xdg-files/.git/
+expecting success of 1306.1 'read config: xdg file exists and ~/.gitconfig doesn't': 
+	mkdir -p .config/git &&
+	echo "[alias]" >.config/git/config &&
+	echo "	myalias = !echo in_config" >>.config/git/config &&
+	echo in_config >expected &&
+	git myalias >actual &&
+	test_cmp expected actual
+
+ok 1 - read config: xdg file exists and ~/.gitconfig doesn't
+
+expecting success of 1306.2 'read config: xdg file exists and ~/.gitconfig exists': 
+	>.gitconfig &&
+	echo "[alias]" >.gitconfig &&
+	echo "	myalias = !echo in_gitconfig" >>.gitconfig &&
+	echo in_gitconfig >expected &&
+	git myalias >actual &&
+	test_cmp expected actual
+
+ok 2 - read config: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.3 'read with --get: xdg file exists and ~/.gitconfig doesn't': 
+	rm .gitconfig &&
+	echo "[user]" >.config/git/config &&
+	echo "	name = read_config" >>.config/git/config &&
+	echo read_config >expected &&
+	git config --get user.name >actual &&
+	test_cmp expected actual
+
+ok 3 - read with --get: xdg file exists and ~/.gitconfig doesn't
+
+expecting success of 1306.4 '"$XDG_CONFIG_HOME overrides $HOME/.config/git': 
+	mkdir -p "$HOME"/xdg/git &&
+	echo "[user]name = in_xdg" >"$HOME"/xdg/git/config &&
+	echo in_xdg >expected &&
+	XDG_CONFIG_HOME="$HOME"/xdg git config --get-all user.name >actual &&
+	test_cmp expected actual
+
+ok 4 - "$XDG_CONFIG_HOME overrides $HOME/.config/git
+
+expecting success of 1306.5 'read with --get: xdg file exists and ~/.gitconfig exists': 
+	>.gitconfig &&
+	echo "[user]" >.gitconfig &&
+	echo "	name = read_gitconfig" >>.gitconfig &&
+	echo read_gitconfig >expected &&
+	git config --get user.name >actual &&
+	test_cmp expected actual
+
+ok 5 - read with --get: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.6 'read with --list: xdg file exists and ~/.gitconfig doesn't': 
+	rm .gitconfig &&
+	echo user.name=read_config >expected &&
+	git config --global --list >actual &&
+	test_cmp expected actual
+
+ok 6 - read with --list: xdg file exists and ~/.gitconfig doesn't
+
+expecting success of 1306.7 'read with --list: xdg file exists and ~/.gitconfig exists': 
+	>.gitconfig &&
+	echo "[user]" >.gitconfig &&
+	echo "	name = read_gitconfig" >>.gitconfig &&
+	echo user.name=read_gitconfig >expected &&
+	git config --global --list >actual &&
+	test_cmp expected actual
+
+ok 7 - read with --list: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.8 'Setup': 
+	git init git &&
+	cd git &&
+	echo foo >to_be_excluded
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1306-xdg-files/git/.git/
+ok 8 - Setup
+
+expecting success of 1306.9 'Exclusion of a file in the XDG ignore file': 
+	mkdir -p "$HOME"/.config/git/ &&
+	echo to_be_excluded >"$HOME"/.config/git/ignore &&
+	test_must_fail git add to_be_excluded
+
+The following paths are ignored by one of your .gitignore files:
+to_be_excluded
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+ok 9 - Exclusion of a file in the XDG ignore file
+
+expecting success of 1306.10 '$XDG_CONFIG_HOME overrides $HOME/.config/git/ignore': 
+	mkdir -p "$HOME"/xdg/git &&
+	echo content >excluded_by_xdg_only &&
+	echo excluded_by_xdg_only >"$HOME"/xdg/git/ignore &&
+	test_when_finished "git read-tree --empty" &&
+	(XDG_CONFIG_HOME="$HOME/xdg" &&
+	 export XDG_CONFIG_HOME &&
+	 git add to_be_excluded &&
+	 test_must_fail git add excluded_by_xdg_only
+	)
+
+The following paths are ignored by one of your .gitignore files:
+excluded_by_xdg_only
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+ok 10 - $XDG_CONFIG_HOME overrides $HOME/.config/git/ignore
+
+expecting success of 1306.11 'Exclusion in both XDG and local ignore files': 
+	echo to_be_excluded >.gitignore &&
+	test_must_fail git add to_be_excluded
+
+The following paths are ignored by one of your .gitignore files:
+to_be_excluded
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+ok 11 - Exclusion in both XDG and local ignore files
+
+expecting success of 1306.12 'Exclusion in a non-XDG global ignore file': 
+	rm .gitignore &&
+	echo >"$HOME"/.config/git/ignore &&
+	echo to_be_excluded >"$HOME"/my_gitignore &&
+	git config core.excludesfile "$HOME"/my_gitignore &&
+	test_must_fail git add to_be_excluded
+
+The following paths are ignored by one of your .gitignore files:
+to_be_excluded
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+ok 12 - Exclusion in a non-XDG global ignore file
+
+expecting success of 1306.13 'Checking XDG ignore file when HOME is unset': 
+	(sane_unset HOME &&
+	 git config --unset core.excludesfile &&
+	 git ls-files --exclude-standard --ignored --others >actual) &&
+	test_must_be_empty actual
+
+ok 13 - Checking XDG ignore file when HOME is unset
+
+expecting success of 1306.14 'Checking attributes in the XDG attributes file': 
+	echo foo >f &&
+	git check-attr -a f >actual &&
+	test_line_count -eq 0 actual &&
+	echo "f attr_f" >"$HOME"/.config/git/attributes &&
+	echo "f: attr_f: set" >expected &&
+	git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 14 - Checking attributes in the XDG attributes file
+
+expecting success of 1306.15 'Checking XDG attributes when HOME is unset': 
+	(sane_unset HOME &&
+	 git check-attr -a f >actual) &&
+	test_must_be_empty actual
+
+ok 15 - Checking XDG attributes when HOME is unset
+
+expecting success of 1306.16 '$XDG_CONFIG_HOME overrides $HOME/.config/git/attributes': 
+	mkdir -p "$HOME"/xdg/git &&
+	echo "f attr_f=xdg" >"$HOME"/xdg/git/attributes &&
+	echo "f: attr_f: xdg" >expected &&
+	XDG_CONFIG_HOME="$HOME/xdg" git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 16 - $XDG_CONFIG_HOME overrides $HOME/.config/git/attributes
+
+expecting success of 1306.17 'Checking attributes in both XDG and local attributes files': 
+	echo "f -attr_f" >.gitattributes &&
+	echo "f: attr_f: unset" >expected &&
+	git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 17 - Checking attributes in both XDG and local attributes files
+
+expecting success of 1306.18 'Checking attributes in a non-XDG global attributes file': 
+	rm -f .gitattributes &&
+	echo "f attr_f=test" >"$HOME"/my_gitattributes &&
+	git config core.attributesfile "$HOME"/my_gitattributes &&
+	echo "f: attr_f: test" >expected &&
+	git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 18 - Checking attributes in a non-XDG global attributes file
+
+expecting success of 1306.19 'write: xdg file exists and ~/.gitconfig doesn't': 
+	mkdir -p "$HOME"/.config/git &&
+	>"$HOME"/.config/git/config &&
+	rm -f "$HOME"/.gitconfig &&
+	git config --global user.name "write_config" &&
+	echo "[user]" >expected &&
+	echo "	name = write_config" >>expected &&
+	test_cmp expected "$HOME"/.config/git/config
+
+ok 19 - write: xdg file exists and ~/.gitconfig doesn't
+
+expecting success of 1306.20 'write: xdg file exists and ~/.gitconfig exists': 
+	>"$HOME"/.gitconfig &&
+	git config --global user.name "write_gitconfig" &&
+	echo "[user]" >expected &&
+	echo "	name = write_gitconfig" >>expected &&
+	test_cmp expected "$HOME"/.gitconfig
+
+ok 20 - write: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.21 'write: ~/.config/git/ exists and config file doesn't': 
+	rm -f "$HOME"/.gitconfig &&
+	rm -f "$HOME"/.config/git/config &&
+	git config --global user.name "write_gitconfig" &&
+	echo "[user]" >expected &&
+	echo "	name = write_gitconfig" >>expected &&
+	test_cmp expected "$HOME"/.gitconfig
+
+ok 21 - write: ~/.config/git/ exists and config file doesn't
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t0000-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0000-basic/.git/
 expecting success of 0000.1 'verify that the running shell supports "local"': 
@@ -48292,7 +48746,7 @@
 
 	grep "echo trace" lazy-prereq-and-tracing/err
 
-+ echo trace
+++ echo trace
 ok 44 - subtest: lazy prereqs do not turn off tracing
 
 expecting success of 0000.45 'subtest: tests clean up after themselves': 
@@ -48842,496 +49296,663 @@
 1..92
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1304-default-acl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t1310-config-default.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-t1304-default-acl.sh: 4: eval: setfacl: not found
-ok 1 - checking for a working acl setup
+ok 1 - uses --default when entry missing
 
-ok 2 # skip Setup test repo (missing SETFACL)
+expecting success of 1310.2 'does not use --default when entry present': 
+	echo bar >expect &&
+	git -c core.foo=bar config --default=baz core.foo >actual &&
+	test_cmp expect actual
 
-ok 3 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL)
+ok 2 - does not use --default when entry present
 
-ok 4 # skip git gc does not break ACLs with restrictive umask (missing SETFACL)
+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
 
-# passed all 4 test(s)
-1..4
+ok 3 - canonicalizes --default with appropriate type
+
+expecting success of 1310.4 'dies when --default cannot be parsed': 
+	test_must_fail git config -f config --type=expiry-date --default=x --get \
+		not.a.section 2>error &&
+	test_grep "failed to format default config value" error
+
+fatal: failed to format default config value: x
+ok 4 - dies when --default cannot be parsed
+
+expecting success of 1310.5 'does not allow --default without --get': 
+	test_must_fail git config --default=quux --unset a.section >output 2>&1 &&
+	test_grep "\-\-default is only applicable to" output
+
+error: --default is only applicable to --get
+ok 5 - does not allow --default without --get
+
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1303-wacky-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t1309-early-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)"
 
-ok 1 - modify same key
+ok 1 - read early config
 
-expecting success of 1303.2 'add key in same section': 
-	setup &&
-	git config section.other bar &&
-	check section.key foo &&
-	check section.other bar
+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)"
 
-ok 2 - add key in same section
+ok 2 - in a sub-directory
 
-expecting success of 1303.3 'add key in different section': 
-	setup &&
-	git config section2.key bar &&
-	check section.key foo &&
-	check section2.key bar
+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
 
-ok 3 - add key in different section
+ok 3 - ceiling
 
-expecting success of 1303.4 'make sure git config escapes section names properly': 
-	git config "$SECTION" bar &&
-	check "$SECTION" bar
+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)"
 
-ok 4 - make sure git config escapes section names properly
+ok 4 - ceiling #2
 
-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"
+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 - do not crash on special long config line
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1309-early-config/foo/.git/
+ok 5 - read config file in right order
 
-expecting success of 1303.6 'get many entries': 
-	setup_many &&
-	git config --get-all section.key >actual &&
-	test_line_count = 3126 actual
+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
 
-ok 6 - get many entries
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 1303.7 'get many entries by regex': 
-	setup_many &&
-	git config --get-regexp "sec.*ke." >actual &&
-	test_line_count = 3126 actual
+checking known breakage of 1309.7 'ignore .git/ with invalid repository version': 
+	test_with_config "[core]repositoryformatversion = invalid"
 
-ok 7 - get many entries by regex
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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
+checking known breakage of 1309.8 'ignore .git/ with invalid config': 
+	test_with_config "["
 
-ok 8 - add and replace one of many entries
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 1303.9 'replace many entries': 
-	setup_many &&
-	git config --replace-all section.key bar &&
-	check section.key bar
+expecting success of 1309.9 'early config and onbranch': 
+	echo "[broken" >broken &&
+	test_with_config "[includeif \"onbranch:topic\"]path=../broken"
 
-ok 9 - replace many entries
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1309-early-config/throwaway/.git/
+ok 9 - early config and onbranch
 
-expecting success of 1303.10 'unset many entries': 
-	setup_many &&
-	git config --unset-all section.key &&
-	test_must_fail git config section.key
+expecting success of 1309.10 'onbranch config outside of git repo': 
+	test_config_global includeIf.onbranch:topic.path non-existent &&
+	nongit git help
 
-ok 10 - unset many entries
+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 1303.11 '--add appends new value after existing empty value': 
-	cat >expect <<-\EOF &&
+These are common Git commands used in various situations:
 
+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
 
-	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
+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
 
-ok 11 - --add appends new value after existing empty value
+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
 
-# passed all 11 test(s)
-1..11
+grow, mark and tweak your common history
+   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
+
+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
+
+'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
+
+# still have 2 known breakage(s)
+# passed all remaining 8 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1306-xdg-files.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1306-xdg-files/.git/
-expecting success of 1306.1 'read config: xdg file exists and ~/.gitconfig doesn't': 
-	mkdir -p .config/git &&
-	echo "[alias]" >.config/git/config &&
-	echo "	myalias = !echo in_config" >>.config/git/config &&
-	echo in_config >expected &&
-	git myalias >actual &&
-	test_cmp expected actual
+*** t1305-config-include.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 1 - read config: xdg file exists and ~/.gitconfig doesn't
+ok 1 - include file by absolute path
 
-expecting success of 1306.2 'read config: xdg file exists and ~/.gitconfig exists': 
-	>.gitconfig &&
-	echo "[alias]" >.gitconfig &&
-	echo "	myalias = !echo in_gitconfig" >>.gitconfig &&
-	echo in_gitconfig >expected &&
-	git myalias >actual &&
-	test_cmp expected actual
+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 2 - read config: xdg file exists and ~/.gitconfig exists
+ok 2 - include file by relative path
 
-expecting success of 1306.3 'read with --get: xdg file exists and ~/.gitconfig doesn't': 
-	rm .gitconfig &&
-	echo "[user]" >.config/git/config &&
-	echo "	name = read_config" >>.config/git/config &&
-	echo read_config >expected &&
-	git config --get user.name >actual &&
-	test_cmp expected actual
+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 3 - read with --get: xdg file exists and ~/.gitconfig doesn't
+ok 3 - chained relative paths
 
-expecting success of 1306.4 '"$XDG_CONFIG_HOME overrides $HOME/.config/git': 
-	mkdir -p "$HOME"/xdg/git &&
-	echo "[user]name = in_xdg" >"$HOME"/xdg/git/config &&
-	echo in_xdg >expected &&
-	XDG_CONFIG_HOME="$HOME"/xdg git config --get-all user.name >actual &&
-	test_cmp expected actual
+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
 
-ok 4 - "$XDG_CONFIG_HOME overrides $HOME/.config/git
+ok 4 - include paths get tilde-expansion
 
-expecting success of 1306.5 'read with --get: xdg file exists and ~/.gitconfig exists': 
-	>.gitconfig &&
-	echo "[user]" >.gitconfig &&
-	echo "	name = read_gitconfig" >>.gitconfig &&
-	echo read_gitconfig >expected &&
-	git config --get user.name >actual &&
-	test_cmp expected actual
+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
 
-ok 5 - read with --get: xdg file exists and ~/.gitconfig exists
+ok 5 - include options can still be examined
 
-expecting success of 1306.6 'read with --list: xdg file exists and ~/.gitconfig doesn't': 
-	rm .gitconfig &&
-	echo user.name=read_config >expected &&
-	git config --global --list >actual &&
-	test_cmp expected actual
+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
 
-ok 6 - read with --list: xdg file exists and ~/.gitconfig doesn't
+ok 6 - listing includes option and expansion
 
-expecting success of 1306.7 'read with --list: xdg file exists and ~/.gitconfig exists': 
-	>.gitconfig &&
-	echo "[user]" >.gitconfig &&
-	echo "	name = read_gitconfig" >>.gitconfig &&
-	echo user.name=read_gitconfig >expected &&
-	git config --global --list >actual &&
-	test_cmp expected actual
+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 7 - read with --list: xdg file exists and ~/.gitconfig exists
+ok 7 - single file lookup does not expand includes by default
 
-expecting success of 1306.8 'Setup': 
-	git init git &&
-	cd git &&
-	echo foo >to_be_excluded
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1306-xdg-files/git/.git/
-ok 8 - Setup
+ok 8 - single file list does not expand includes by default
 
-expecting success of 1306.9 'Exclusion of a file in the XDG ignore file': 
-	mkdir -p "$HOME"/.config/git/ &&
-	echo to_be_excluded >"$HOME"/.config/git/ignore &&
-	test_must_fail git add to_be_excluded
+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
 
-The following paths are ignored by one of your .gitignore files:
-to_be_excluded
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 9 - Exclusion of a file in the XDG ignore file
+ok 9 - writing config file does not expand includes
 
-expecting success of 1306.10 '$XDG_CONFIG_HOME overrides $HOME/.config/git/ignore': 
-	mkdir -p "$HOME"/xdg/git &&
-	echo content >excluded_by_xdg_only &&
-	echo excluded_by_xdg_only >"$HOME"/xdg/git/ignore &&
-	test_when_finished "git read-tree --empty" &&
-	(XDG_CONFIG_HOME="$HOME/xdg" &&
-	 export XDG_CONFIG_HOME &&
-	 git add to_be_excluded &&
-	 test_must_fail git add excluded_by_xdg_only
-	)
+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 &&
+	1
+	2
+	EOF
+	git config --get-all test.one >actual &&
+	test_cmp expect actual
 
-The following paths are ignored by one of your .gitignore files:
-excluded_by_xdg_only
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 10 - $XDG_CONFIG_HOME overrides $HOME/.config/git/ignore
+ok 10 - config modification does not affect includes
 
-expecting success of 1306.11 'Exclusion in both XDG and local ignore files': 
-	echo to_be_excluded >.gitignore &&
-	test_must_fail git add to_be_excluded
+expecting success of 1305.11 'missing include files are ignored': 
+	cat >.gitconfig <<-\EOF &&
+	[include]path = non-existent
+	[test]value = yes
+	EOF
+	echo yes >expect &&
+	git config test.value >actual &&
+	test_cmp expect actual
 
-The following paths are ignored by one of your .gitignore files:
-to_be_excluded
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 11 - Exclusion in both XDG and local ignore files
+ok 11 - missing include files are ignored
 
-expecting success of 1306.12 'Exclusion in a non-XDG global ignore file': 
-	rm .gitignore &&
-	echo >"$HOME"/.config/git/ignore &&
-	echo to_be_excluded >"$HOME"/my_gitignore &&
-	git config core.excludesfile "$HOME"/my_gitignore &&
-	test_must_fail git add to_be_excluded
+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
 
-The following paths are ignored by one of your .gitignore files:
-to_be_excluded
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 12 - Exclusion in a non-XDG global ignore file
+ok 12 - absolute includes from command line work
 
-expecting success of 1306.13 'Checking XDG ignore file when HOME is unset': 
-	(sane_unset HOME &&
-	 git config --unset core.excludesfile &&
-	 git ls-files --exclude-standard --ignored --others >actual) &&
-	test_must_be_empty actual
+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 13 - Checking XDG ignore file when HOME is unset
+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 1306.14 'Checking attributes in the XDG attributes file': 
-	echo foo >f &&
-	git check-attr -a f >actual &&
-	test_line_count -eq 0 actual &&
-	echo "f attr_f" >"$HOME"/.config/git/attributes &&
-	echo "f: attr_f: set" >expected &&
-	git check-attr -a f >actual &&
-	test_cmp expected actual
+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 14 - Checking attributes in the XDG attributes file
+ok 14 - absolute includes from blobs work
 
-expecting success of 1306.15 'Checking XDG attributes when HOME is unset': 
-	(sane_unset HOME &&
-	 git check-attr -a f >actual) &&
-	test_must_be_empty actual
+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 15 - Checking XDG attributes when HOME is unset
+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 1306.16 '$XDG_CONFIG_HOME overrides $HOME/.config/git/attributes': 
-	mkdir -p "$HOME"/xdg/git &&
-	echo "f attr_f=xdg" >"$HOME"/xdg/git/attributes &&
-	echo "f: attr_f: xdg" >expected &&
-	XDG_CONFIG_HOME="$HOME/xdg" git check-attr -a f >actual &&
-	test_cmp expected actual
+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
 
-ok 16 - $XDG_CONFIG_HOME overrides $HOME/.config/git/attributes
+ok 16 - absolute includes from stdin work
 
-expecting success of 1306.17 'Checking attributes in both XDG and local attributes files': 
-	echo "f -attr_f" >.gitattributes &&
-	echo "f: attr_f: unset" >expected &&
-	git check-attr -a f >actual &&
-	test_cmp expected actual
+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
 
-ok 17 - Checking attributes in both XDG and local attributes files
+error: relative config includes must come from files
+fatal: bad config line 1 in standard input
+ok 17 - relative includes from stdin line fail
 
-expecting success of 1306.18 'Checking attributes in a non-XDG global attributes file': 
-	rm -f .gitattributes &&
-	echo "f attr_f=test" >"$HOME"/my_gitattributes &&
-	git config core.attributesfile "$HOME"/my_gitattributes &&
-	echo "f: attr_f: test" >expected &&
-	git check-attr -a f >actual &&
-	test_cmp expected actual
+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
+	)
 
-ok 18 - Checking attributes in a non-XDG global attributes file
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1305-config-include/foo/.git/
+ok 18 - conditional include, both unanchored
 
-expecting success of 1306.19 'write: xdg file exists and ~/.gitconfig doesn't': 
-	mkdir -p "$HOME"/.config/git &&
-	>"$HOME"/.config/git/config &&
-	rm -f "$HOME"/.gitconfig &&
-	git config --global user.name "write_config" &&
-	echo "[user]" >expected &&
-	echo "	name = write_config" >>expected &&
-	test_cmp expected "$HOME"/.config/git/config
+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 19 - write: xdg file exists and ~/.gitconfig doesn't
+ok 19 - conditional include, $HOME expansion
 
-expecting success of 1306.20 'write: xdg file exists and ~/.gitconfig exists': 
-	>"$HOME"/.gitconfig &&
-	git config --global user.name "write_gitconfig" &&
-	echo "[user]" >expected &&
-	echo "	name = write_gitconfig" >>expected &&
-	test_cmp expected "$HOME"/.gitconfig
+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
+	)
 
-ok 20 - write: xdg file exists and ~/.gitconfig exists
+ok 20 - conditional include, full pattern
 
-expecting success of 1306.21 'write: ~/.config/git/ exists and config file doesn't': 
-	rm -f "$HOME"/.gitconfig &&
-	rm -f "$HOME"/.config/git/config &&
-	git config --global user.name "write_gitconfig" &&
-	echo "[user]" >expected &&
-	echo "	name = write_gitconfig" >>expected &&
-	test_cmp expected "$HOME"/.gitconfig
+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 21 - write: ~/.config/git/ exists and config file doesn't
+ok 21 - conditional include, relative path
 
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1307-config-blob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1307-config-blob/.git/
-expecting success of 1307.1 'create config blob': 
-	cat >config <<-\EOF &&
-	[some]
-		value = 1
-	EOF
-	git add config &&
-	git commit -m foo
+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
+	)
 
-[master (root-commit) 5571afa] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 config
-ok 1 - create config blob
+ok 22 - conditional include, both unanchored, icase
 
-expecting success of 1307.2 'list config blob contents': 
-	echo some.value=1 >expect &&
-	git config --blob=HEAD:config --list >actual &&
-	test_cmp expect actual
+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 2 - list config blob contents
+ok 23 - conditional include, early config reading
 
-expecting success of 1307.3 'fetch value from blob': 
-	echo true >expect &&
-	git config --blob=HEAD:config --bool some.value >actual &&
+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
 
-ok 3 - fetch value from blob
-
-expecting success of 1307.4 'reading non-existing value from blob is an error': 
-	test_must_fail git config --blob=HEAD:config non.existing
-
-ok 4 - reading non-existing value from blob is an error
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1305-config-include/foo/bar/repo/.git/
+ok 24 - conditional include with /**/
 
-expecting success of 1307.5 'reading from blob and file is an error': 
-	test_must_fail git config --blob=HEAD:config --system --list
+checking prerequisite: SYMLINKS
 
-error: only one config file at a time
-ok 5 - reading from blob and file is an error
+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 1307.6 'reading from missing ref is an error': 
-	test_must_fail git config --blob=HEAD:doesnotexist --list
+)
+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" &&
 
-error: unable to resolve config blob 'HEAD:doesnotexist'
-fatal: error processing config file(s)
-ok 6 - reading from missing ref is an error
+		git init foo &&
+		cd foo &&
+		mkdir sub
+	)
 
-expecting success of 1307.7 'reading from non-blob is an error': 
-	test_must_fail git config --blob=HEAD --list
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1305-config-include/real-home/foo/.git/
+ok 25 - conditional include, set up symlinked $HOME
 
-error: reference 'HEAD' does not point to a blob
-fatal: error processing config file(s)
-ok 7 - reading from non-blob is an error
+expecting success of 1305.26 'conditional include, $HOME expansion with symlinks': 
+	(
+		HOME="$TRASH_DIRECTORY/home" &&
+		export HOME &&
+		cd "$HOME"/foo &&
 
-expecting success of 1307.8 'setting a value in a blob is an error': 
-	test_must_fail git config --blob=HEAD:config some.value foo
+		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
+	)
 
-fatal: writing config blobs is not supported
-ok 8 - setting a value in a blob is an error
+ok 26 - conditional include, $HOME expansion with symlinks
 
-expecting success of 1307.9 'deleting a value in a blob is an error': 
-	test_must_fail git config --blob=HEAD:config --unset some.value
+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 &&
 
-fatal: writing config blobs is not supported
-ok 9 - deleting a value in a blob is an error
+		echo 4 >expect &&
+		force_setup_explicit_git_dir &&
+		git -C sub config test.four >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 1307.10 'editing a blob is an error': 
-	test_must_fail git config --blob=HEAD:config --edit
+ok 27 - conditional include, relative path with symlinks
 
-fatal: editing blobs is not supported
-ok 10 - editing a blob is an error
+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
+	)
 
-expecting success of 1307.11 'parse errors in blobs are properly attributed': 
-	cat >config <<-\EOF &&
-	[some]
-		value = "
-	EOF
-	git add config &&
-	git commit -m broken &&
+ok 28 - conditional include, gitdir matching symlink
 
-	test_must_fail git config --blob=HEAD:config some.value 2>err &&
-	test_grep "HEAD:config" err
+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
+	)
 
-[master 91b4611] broken
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: bad config line 2 in blob HEAD:config
-ok 11 - parse errors in blobs are properly attributed
+ok 29 - conditional include, gitdir matching symlink, icase
 
-expecting success of 1307.12 'can parse blob ending with CR': 
-	test_commit --printf CR config "[some]key = value\\r" &&
-	echo value >expect &&
-	git config --blob=HEAD:config some.key >actual &&
+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
 
-[master f02e06a] CR
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 12 - can parse blob ending with CR
+Switched to a new branch 'main'
+Switched to a new branch 'foo-branch'
+ok 30 - conditional include, onbranch
 
-expecting success of 1307.13 'config --blob outside of a repository is an error': 
-	nongit test_must_fail git config --blob=foo --list
+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 &&
 
-fatal: --blob can only be used inside a git repository
-ok 13 - config --blob outside of a repository is an error
+	echo 10 >expect &&
+	git checkout -b foo-branch/a/b/c &&
+	git config test.ten >actual &&
+	test_cmp expect actual &&
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1310-config-default.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+	git checkout -b moo-bar/a &&
+	git config test.ten >actual &&
 	test_cmp expect actual
 
-ok 1 - uses --default when entry missing
+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
 
-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 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 &&
+
+	echo 11 >expect &&
+	git checkout -b foo-dir/a/b/c &&
+	git config test.eleven >actual &&
 	test_cmp expect actual
 
-ok 2 - does not use --default when entry present
+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 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 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
 
-ok 3 - canonicalizes --default with appropriate type
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1305-config-include/cycle/
+fatal: exceeded maximum include depth (10) while including
+ok 33 - include cycles are detected
 
-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 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
+	)
 
-fatal: failed to format default config value: x
-ok 4 - dies when --default cannot be parsed
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1305-config-include/repo/.git/
+baz
+ok 34 - onbranch with unborn branch
 
-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 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
+	)
 
-error: --default is only applicable to --get
-ok 5 - does not allow --default without --get
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-# passed all 5 test(s)
-1..5
+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
+
+baz
+ok 36 - onbranch without repository
+
+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
+
+baz
+ok 37 - onbranch without repository but explicit nonexistent Git directory
+
+# passed all 37 test(s)
+1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1091-sparse-checkout-builtin.sh ***
@@ -50122,7 +50743,6 @@
 	check_files repo/deep/deeper1 a
 
 warning: disabling cone pattern matching
-warning: disabling cone pattern matching
 ok 47 - pattern-checks: non directory pattern
 
 expecting success of 1091.48 'pattern-checks: contained glob characters': 
@@ -50548,1256 +51168,6 @@
 1..72
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1309-early-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)"
-
-ok 1 - read early config
-
-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)"
-
-ok 2 - in a sub-directory
-
-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
-
-ok 3 - ceiling
-
-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)"
-
-ok 4 - ceiling #2
-
-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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1309-early-config/foo/.git/
-ok 5 - read config file in right order
-
-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.47.2/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
-
-checking known breakage of 1309.7 'ignore .git/ with invalid repository version': 
-	test_with_config "[core]repositoryformatversion = invalid"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-
-checking known breakage of 1309.8 'ignore .git/ with invalid config': 
-	test_with_config "["
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 1309.9 'early config and onbranch': 
-	echo "[broken" >broken &&
-	test_with_config "[includeif \"onbranch:topic\"]path=../broken"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1309-early-config/throwaway/.git/
-ok 9 - early config and onbranch
-
-expecting success of 1309.10 'onbranch config outside of git repo': 
-	test_config_global includeIf.onbranch:topic.path non-existent &&
-	nongit git help
-
-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>]
-
-These are common Git commands used in various situations:
-
-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
-
-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
-
-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
-
-grow, mark and tweak your common history
-   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
-
-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
-
-'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
-
-# still have 2 known breakage(s)
-# passed all remaining 8 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1305-config-include.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 1 - include file by absolute path
-
-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 2 - include file by relative path
-
-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 3 - chained relative paths
-
-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
-
-ok 4 - include paths get tilde-expansion
-
-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
-
-ok 5 - include options can still be examined
-
-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
-
-ok 6 - listing includes option and expansion
-
-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 7 - single file lookup does not expand includes by default
-
-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
-
-ok 8 - single file list does not expand includes by default
-
-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
-
-ok 9 - writing config file does not expand includes
-
-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 &&
-	1
-	2
-	EOF
-	git config --get-all test.one >actual &&
-	test_cmp expect actual
-
-ok 10 - config modification does not affect includes
-
-expecting success of 1305.11 'missing include files are ignored': 
-	cat >.gitconfig <<-\EOF &&
-	[include]path = non-existent
-	[test]value = yes
-	EOF
-	echo yes >expect &&
-	git config test.value >actual &&
-	test_cmp expect actual
-
-ok 11 - missing include files are ignored
-
-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 12 - absolute includes from command line work
-
-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
-
-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 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 14 - absolute includes from blobs work
-
-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
-
-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 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
-
-ok 16 - absolute includes from stdin work
-
-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
-
-error: relative config includes must come from files
-fatal: bad config line 1 in standard input
-ok 17 - relative includes from stdin line fail
-
-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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1305-config-include/foo/.git/
-ok 18 - conditional include, both unanchored
-
-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 19 - conditional include, $HOME expansion
-
-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
-	)
-
-ok 20 - conditional include, full pattern
-
-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 21 - conditional include, relative path
-
-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 22 - conditional include, both unanchored, icase
-
-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 23 - conditional include, early config reading
-
-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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1305-config-include/foo/bar/repo/.git/
-ok 24 - conditional include with /**/
-
-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 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 init foo &&
-		cd foo &&
-		mkdir sub
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1305-config-include/real-home/foo/.git/
-ok 25 - conditional include, set up symlinked $HOME
-
-expecting success of 1305.26 'conditional include, $HOME expansion with symlinks': 
-	(
-		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
-	)
-
-ok 26 - conditional include, $HOME expansion with symlinks
-
-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 &&
-
-		echo 4 >expect &&
-		force_setup_explicit_git_dir &&
-		git -C sub config test.four >actual &&
-		test_cmp expect actual
-	)
-
-ok 27 - conditional include, relative path with symlinks
-
-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
-	)
-
-ok 28 - conditional include, gitdir matching symlink
-
-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
-	)
-
-ok 29 - conditional include, gitdir matching symlink, icase
-
-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
-
-Switched to a new branch 'main'
-Switched to a new branch 'foo-branch'
-ok 30 - conditional include, onbranch
-
-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 &&
-
-	echo 10 >expect &&
-	git checkout -b foo-branch/a/b/c &&
-	git config test.ten >actual &&
-	test_cmp expect actual &&
-
-	git checkout -b moo-bar/a &&
-	git config test.ten >actual &&
-	test_cmp expect actual
-
-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
-
-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 &&
-
-	echo 11 >expect &&
-	git checkout -b foo-dir/a/b/c &&
-	git config test.eleven >actual &&
-	test_cmp expect actual
-
-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 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.47.2/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 repo &&
-		git config set includeIf.onbranch:"*".path config.inc &&
-		git config set -f .git/config.inc foo.bar baz &&
-		git config get foo.bar
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1305-config-include/repo/.git/
-baz
-ok 34 - onbranch with unborn branch
-
-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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-
-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
-
-baz
-ok 36 - onbranch without repository
-
-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
-
-baz
-ok 37 - onbranch without repository but explicit nonexistent Git directory
-
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1350-config-hooks-path.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-
-ok 1 - set up a pre-commit hook in core.hooksPath
-
-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
-	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
-
-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)"
-
-ok 3 - git rev-parse --git-path hooks
-
-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"; }
-
-Cloning into 'no-templates'...
-done.
-ok 4 - core.hooksPath=/dev/null
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1308-config-set.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-
-ok 1 - setup default config
-
-expecting success of 1308.2 'get value for a simple key': 
-	check_config get_value case.penguin "very blue"
-
-ok 2 - get value for a simple key
-
-expecting success of 1308.3 'get value for a key with value as an empty string': 
-	check_config get_value case.my ""
-
-ok 3 - get value for a key with value as an empty string
-
-expecting success of 1308.4 'get value for a key with value as NULL': 
-	check_config get_value case.foo "(NULL)"
-
-ok 4 - get value for a key with value as NULL
-
-expecting success of 1308.5 'upper case key': 
-	check_config get_value case.UPPERCASE "true" &&
-	check_config get_value case.uppercase "true"
-
-ok 5 - upper case key
-
-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 6 - mixed case key
-
-expecting success of 1308.7 'key and value with mixed case': 
-	check_config get_value case.Movie "BadPhysics"
-
-ok 7 - key and value with mixed case
-
-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"
-
-ok 8 - key with case sensitive subsection
-
-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"
-
-ok 9 - key with case insensitive section header
-
-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"
-
-ok 10 - key with case insensitive section header & variable
-
-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\""
-
-ok 11 - find value with misspelled key
-
-expecting success of 1308.12 'find value with the highest priority': 
-	check_config get_value case.baz "hask"
-
-ok 12 - find value with the highest priority
-
-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
-
-ok 13 - return value for an existing key
-
-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
-
-ok 14 - return value for value-less key
-
-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
-
-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 &&
-	Key "fails.iskeychar.-" is invalid
-	EOF
-	test_expect_code 1 test-tool config get fails.iskeychar.- >actual 2>err &&
-	test_cmp actual expect &&
-	test_must_be_empty out
-
-ok 16 - return value for a bad key: CONFIG_INVALID_KEY
-
-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
-
-ok 17 - return value for a bad key: CONFIG_NO_SECTION_OR_NAME
-
-expecting success of 1308.18 'find integer value for a key': 
-	check_config get_int lamb.chop 65
-
-ok 18 - find integer value for a key
-
-expecting success of 1308.19 'parse integer value during iteration': 
-	check_config git_config_int lamb.chop 65
-
-ok 19 - parse integer value during iteration
-
-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\""
-
-ok 20 - find string value for a key
-
-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
-
-fatal: bad config variable 'case.foo' in file '.git/config' at line 7
-ok 21 - check line error when NULL string is queried
-
-expecting success of 1308.22 'find integer if value is non parse-able': 
-	check_config expect_code 128 get_int lamb.head
-
-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 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
-
-fatal: bad numeric config value 'none' for 'none' in file .git/config: invalid unit
-ok 23 - non parse-able integer value during iteration
-
-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
-
-ok 24 - find bool value for the entered key
-
-expecting success of 1308.25 'find multiple values': 
-	check_config get_value_multi case.baz sam bat hask
-
-ok 25 - find multiple values
-
-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 &&
-
-		# 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 &&
-
-		# 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 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 &&
-
-		# 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 &&
-
-		# 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 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 &&
-
-		# 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 &&
-
-		# 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 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
-
-ok 29 - find value from a configset
-
-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
-
-ok 30 - find value with highest priority from a configset
-
-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
-
-ok 31 - find value_list for a key from a configset
-
-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
-
-ok 32 - proper error on non-existent 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
-
-warning: unable to access 'a-directory': Is a directory
-ok 33 - proper error on directory "files"
-
-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 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
-
-warning: unable to access '.git/config': Permission denied
-warning: unable to access '.git/config': Permission denied
-ok 34 - proper error on non-accessible 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
-
-ok 35 - proper error on error in default config files
-
-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 36 - proper error on error in custom config 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
-
-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
-
-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
-
-fatal: not in a git directory
-ok 38 - error on modifying repo config without repo
-
-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 &&
-	key=foo.bar
-	value=from-home
-	origin=file
-	name=$HOME_GITCONFIG
-	lno=2
-	scope=global
-
-	key=ignore.this
-	value=please
-	origin=file
-	name=.git/config
-	lno=2
-	scope=local
-
-	key=foo.bar
-	value=from-repo
-	origin=file
-	name=.git/config
-	lno=3
-	scope=local
-
-	key=foo.bar
-	value=from-cmdline
-	origin=command line
-	name=
-	lno=-1
-	scope=command
-	EOF
-	GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
-	test_cmp expect actual
-
-ok 39 - iteration shows correct origins
-
-# passed all 39 test(s)
-1..39
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1006-cat-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1006-cat-file/.git/
 expecting success of 1006.1 'usage: cmdmode -e -p': 
@@ -58086,6 +57456,805 @@
 1..369
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1308-config-set.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+
+ok 1 - setup default config
+
+expecting success of 1308.2 'get value for a simple key': 
+	check_config get_value case.penguin "very blue"
+
+ok 2 - get value for a simple key
+
+expecting success of 1308.3 'get value for a key with value as an empty string': 
+	check_config get_value case.my ""
+
+ok 3 - get value for a key with value as an empty string
+
+expecting success of 1308.4 'get value for a key with value as NULL': 
+	check_config get_value case.foo "(NULL)"
+
+ok 4 - get value for a key with value as NULL
+
+expecting success of 1308.5 'upper case key': 
+	check_config get_value case.UPPERCASE "true" &&
+	check_config get_value case.uppercase "true"
+
+ok 5 - upper case key
+
+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 6 - mixed case key
+
+expecting success of 1308.7 'key and value with mixed case': 
+	check_config get_value case.Movie "BadPhysics"
+
+ok 7 - key and value with mixed case
+
+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"
+
+ok 8 - key with case sensitive subsection
+
+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"
+
+ok 9 - key with case insensitive section header
+
+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"
+
+ok 10 - key with case insensitive section header & variable
+
+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\""
+
+ok 11 - find value with misspelled key
+
+expecting success of 1308.12 'find value with the highest priority': 
+	check_config get_value case.baz "hask"
+
+ok 12 - find value with the highest priority
+
+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
+
+ok 13 - return value for an existing key
+
+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
+
+ok 14 - return value for value-less key
+
+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
+
+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 &&
+	Key "fails.iskeychar.-" is invalid
+	EOF
+	test_expect_code 1 test-tool config get fails.iskeychar.- >actual 2>err &&
+	test_cmp actual expect &&
+	test_must_be_empty out
+
+ok 16 - return value for a bad key: CONFIG_INVALID_KEY
+
+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
+
+ok 17 - return value for a bad key: CONFIG_NO_SECTION_OR_NAME
+
+expecting success of 1308.18 'find integer value for a key': 
+	check_config get_int lamb.chop 65
+
+ok 18 - find integer value for a key
+
+expecting success of 1308.19 'parse integer value during iteration': 
+	check_config git_config_int lamb.chop 65
+
+ok 19 - parse integer value during iteration
+
+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\""
+
+ok 20 - find string value for a key
+
+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
+
+fatal: bad config variable 'case.foo' in file '.git/config' at line 7
+ok 21 - check line error when NULL string is queried
+
+expecting success of 1308.22 'find integer if value is non parse-able': 
+	check_config expect_code 128 get_int lamb.head
+
+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 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
+
+fatal: bad numeric config value 'none' for 'none' in file .git/config: invalid unit
+ok 23 - non parse-able integer value during iteration
+
+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
+
+ok 24 - find bool value for the entered key
+
+expecting success of 1308.25 'find multiple values': 
+	check_config get_value_multi case.baz sam bat hask
+
+ok 25 - find multiple values
+
+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 &&
+
+		# 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 &&
+
+		# 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 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 &&
+
+		# 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 &&
+
+		# 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 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 &&
+
+		# 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 &&
+
+		# 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 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
+
+ok 29 - find value from a configset
+
+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
+
+ok 30 - find value with highest priority from a configset
+
+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
+
+ok 31 - find value_list for a key from a configset
+
+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
+
+ok 32 - proper error on non-existent 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
+
+warning: unable to access 'a-directory': Is a directory
+ok 33 - proper error on directory "files"
+
+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 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
+
+warning: unable to access '.git/config': Permission denied
+warning: unable to access '.git/config': Permission denied
+ok 34 - proper error on non-accessible 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
+
+ok 35 - proper error on error in default config files
+
+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 36 - proper error on error in custom config 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
+
+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
+
+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
+
+fatal: not in a git directory
+ok 38 - error on modifying repo config without repo
+
+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 &&
+	key=foo.bar
+	value=from-home
+	origin=file
+	name=$HOME_GITCONFIG
+	lno=2
+	scope=global
+
+	key=ignore.this
+	value=please
+	origin=file
+	name=.git/config
+	lno=2
+	scope=local
+
+	key=foo.bar
+	value=from-repo
+	origin=file
+	name=.git/config
+	lno=3
+	scope=local
+
+	key=foo.bar
+	value=from-cmdline
+	origin=command line
+	name=
+	lno=-1
+	scope=command
+	EOF
+	GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
+	test_cmp expect actual
+
+ok 39 - iteration shows correct origins
+
+# passed all 39 test(s)
+1..39
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1350-config-hooks-path.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+
+ok 1 - set up a pre-commit hook in core.hooksPath
+
+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
+	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
+
+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)"
+
+ok 3 - git rev-parse --git-path hooks
+
+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"; }
+
+Cloning into 'no-templates'...
+done.
+ok 4 - core.hooksPath=/dev/null
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1405-main-ref-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1405-main-ref-store/.git/
+expecting success of 1405.1 'setup': 
+	test_commit one
+
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - setup
+
+expecting success of 1405.2 'create_symref(FOO, refs/heads/main)': 
+	$RUN create-symref FOO refs/heads/main nothing &&
+	echo refs/heads/main >expected &&
+	git symbolic-ref FOO >actual &&
+	test_cmp expected actual
+
+ok 2 - create_symref(FOO, refs/heads/main)
+
+expecting success of 1405.3 'delete_refs(FOO, refs/tags/new-tag)': 
+	git tag -a -m new-tag new-tag HEAD &&
+	git rev-parse FOO -- &&
+	git rev-parse refs/tags/new-tag -- &&
+	m=$(git rev-parse main) &&
+	$RUN delete-refs REF_NO_DEREF nothing FOO refs/tags/new-tag &&
+	test_must_fail git rev-parse --symbolic-full-name FOO &&
+	test_must_fail git rev-parse FOO -- &&
+	test_must_fail git rev-parse refs/tags/new-tag --
+
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+--
+407ffbd56c168afa4e9302a7cdfe469155f84482
+--
+fatal: ambiguous argument 'FOO': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+FOO
+fatal: bad revision 'FOO'
+fatal: bad revision 'refs/tags/new-tag'
+ok 3 - delete_refs(FOO, refs/tags/new-tag)
+
+expecting success of 1405.4 'rename_refs(main, new-main)': 
+	git rev-parse main >expected &&
+	$RUN rename-ref refs/heads/main refs/heads/new-main &&
+	git rev-parse new-main >actual &&
+	test_cmp expected actual &&
+	test_commit recreate-main
+
+[main (root-commit) ff283f4] recreate-main
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one.t
+ create mode 100644 recreate-main.t
+ok 4 - rename_refs(main, new-main)
+
+expecting success of 1405.5 'for_each_ref(refs/heads/)': 
+	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
+	cat >expected <<-\EOF &&
+	main 0x0
+	new-main 0x0
+	EOF
+	test_cmp expected actual
+
+ok 5 - for_each_ref(refs/heads/)
+
+expecting success of 1405.6 'for_each_ref() is sorted': 
+	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
+	sort actual > expected &&
+	test_cmp expected actual
+
+ok 6 - for_each_ref() is sorted
+
+expecting success of 1405.7 'resolve_ref(new-main)': 
+	SHA1=`git rev-parse new-main` &&
+	echo "$SHA1 refs/heads/new-main 0x0" >expected &&
+	$RUN resolve-ref refs/heads/new-main 0 >actual &&
+	test_cmp expected actual
+
+ok 7 - resolve_ref(new-main)
+
+expecting success of 1405.8 'verify_ref(new-main)': 
+	$RUN verify-ref refs/heads/new-main
+
+ok 8 - verify_ref(new-main)
+
+expecting success of 1405.9 'for_each_reflog()': 
+	$RUN for-each-reflog >actual &&
+	cat >expected <<-\EOF &&
+	HEAD
+	refs/heads/main
+	refs/heads/new-main
+	EOF
+	test_cmp expected actual
+
+ok 9 - for_each_reflog()
+
+expecting success of 1405.10 'for_each_reflog_ent()': 
+	$RUN for-each-reflog-ent HEAD >actual &&
+	head -n1 actual | grep one &&
+	tail -n1 actual | grep recreate-main
+
+0000000000000000000000000000000000000000 d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): one
+0000000000000000000000000000000000000000 ff283f48d5b4f118f57230316ac4d562b4a6eed7 C O Mitter <committer@example.com> 1112912053 -0700	commit (initial): recreate-main
+ok 10 - for_each_reflog_ent()
+
+expecting success of 1405.11 'for_each_reflog_ent_reverse()': 
+	$RUN for-each-reflog-ent-reverse HEAD >actual &&
+	head -n1 actual | grep recreate-main &&
+	tail -n1 actual | grep one
+
+0000000000000000000000000000000000000000 ff283f48d5b4f118f57230316ac4d562b4a6eed7 C O Mitter <committer@example.com> 1112912053 -0700	commit (initial): recreate-main
+0000000000000000000000000000000000000000 d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): one
+ok 11 - for_each_reflog_ent_reverse()
+
+expecting success of 1405.12 'reflog_exists(HEAD)': 
+	$RUN reflog-exists HEAD
+
+ok 12 - reflog_exists(HEAD)
+
+expecting success of 1405.13 'delete_reflog(HEAD)': 
+	$RUN delete-reflog HEAD &&
+	test_must_fail git reflog exists HEAD
+
+ok 13 - delete_reflog(HEAD)
+
+expecting success of 1405.14 'create-reflog(HEAD)': 
+	$RUN create-reflog HEAD &&
+	git reflog exists HEAD
+
+ok 14 - create-reflog(HEAD)
+
+expecting success of 1405.15 'delete_ref(refs/heads/foo)': 
+	git checkout -b foo &&
+	FOO_SHA1=`git rev-parse foo` &&
+	git checkout --detach &&
+	test_commit bar-commit &&
+	git checkout -b bar &&
+	BAR_SHA1=`git rev-parse bar` &&
+	$RUN update-ref updating refs/heads/foo $BAR_SHA1 $FOO_SHA1 0 &&
+	echo $BAR_SHA1 >expected &&
+	git rev-parse refs/heads/foo >actual &&
+	test_cmp expected actual
+
+Switched to a new branch 'foo'
+HEAD is now at ff283f4 recreate-main
+[detached HEAD 12c332b] bar-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar-commit.t
+Switched to a new branch 'bar'
+ok 15 - delete_ref(refs/heads/foo)
+
+expecting success of 1405.16 'delete_ref(refs/heads/foo)': 
+	SHA1=`git rev-parse foo` &&
+	git checkout --detach &&
+	$RUN delete-ref msg refs/heads/foo $SHA1 0 &&
+	test_must_fail git rev-parse refs/heads/foo --
+
+HEAD is now at 12c332b bar-commit
+fatal: bad revision 'refs/heads/foo'
+ok 16 - delete_ref(refs/heads/foo)
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1401-symbolic-ref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1401-symbolic-ref/.git/
 expecting success of 1401.1 'setup': 
@@ -58476,172 +58645,6 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1405-main-ref-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1405-main-ref-store/.git/
-expecting success of 1405.1 'setup': 
-	test_commit one
-
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - setup
-
-expecting success of 1405.2 'create_symref(FOO, refs/heads/main)': 
-	$RUN create-symref FOO refs/heads/main nothing &&
-	echo refs/heads/main >expected &&
-	git symbolic-ref FOO >actual &&
-	test_cmp expected actual
-
-ok 2 - create_symref(FOO, refs/heads/main)
-
-expecting success of 1405.3 'delete_refs(FOO, refs/tags/new-tag)': 
-	git tag -a -m new-tag new-tag HEAD &&
-	git rev-parse FOO -- &&
-	git rev-parse refs/tags/new-tag -- &&
-	m=$(git rev-parse main) &&
-	$RUN delete-refs REF_NO_DEREF nothing FOO refs/tags/new-tag &&
-	test_must_fail git rev-parse --symbolic-full-name FOO &&
-	test_must_fail git rev-parse FOO -- &&
-	test_must_fail git rev-parse refs/tags/new-tag --
-
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
---
-407ffbd56c168afa4e9302a7cdfe469155f84482
---
-fatal: ambiguous argument 'FOO': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-FOO
-fatal: bad revision 'FOO'
-fatal: bad revision 'refs/tags/new-tag'
-ok 3 - delete_refs(FOO, refs/tags/new-tag)
-
-expecting success of 1405.4 'rename_refs(main, new-main)': 
-	git rev-parse main >expected &&
-	$RUN rename-ref refs/heads/main refs/heads/new-main &&
-	git rev-parse new-main >actual &&
-	test_cmp expected actual &&
-	test_commit recreate-main
-
-[main (root-commit) ff283f4] recreate-main
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one.t
- create mode 100644 recreate-main.t
-ok 4 - rename_refs(main, new-main)
-
-expecting success of 1405.5 'for_each_ref(refs/heads/)': 
-	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
-	cat >expected <<-\EOF &&
-	main 0x0
-	new-main 0x0
-	EOF
-	test_cmp expected actual
-
-ok 5 - for_each_ref(refs/heads/)
-
-expecting success of 1405.6 'for_each_ref() is sorted': 
-	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
-	sort actual > expected &&
-	test_cmp expected actual
-
-ok 6 - for_each_ref() is sorted
-
-expecting success of 1405.7 'resolve_ref(new-main)': 
-	SHA1=`git rev-parse new-main` &&
-	echo "$SHA1 refs/heads/new-main 0x0" >expected &&
-	$RUN resolve-ref refs/heads/new-main 0 >actual &&
-	test_cmp expected actual
-
-ok 7 - resolve_ref(new-main)
-
-expecting success of 1405.8 'verify_ref(new-main)': 
-	$RUN verify-ref refs/heads/new-main
-
-ok 8 - verify_ref(new-main)
-
-expecting success of 1405.9 'for_each_reflog()': 
-	$RUN for-each-reflog >actual &&
-	cat >expected <<-\EOF &&
-	HEAD
-	refs/heads/main
-	refs/heads/new-main
-	EOF
-	test_cmp expected actual
-
-ok 9 - for_each_reflog()
-
-expecting success of 1405.10 'for_each_reflog_ent()': 
-	$RUN for-each-reflog-ent HEAD >actual &&
-	head -n1 actual | grep one &&
-	tail -n1 actual | grep recreate-main
-
-0000000000000000000000000000000000000000 d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): one
-0000000000000000000000000000000000000000 ff283f48d5b4f118f57230316ac4d562b4a6eed7 C O Mitter <committer@example.com> 1112912053 -0700	commit (initial): recreate-main
-ok 10 - for_each_reflog_ent()
-
-expecting success of 1405.11 'for_each_reflog_ent_reverse()': 
-	$RUN for-each-reflog-ent-reverse HEAD >actual &&
-	head -n1 actual | grep recreate-main &&
-	tail -n1 actual | grep one
-
-0000000000000000000000000000000000000000 ff283f48d5b4f118f57230316ac4d562b4a6eed7 C O Mitter <committer@example.com> 1112912053 -0700	commit (initial): recreate-main
-0000000000000000000000000000000000000000 d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): one
-ok 11 - for_each_reflog_ent_reverse()
-
-expecting success of 1405.12 'reflog_exists(HEAD)': 
-	$RUN reflog-exists HEAD
-
-ok 12 - reflog_exists(HEAD)
-
-expecting success of 1405.13 'delete_reflog(HEAD)': 
-	$RUN delete-reflog HEAD &&
-	test_must_fail git reflog exists HEAD
-
-ok 13 - delete_reflog(HEAD)
-
-expecting success of 1405.14 'create-reflog(HEAD)': 
-	$RUN create-reflog HEAD &&
-	git reflog exists HEAD
-
-ok 14 - create-reflog(HEAD)
-
-expecting success of 1405.15 'delete_ref(refs/heads/foo)': 
-	git checkout -b foo &&
-	FOO_SHA1=`git rev-parse foo` &&
-	git checkout --detach &&
-	test_commit bar-commit &&
-	git checkout -b bar &&
-	BAR_SHA1=`git rev-parse bar` &&
-	$RUN update-ref updating refs/heads/foo $BAR_SHA1 $FOO_SHA1 0 &&
-	echo $BAR_SHA1 >expected &&
-	git rev-parse refs/heads/foo >actual &&
-	test_cmp expected actual
-
-Switched to a new branch 'foo'
-HEAD is now at ff283f4 recreate-main
-[detached HEAD 12c332b] bar-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar-commit.t
-Switched to a new branch 'bar'
-ok 15 - delete_ref(refs/heads/foo)
-
-expecting success of 1405.16 'delete_ref(refs/heads/foo)': 
-	SHA1=`git rev-parse foo` &&
-	git checkout --detach &&
-	$RUN delete-ref msg refs/heads/foo $SHA1 0 &&
-	test_must_fail git rev-parse refs/heads/foo --
-
-HEAD is now at 12c332b bar-commit
-fatal: bad revision 'refs/heads/foo'
-ok 16 - delete_ref(refs/heads/foo)
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1403-show-ref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1403-show-ref/.git/
 expecting success of 1403.1 'setup': 
@@ -58998,6 +59001,68 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1407-worktree-ref-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1407-worktree-ref-store/.git/
+expecting success of 1407.1 'setup': 
+	test_commit first &&
+	git worktree add -b wt-main wt &&
+	(
+		cd wt &&
+		test_commit second
+	)
+
+[main (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Preparing worktree (new branch 'wt-main')
+HEAD is now at 50e526b first
+[wt-main d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 1 - setup
+
+expecting success of 1407.2 'resolve_ref(<shared-ref>)': 
+	SHA1=`git rev-parse main` &&
+	echo "$SHA1 refs/heads/main 0x0" >expected &&
+	$RWT resolve-ref refs/heads/main 0 >actual &&
+	test_cmp expected actual &&
+	$RMAIN resolve-ref refs/heads/main 0 >actual &&
+	test_cmp expected actual
+
+ok 2 - resolve_ref(<shared-ref>)
+
+expecting success of 1407.3 'resolve_ref(<per-worktree-ref>)': 
+	SHA1=`git -C wt rev-parse HEAD` &&
+	echo "$SHA1 refs/heads/wt-main 0x1" >expected &&
+	$RWT resolve-ref HEAD 0 >actual &&
+	test_cmp expected actual &&
+
+	SHA1=`git rev-parse HEAD` &&
+	echo "$SHA1 refs/heads/main 0x1" >expected &&
+	$RMAIN resolve-ref HEAD 0 >actual &&
+	test_cmp expected actual
+
+ok 3 - resolve_ref(<per-worktree-ref>)
+
+expecting success of 1407.4 'create_symref(FOO, refs/heads/main)': 
+	$RWT create-symref FOO refs/heads/main nothing &&
+	echo refs/heads/main >expected &&
+	git -C wt symbolic-ref FOO >actual &&
+	test_cmp expected actual &&
+
+	$RMAIN create-symref FOO refs/heads/wt-main nothing &&
+	echo refs/heads/wt-main >expected &&
+	git symbolic-ref FOO >actual &&
+	test_cmp expected actual
+
+ok 4 - create_symref(FOO, refs/heads/main)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1402-check-ref-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1402-check-ref-format/.git/
 expecting success of 1402.1 'ref name '' is invalid': 
@@ -59580,68 +59645,6 @@
 1..99
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1407-worktree-ref-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1407-worktree-ref-store/.git/
-expecting success of 1407.1 'setup': 
-	test_commit first &&
-	git worktree add -b wt-main wt &&
-	(
-		cd wt &&
-		test_commit second
-	)
-
-[main (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Preparing worktree (new branch 'wt-main')
-HEAD is now at 50e526b first
-[wt-main d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 1 - setup
-
-expecting success of 1407.2 'resolve_ref(<shared-ref>)': 
-	SHA1=`git rev-parse main` &&
-	echo "$SHA1 refs/heads/main 0x0" >expected &&
-	$RWT resolve-ref refs/heads/main 0 >actual &&
-	test_cmp expected actual &&
-	$RMAIN resolve-ref refs/heads/main 0 >actual &&
-	test_cmp expected actual
-
-ok 2 - resolve_ref(<shared-ref>)
-
-expecting success of 1407.3 'resolve_ref(<per-worktree-ref>)': 
-	SHA1=`git -C wt rev-parse HEAD` &&
-	echo "$SHA1 refs/heads/wt-main 0x1" >expected &&
-	$RWT resolve-ref HEAD 0 >actual &&
-	test_cmp expected actual &&
-
-	SHA1=`git rev-parse HEAD` &&
-	echo "$SHA1 refs/heads/main 0x1" >expected &&
-	$RMAIN resolve-ref HEAD 0 >actual &&
-	test_cmp expected actual
-
-ok 3 - resolve_ref(<per-worktree-ref>)
-
-expecting success of 1407.4 'create_symref(FOO, refs/heads/main)': 
-	$RWT create-symref FOO refs/heads/main nothing &&
-	echo refs/heads/main >expected &&
-	git -C wt symbolic-ref FOO >actual &&
-	test_cmp expected actual &&
-
-	$RMAIN create-symref FOO refs/heads/wt-main nothing &&
-	echo refs/heads/wt-main >expected &&
-	git symbolic-ref FOO >actual &&
-	test_cmp expected actual
-
-ok 4 - create_symref(FOO, refs/heads/main)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1408-packed-refs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1408-packed-refs/.git/
 expecting success of 1408.1 'setup': 
@@ -60718,6 +60721,57 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1418-reflog-exists.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1415-worktree-refs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1415-worktree-refs/.git/
 expecting success of 1415.1 'setup': 
@@ -60883,57 +60937,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1418-reflog-exists.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1416-ref-transaction-hooks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1416-ref-transaction-hooks/.git/
 expecting success of 1416.1 'setup': 
@@ -61175,6 +61178,51 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1420-lost-found.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1420-lost-found/.git/
+expecting success of 1420.1 'setup': 
+	git config core.logAllRefUpdates 0 &&
+	: > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m initial &&
+	echo 1 > file1 &&
+	echo 2 > file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m second &&
+	echo 3 > file3 &&
+	git add file3
+
+[master (root-commit) 9bb1ae9] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+[master 8ad33be] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file2
+ok 1 - setup
+
+expecting success of 1420.2 'lost and found something': 
+	git rev-parse HEAD > lost-commit &&
+	git rev-parse :file3 > lost-other &&
+	test_tick &&
+	git reset --hard HEAD^ &&
+	git fsck --lost-found &&
+	test 2 = $(ls .git/lost-found/*/* | wc -l) &&
+	test -f .git/lost-found/commit/$(cat lost-commit) &&
+	test -f .git/lost-found/other/$(cat lost-other)
+
+HEAD is now at 9bb1ae9 initial
+dangling blob 00750edc07d6415dcc07ae0351e9397b0222b7ba
+dangling commit 8ad33beea8de8e15812274614acd0a26d73b60f8
+ok 2 - lost and found something
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1419-exclude-refs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1419-exclude-refs/.git/
 expecting success of 1419.1 'setup': 
@@ -61316,51 +61364,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1420-lost-found.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1420-lost-found/.git/
-expecting success of 1420.1 'setup': 
-	git config core.logAllRefUpdates 0 &&
-	: > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m initial &&
-	echo 1 > file1 &&
-	echo 2 > file2 &&
-	git add file1 file2 &&
-	test_tick &&
-	git commit -m second &&
-	echo 3 > file3 &&
-	git add file3
-
-[master (root-commit) 9bb1ae9] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-[master 8ad33be] second
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file2
-ok 1 - setup
-
-expecting success of 1420.2 'lost and found something': 
-	git rev-parse HEAD > lost-commit &&
-	git rev-parse :file3 > lost-other &&
-	test_tick &&
-	git reset --hard HEAD^ &&
-	git fsck --lost-found &&
-	test 2 = $(ls .git/lost-found/*/* | wc -l) &&
-	test -f .git/lost-found/commit/$(cat lost-commit) &&
-	test -f .git/lost-found/other/$(cat lost-other)
-
-HEAD is now at 9bb1ae9 initial
-dangling blob 00750edc07d6415dcc07ae0351e9397b0222b7ba
-dangling commit 8ad33beea8de8e15812274614acd0a26d73b60f8
-ok 2 - lost and found something
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1417-reflog-updateref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1417-reflog-updateref/.git/
 expecting success of 1417.1 'setup': 
@@ -62551,7 +62554,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Branch name doesn't conform to GIT standards: .badbranchname
-fast-import: dumping crash report to .git/fast_import_crash_375506
+fast-import: dumping crash report to .git/fast_import_crash_1671074
 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"': 
@@ -62569,7 +62572,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Branch name doesn't conform to GIT standards: bad[branch]name
-fast-import: dumping crash report to .git/fast_import_crash_375605
+fast-import: dumping crash report to .git/fast_import_crash_1671131
 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': 
@@ -64346,517 +64349,169 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1501-work-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t1503-rev-parse-verify.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1503-rev-parse-verify/.git/
+expecting success of 1503.1 'set up basic repo with 1 file (hello) and 4 commits': 
+	add_line_into_file "1: Hello World" hello &&
+	HASH1=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "2: A new day for git" hello &&
+	HASH2=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "3: Another new day for git" hello &&
+	HASH3=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "4: Ciao for now" hello &&
+	HASH4=$(git rev-parse --verify HEAD)
 
-ok 1 - setup
+ok 1 - set up basic repo with 1 file (hello) and 4 commits
 
-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
-
-expecting success of 1501.10 'inside work tree': 
-	(
-		cd work &&
-		test_rev_parse false false true ""
-	)
-
-'actual.prefix' is not empty, it contains:
-
-ok 10 - inside work tree
-
-expecting success of 1501.11 'subdir of work tree': 
-	(
-		cd work/sub/dir &&
-		test_rev_parse false false true sub/dir/
-	)
-
-ok 11 - subdir of work tree
-
-expecting success of 1501.12 'setup: GIT_WORK_TREE=relative (override core.worktree)': 
-	GIT_DIR=$(pwd)/repo.git &&
-	GIT_CONFIG=$GIT_DIR/config &&
-	git config core.worktree non-existent &&
-	GIT_WORK_TREE=work &&
-	export GIT_DIR GIT_CONFIG GIT_WORK_TREE
-
-ok 12 - setup: GIT_WORK_TREE=relative (override core.worktree)
-
-expecting success of 1501.13 'outside': 
-	test_rev_parse false false false &&
-	(
-		cd work2 &&
-		test_rev_parse false false false
-	)
-
-ok 13 - outside
-
-expecting success of 1501.14 'inside work tree': 
-	(
-		cd work &&
-		GIT_WORK_TREE=. &&
-		test_rev_parse false false true ""
-	)
-
-'actual.prefix' is not empty, it contains:
-
-ok 14 - inside work tree
-
-expecting success of 1501.15 'subdir of work tree': 
-	(
-		cd work/sub/dir &&
-		GIT_WORK_TREE=../.. &&
-		test_rev_parse false false true sub/dir/
-	)
-
-ok 15 - subdir of work tree
-
-expecting success of 1501.16 'setup: GIT_WORK_TREE=absolute, below git dir': 
-	mv work repo.git/work &&
-	mv work2 repo.git/work2 &&
-	GIT_DIR=$(pwd)/repo.git &&
-	GIT_CONFIG=$GIT_DIR/config &&
-	GIT_WORK_TREE=$(pwd)/repo.git/work &&
-	export GIT_DIR GIT_CONFIG GIT_WORK_TREE
-
-ok 16 - setup: GIT_WORK_TREE=absolute, below git dir
-
-expecting success of 1501.17 'outside': 
-	echo outside &&
-	test_rev_parse false false false
-
-outside
-ok 17 - outside
-
-expecting success of 1501.18 'in repo.git': 
-	(
-		cd repo.git &&
-		test_rev_parse false true false
-	) &&
-	(
-		cd repo.git/objects &&
-		test_rev_parse false true false
-	) &&
-	(
-		cd repo.git/work2 &&
-		test_rev_parse false true false
-	)
-
-ok 18 - in repo.git
-
-expecting success of 1501.19 'inside work tree': 
-	(
-		cd repo.git/work &&
-		test_rev_parse false true true ""
-	)
-
-'actual.prefix' is not empty, it contains:
-
-ok 19 - inside work tree
-
-expecting success of 1501.20 'subdir of work tree': 
-	(
-		cd repo.git/work/sub/dir &&
-		test_rev_parse false true true sub/dir/
-	)
-
-ok 20 - subdir of work tree
-
-expecting success of 1501.21 'find work tree from repo': 
-	echo sub/dir/untracked >expected &&
-	cat <<-\EOF >repo.git/work/.gitignore &&
-	expected.*
-	actual.*
-	.gitignore
-	EOF
-	>repo.git/work/sub/dir/untracked &&
-	(
-		cd repo.git &&
-		git ls-files --others --exclude-standard >../actual
-	) &&
-	test_cmp expected actual
-
-ok 21 - find work tree from repo
-
-expecting success of 1501.22 'find work tree from work tree': 
-	echo sub/dir/tracked >expected &&
-	>repo.git/work/sub/dir/tracked &&
-	(
-		cd repo.git/work/sub/dir &&
-		git --git-dir=../../.. add tracked
-	) &&
-	(
-		cd repo.git &&
-		git ls-files >../actual
-	) &&
-	test_cmp expected actual
-
-ok 22 - find work tree from work tree
-
-expecting success of 1501.23 '_gently() groks relative GIT_DIR & GIT_WORK_TREE': 
-	(
-		cd repo.git/work/sub/dir &&
-		GIT_DIR=../../.. &&
-		GIT_WORK_TREE=../.. &&
-		GIT_PAGER= &&
-		export GIT_DIR GIT_WORK_TREE GIT_PAGER &&
-
-		git diff --exit-code tracked &&
-		echo changed >tracked &&
-		test_must_fail git diff --exit-code tracked
-	)
-
-diff --git a/sub/dir/tracked b/sub/dir/tracked
-index e69de29..5ea2ed4 100644
---- a/sub/dir/tracked
-+++ b/sub/dir/tracked
-@@ -0,0 +1 @@
-+changed
-ok 23 - _gently() groks relative GIT_DIR & GIT_WORK_TREE
-
-expecting success of 1501.24 'diff-index respects work tree under .git dir': 
-	cat >diff-index-cached.expected <<-EOF &&
-	:000000 100644 $ZERO_OID $EMPTY_BLOB A	sub/dir/tracked
-	EOF
-	cat >diff-index.expected <<-EOF &&
-	:000000 100644 $ZERO_OID $ZERO_OID A	sub/dir/tracked
-	EOF
-
-	(
-		GIT_DIR=repo.git &&
-		GIT_WORK_TREE=repo.git/work &&
-		export GIT_DIR GIT_WORK_TREE &&
-		git diff-index $EMPTY_TREE >diff-index.actual &&
-		git diff-index --cached $EMPTY_TREE >diff-index-cached.actual
-	) &&
-	test_cmp diff-index.expected diff-index.actual &&
-	test_cmp diff-index-cached.expected diff-index-cached.actual
-
-ok 24 - diff-index respects work tree under .git dir
-
-expecting success of 1501.25 'diff-files respects work tree under .git dir': 
-	cat >diff-files.expected <<-EOF &&
-	:100644 100644 $EMPTY_BLOB $ZERO_OID M	sub/dir/tracked
-	EOF
-
-	(
-		GIT_DIR=repo.git &&
-		GIT_WORK_TREE=repo.git/work &&
-		export GIT_DIR GIT_WORK_TREE &&
-		git diff-files >diff-files.actual
-	) &&
-	test_cmp diff-files.expected diff-files.actual
-
-ok 25 - diff-files respects work tree under .git dir
-
-expecting success of 1501.26 'git diff respects work tree under .git dir': 
-	cat >diff-TREE.expected <<-EOF &&
-	diff --git a/sub/dir/tracked b/sub/dir/tracked
-	new file mode 100644
-	index 0000000..$CHANGED_BLOB7
-	--- /dev/null
-	+++ b/sub/dir/tracked
-	@@ -0,0 +1 @@
-	+changed
-	EOF
-	cat >diff-TREE-cached.expected <<-EOF &&
-	diff --git a/sub/dir/tracked b/sub/dir/tracked
-	new file mode 100644
-	index 0000000..$EMPTY_BLOB7
-	EOF
-	cat >diff-FILES.expected <<-EOF &&
-	diff --git a/sub/dir/tracked b/sub/dir/tracked
-	index $EMPTY_BLOB7..$CHANGED_BLOB7 100644
-	--- a/sub/dir/tracked
-	+++ b/sub/dir/tracked
-	@@ -0,0 +1 @@
-	+changed
-	EOF
-
-	(
-		GIT_DIR=repo.git &&
-		GIT_WORK_TREE=repo.git/work &&
-		export GIT_DIR GIT_WORK_TREE &&
-		git diff $EMPTY_TREE >diff-TREE.actual &&
-		git diff --cached $EMPTY_TREE >diff-TREE-cached.actual &&
-		git diff >diff-FILES.actual
-	) &&
-	test_cmp diff-TREE.expected diff-TREE.actual &&
-	test_cmp diff-TREE-cached.expected diff-TREE-cached.actual &&
-	test_cmp diff-FILES.expected diff-FILES.actual
-
-ok 26 - git diff respects work tree under .git dir
-
-expecting success of 1501.27 'git grep': 
-	echo dir/tracked >expected.grep &&
-	(
-		cd repo.git/work/sub &&
-		GIT_DIR=../.. &&
-		GIT_WORK_TREE=.. &&
-		export GIT_DIR GIT_WORK_TREE &&
-		git grep -l changed >../../../actual.grep
-	) &&
-	test_cmp expected.grep actual.grep
-
-ok 27 - git grep
-
-expecting success of 1501.28 'git commit': 
-	(
-		cd repo.git &&
-		GIT_DIR=. GIT_WORK_TREE=work git commit -a -m done
-	)
-
-[master (root-commit) 271ed29] done
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/dir/tracked
-ok 28 - git commit
-
-expecting success of 1501.29 'absolute pathspec should fail gracefully': 
-	(
-		cd repo.git &&
-		test_might_fail git config --unset core.worktree &&
-		test_must_fail git log HEAD -- /home
-	)
-
-fatal: /home: '/home' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t1501-work-tree/repo.git/work'
-ok 29 - absolute pathspec should fail gracefully
-
-expecting success of 1501.30 'make_relative_path handles double slashes in GIT_DIR': 
-	>dummy_file &&
-	echo git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file &&
-	git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file
+expecting success of 1503.2 'works with one good rev': 
+	rev_hash1=$(git rev-parse --verify $HASH1) &&
+	test "$rev_hash1" = "$HASH1" &&
+	rev_hash2=$(git rev-parse --verify $HASH2) &&
+	test "$rev_hash2" = "$HASH2" &&
+	rev_hash3=$(git rev-parse --verify $HASH3) &&
+	test "$rev_hash3" = "$HASH3" &&
+	rev_hash4=$(git rev-parse --verify $HASH4) &&
+	test "$rev_hash4" = "$HASH4" &&
+	rev_main=$(git rev-parse --verify main) &&
+	test "$rev_main" = "$HASH4" &&
+	rev_head=$(git rev-parse --verify HEAD) &&
+	test "$rev_head" = "$HASH4"
 
-git --git-dir=/build/reproducible-path/git-2.47.2/t/trash directory.t1501-work-tree//repo.git --work-tree=/build/reproducible-path/git-2.47.2/t/trash directory.t1501-work-tree add dummy_file
-ok 30 - make_relative_path handles double slashes in GIT_DIR
+ok 2 - works with one good rev
 
-expecting success of 1501.31 'relative $GIT_WORK_TREE and git subprocesses': 
-	GIT_DIR=repo.git GIT_WORK_TREE=repo.git/work \
-	test-tool subprocess --setup-work-tree rev-parse --show-toplevel >actual &&
-	echo "$(pwd)/repo.git/work" >expected &&
-	test_cmp expected actual
+expecting success of 1503.3 'fails with any bad rev or many good revs': 
+	test_must_fail git rev-parse --verify 2>error &&
+	grep "single revision" error &&
+	test_must_fail git rev-parse --verify foo 2>error &&
+	grep "single revision" error &&
+	test_must_fail git rev-parse --verify HEAD bar 2>error &&
+	grep "single revision" error &&
+	test_must_fail git rev-parse --verify baz HEAD 2>error &&
+	grep "single revision" error &&
+	test_must_fail git rev-parse --verify $HASH2 HEAD 2>error &&
+	grep "single revision" error
 
-ok 31 - relative $GIT_WORK_TREE and git subprocesses
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 3 - fails with any bad rev or many good revs
 
-expecting success of 1501.32 'Multi-worktree setup': 
-	mkdir work &&
-	mkdir -p repo.git/repos/foo &&
-	cp repo.git/HEAD repo.git/index repo.git/repos/foo &&
-	{ cp repo.git/sharedindex.* repo.git/repos/foo || :; } &&
-	sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE
+expecting success of 1503.4 'fails silently when using -q': 
+	test_must_fail git rev-parse --verify --quiet 2>error &&
+	test_must_be_empty error &&
+	test_must_fail git rev-parse -q --verify foo 2>error &&
+	test_must_be_empty error &&
+	test_must_fail git rev-parse --verify -q HEAD bar 2>error &&
+	test_must_be_empty error &&
+	test_must_fail git rev-parse --quiet --verify baz HEAD 2>error &&
+	test_must_be_empty error &&
+	test_must_fail git rev-parse -q --verify $HASH2 HEAD 2>error &&
+	test_must_be_empty error
 
-cp: cannot stat 'repo.git/sharedindex.*': No such file or directory
-ok 32 - Multi-worktree setup
+ok 4 - fails silently when using -q
 
-expecting success of 1501.33 'GIT_DIR set (1)': 
-	echo "gitdir: repo.git/repos/foo" >gitfile &&
-	echo ../.. >repo.git/repos/foo/commondir &&
-	(
-		cd work &&
-		GIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&
-		test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
-		test_cmp expect actual
-	)
+expecting success of 1503.5 'fails silently when using -q with deleted reflogs': 
+	ref=$(git rev-parse HEAD) &&
+	git update-ref --create-reflog -m "message for refs/test" refs/test "$ref" &&
+	git reflog delete --updateref --rewrite refs/test@{1} &&
+	test_must_fail git rev-parse -q --verify refs/test@{1} >error 2>&1 &&
+	test_must_be_empty error
 
-ok 33 - GIT_DIR set (1)
+ok 5 - fails silently when using -q with deleted reflogs
 
-expecting success of 1501.34 'GIT_DIR set (2)': 
-	echo "gitdir: repo.git/repos/foo" >gitfile &&
-	echo "$(pwd)/repo.git" >repo.git/repos/foo/commondir &&
-	(
-		cd work &&
-		GIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&
-		test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
-		test_cmp expect actual
-	)
+expecting success of 1503.6 'fails silently when using -q with not enough reflogs': 
+	ref=$(git rev-parse HEAD) &&
+	git update-ref --create-reflog -m "message for refs/test2" refs/test2 "$ref" &&
+	test_must_fail git rev-parse -q --verify refs/test2@{999} >error 2>&1 &&
+	test_must_be_empty error
 
-ok 34 - GIT_DIR set (2)
+ok 6 - fails silently when using -q with not enough reflogs
 
-expecting success of 1501.35 'Auto discovery': 
-	echo "gitdir: repo.git/repos/foo" >.git &&
-	echo ../.. >repo.git/repos/foo/commondir &&
-	(
-		cd work &&
-		git rev-parse --git-common-dir >actual &&
-		test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
-		test_cmp expect actual &&
-		echo haha >data1 &&
-		git add data1 &&
-		git ls-files --full-name :/ | grep data1 >actual &&
-		echo work/data1 >expect &&
-		test_cmp expect actual
-	)
+expecting success of 1503.7 'succeeds silently with -q and reflogs that do not go far back enough in time': 
+	ref=$(git rev-parse HEAD) &&
+	git update-ref --create-reflog -m "message for refs/test3" refs/test3 "$ref" &&
+	git rev-parse -q --verify refs/test3@{1.year.ago} >actual 2>error &&
+	test_must_be_empty error &&
+	echo "$ref" >expect &&
+	test_cmp expect actual
 
-ok 35 - Auto discovery
+ok 7 - succeeds silently with -q and reflogs that do not go far back enough in time
 
-expecting success of 1501.36 '$GIT_DIR/common overrides core.worktree': 
-	mkdir elsewhere &&
-	git --git-dir=repo.git config core.worktree "$TRASH_DIRECTORY/elsewhere" &&
-	echo "gitdir: repo.git/repos/foo" >.git &&
-	echo ../.. >repo.git/repos/foo/commondir &&
-	(
-		cd work &&
-		git rev-parse --git-common-dir >actual &&
-		test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
-		test_cmp expect actual &&
-		echo haha >data2 &&
-		git add data2 &&
-		git ls-files --full-name :/ | grep data2 >actual &&
-		echo work/data2 >expect &&
-		test_cmp expect actual
-	)
+expecting success of 1503.8 'no stdout output on error': 
+	test -z "$(git rev-parse --verify)" &&
+	test -z "$(git rev-parse --verify foo)" &&
+	test -z "$(git rev-parse --verify baz HEAD)" &&
+	test -z "$(git rev-parse --verify HEAD bar)" &&
+	test -z "$(git rev-parse --verify $HASH2 HEAD)"
 
-ok 36 - $GIT_DIR/common overrides core.worktree
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 8 - no stdout output on error
 
-expecting success of 1501.37 '$GIT_WORK_TREE overrides $GIT_DIR/common': 
-	echo "gitdir: repo.git/repos/foo" >.git &&
-	echo ../.. >repo.git/repos/foo/commondir &&
-	(
-		cd work &&
-		echo haha >data3 &&
-		git --git-dir=../.git --work-tree=. add data3 &&
-		git ls-files --full-name -- :/ | grep data3 >actual &&
-		echo data3 >expect &&
-		test_cmp expect actual
-	)
+expecting success of 1503.9 'use --default': 
+	git rev-parse --verify --default main &&
+	git rev-parse --verify --default main HEAD &&
+	git rev-parse --default main --verify &&
+	git rev-parse --default main --verify HEAD &&
+	git rev-parse --verify HEAD --default main &&
+	test_must_fail git rev-parse --verify foo --default main &&
+	test_must_fail git rev-parse --default HEAD --verify bar &&
+	test_must_fail git rev-parse --verify --default HEAD baz &&
+	test_must_fail git rev-parse --default foo --verify &&
+	test_must_fail git rev-parse --verify --default bar
 
-ok 37 - $GIT_WORK_TREE overrides $GIT_DIR/common
+32a594a3fdac2d57cf6d02987e30eec68511498c
+32a594a3fdac2d57cf6d02987e30eec68511498c
+32a594a3fdac2d57cf6d02987e30eec68511498c
+32a594a3fdac2d57cf6d02987e30eec68511498c
+32a594a3fdac2d57cf6d02987e30eec68511498c
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 9 - use --default
 
-expecting success of 1501.38 'error out gracefully on invalid $GIT_WORK_TREE': 
-	(
-		GIT_WORK_TREE=/.invalid/work/tree &&
-		export GIT_WORK_TREE &&
-		test_expect_code 128 git rev-parse
-	)
+expecting success of 1503.10 'main@{n} for various n': 
+	git reflog >out &&
+	N=$(wc -l <out) &&
+	Nm1=$(($N-1)) &&
+	Np1=$(($N+1)) &&
+	git rev-parse --verify main@{0} &&
+	git rev-parse --verify main@{1} &&
+	git rev-parse --verify main@{$Nm1} &&
+	test_must_fail git rev-parse --verify main@{$N} &&
+	test_must_fail git rev-parse --verify main@{$Np1}
 
-fatal: Invalid path '/.invalid': No such file or directory
-ok 38 - error out gracefully on invalid $GIT_WORK_TREE
+32a594a3fdac2d57cf6d02987e30eec68511498c
+3de952f2416b6084f557ec417709eac740c6818c
+88bcdc1839f0ad191ffdd65cae2a2a862d682151
+fatal: log for 'main' only has 4 entries
+fatal: log for 'main' only has 4 entries
+ok 10 - main@{n} for various n
 
-expecting success of 1501.39 'refs work with relative gitdir and work tree': 
-	git init relative &&
-	git -C relative commit --allow-empty -m one &&
-	git -C relative commit --allow-empty -m two &&
+expecting success of 1503.11 'options can appear after --verify': 
+	git rev-parse --verify HEAD >expect &&
+	git rev-parse --verify -q HEAD >actual &&
+	test_cmp expect actual
 
-	GIT_DIR=relative/.git GIT_WORK_TREE=relative git reset HEAD^ &&
+ok 11 - options can appear after --verify
 
-	git -C relative log -1 --format=%s >actual &&
-	echo one >expect &&
+expecting success of 1503.12 'verify respects --end-of-options': 
+	git update-ref refs/heads/-tricky HEAD &&
+	git rev-parse --verify HEAD >expect &&
+	git rev-parse --verify --end-of-options -tricky >actual &&
 	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1501-work-tree/relative/.git/
-[master (root-commit) 61ba98b] one
- Author: A U Thor <author@example.com>
-[master 2b4e70d] two
- Author: A U Thor <author@example.com>
-ok 39 - refs work with relative gitdir and work tree
+ok 12 - verify respects --end-of-options
 
-# passed all 39 test(s)
-1..39
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1460-refs-migrate.sh ***
@@ -65097,7 +64752,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.JxiIuW'
+Finished dry-run migration of refs, the result can be found at '.git/ref_migration.O14GRs'
 ok 16 - files -> reftable: dry-run migration does not modify repository
 
 expecting success of 1460.17 'reftable: migration to same format fails': 
@@ -65292,7 +64947,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.TmA1RV'
+Finished dry-run migration of refs, the result can be found at '.git/ref_migration.9EDyDW'
 ok 28 - reftable -> files: dry-run migration does not modify repository
 
 expecting success of 1460.29 'migrating from files format deletes backend files': 
@@ -65356,169 +65011,517 @@
 1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1503-rev-parse-verify.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1503-rev-parse-verify/.git/
-expecting success of 1503.1 'set up basic repo with 1 file (hello) and 4 commits': 
-	add_line_into_file "1: Hello World" hello &&
-	HASH1=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "2: A new day for git" hello &&
-	HASH2=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "3: Another new day for git" hello &&
-	HASH3=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "4: Ciao for now" hello &&
-	HASH4=$(git rev-parse --verify HEAD)
+*** t1501-work-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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/") &&
 
-ok 1 - set up basic repo with 1 file (hello) and 4 commits
+	mkdir -p work/sub/dir &&
+	mkdir -p work2 &&
+	mv .git repo.git
 
-expecting success of 1503.2 'works with one good rev': 
-	rev_hash1=$(git rev-parse --verify $HASH1) &&
-	test "$rev_hash1" = "$HASH1" &&
-	rev_hash2=$(git rev-parse --verify $HASH2) &&
-	test "$rev_hash2" = "$HASH2" &&
-	rev_hash3=$(git rev-parse --verify $HASH3) &&
-	test "$rev_hash3" = "$HASH3" &&
-	rev_hash4=$(git rev-parse --verify $HASH4) &&
-	test "$rev_hash4" = "$HASH4" &&
-	rev_main=$(git rev-parse --verify main) &&
-	test "$rev_main" = "$HASH4" &&
-	rev_head=$(git rev-parse --verify HEAD) &&
-	test "$rev_head" = "$HASH4"
+ok 1 - setup
 
-ok 2 - works with one good rev
+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 1503.3 'fails with any bad rev or many good revs': 
-	test_must_fail git rev-parse --verify 2>error &&
-	grep "single revision" error &&
-	test_must_fail git rev-parse --verify foo 2>error &&
-	grep "single revision" error &&
-	test_must_fail git rev-parse --verify HEAD bar 2>error &&
-	grep "single revision" error &&
-	test_must_fail git rev-parse --verify baz HEAD 2>error &&
-	grep "single revision" error &&
-	test_must_fail git rev-parse --verify $HASH2 HEAD 2>error &&
-	grep "single revision" error
+		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 &&
 
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 3 - fails with any bad rev or many good revs
+		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
+	}
 
-expecting success of 1503.4 'fails silently when using -q': 
-	test_must_fail git rev-parse --verify --quiet 2>error &&
-	test_must_be_empty error &&
-	test_must_fail git rev-parse -q --verify foo 2>error &&
-	test_must_be_empty error &&
-	test_must_fail git rev-parse --verify -q HEAD bar 2>error &&
-	test_must_be_empty error &&
-	test_must_fail git rev-parse --quiet --verify baz HEAD 2>error &&
-	test_must_be_empty error &&
-	test_must_fail git rev-parse -q --verify $HASH2 HEAD 2>error &&
-	test_must_be_empty error
+ok 2 - setup: helper for testing rev-parse
 
-ok 4 - fails silently when using -q
+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
 
-expecting success of 1503.5 'fails silently when using -q with deleted reflogs': 
-	ref=$(git rev-parse HEAD) &&
-	git update-ref --create-reflog -m "message for refs/test" refs/test "$ref" &&
-	git reflog delete --updateref --rewrite refs/test@{1} &&
-	test_must_fail git rev-parse -q --verify refs/test@{1} >error 2>&1 &&
-	test_must_be_empty error
+ok 3 - setup: core.worktree = relative path
 
-ok 5 - fails silently when using -q with deleted reflogs
+expecting success of 1501.4 'outside': 
+	test_rev_parse false false false
 
-expecting success of 1503.6 'fails silently when using -q with not enough reflogs': 
-	ref=$(git rev-parse HEAD) &&
-	git update-ref --create-reflog -m "message for refs/test2" refs/test2 "$ref" &&
-	test_must_fail git rev-parse -q --verify refs/test2@{999} >error 2>&1 &&
-	test_must_be_empty error
+ok 4 - outside
 
-ok 6 - fails silently when using -q with not enough reflogs
+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 ""
+	)
 
-expecting success of 1503.7 'succeeds silently with -q and reflogs that do not go far back enough in time': 
-	ref=$(git rev-parse HEAD) &&
-	git update-ref --create-reflog -m "message for refs/test3" refs/test3 "$ref" &&
-	git rev-parse -q --verify refs/test3@{1.year.ago} >actual 2>error &&
-	test_must_be_empty error &&
-	echo "$ref" >expect &&
-	test_cmp expect actual
+'actual.prefix' is not empty, it contains:
 
-ok 7 - succeeds silently with -q and reflogs that do not go far back enough in time
+ok 5 - inside work tree
 
-expecting success of 1503.8 'no stdout output on error': 
-	test -z "$(git rev-parse --verify)" &&
-	test -z "$(git rev-parse --verify foo)" &&
-	test -z "$(git rev-parse --verify baz HEAD)" &&
-	test -z "$(git rev-parse --verify HEAD bar)" &&
-	test -z "$(git rev-parse --verify $HASH2 HEAD)"
+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
 
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 8 - no stdout output on error
+ok 6 - empty prefix is actually written out
 
-expecting success of 1503.9 'use --default': 
-	git rev-parse --verify --default main &&
-	git rev-parse --verify --default main HEAD &&
-	git rev-parse --default main --verify &&
-	git rev-parse --default main --verify HEAD &&
-	git rev-parse --verify HEAD --default main &&
-	test_must_fail git rev-parse --verify foo --default main &&
-	test_must_fail git rev-parse --default HEAD --verify bar &&
-	test_must_fail git rev-parse --verify --default HEAD baz &&
-	test_must_fail git rev-parse --default foo --verify &&
-	test_must_fail git rev-parse --verify --default bar
+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/
+	)
 
-32a594a3fdac2d57cf6d02987e30eec68511498c
-32a594a3fdac2d57cf6d02987e30eec68511498c
-32a594a3fdac2d57cf6d02987e30eec68511498c
-32a594a3fdac2d57cf6d02987e30eec68511498c
-32a594a3fdac2d57cf6d02987e30eec68511498c
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 9 - use --default
+ok 7 - subdir of work tree
 
-expecting success of 1503.10 'main@{n} for various n': 
-	git reflog >out &&
-	N=$(wc -l <out) &&
-	Nm1=$(($N-1)) &&
-	Np1=$(($N+1)) &&
-	git rev-parse --verify main@{0} &&
-	git rev-parse --verify main@{1} &&
-	git rev-parse --verify main@{$Nm1} &&
-	test_must_fail git rev-parse --verify main@{$N} &&
-	test_must_fail git rev-parse --verify main@{$Np1}
+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"
 
-32a594a3fdac2d57cf6d02987e30eec68511498c
-3de952f2416b6084f557ec417709eac740c6818c
-88bcdc1839f0ad191ffdd65cae2a2a862d682151
-fatal: log for 'main' only has 4 entries
-fatal: log for 'main' only has 4 entries
-ok 10 - main@{n} for various n
+ok 8 - setup: core.worktree = absolute path
 
-expecting success of 1503.11 'options can appear after --verify': 
-	git rev-parse --verify HEAD >expect &&
-	git rev-parse --verify -q HEAD >actual &&
-	test_cmp expect actual
+expecting success of 1501.9 'outside': 
+	test_rev_parse false false false &&
+	(
+		cd work2 &&
+		test_rev_parse false false false
+	)
 
-ok 11 - options can appear after --verify
+ok 9 - outside
 
-expecting success of 1503.12 'verify respects --end-of-options': 
-	git update-ref refs/heads/-tricky HEAD &&
-	git rev-parse --verify HEAD >expect &&
-	git rev-parse --verify --end-of-options -tricky >actual &&
+expecting success of 1501.10 'inside work tree': 
+	(
+		cd work &&
+		test_rev_parse false false true ""
+	)
+
+'actual.prefix' is not empty, it contains:
+
+ok 10 - inside work tree
+
+expecting success of 1501.11 'subdir of work tree': 
+	(
+		cd work/sub/dir &&
+		test_rev_parse false false true sub/dir/
+	)
+
+ok 11 - subdir of work tree
+
+expecting success of 1501.12 'setup: GIT_WORK_TREE=relative (override core.worktree)': 
+	GIT_DIR=$(pwd)/repo.git &&
+	GIT_CONFIG=$GIT_DIR/config &&
+	git config core.worktree non-existent &&
+	GIT_WORK_TREE=work &&
+	export GIT_DIR GIT_CONFIG GIT_WORK_TREE
+
+ok 12 - setup: GIT_WORK_TREE=relative (override core.worktree)
+
+expecting success of 1501.13 'outside': 
+	test_rev_parse false false false &&
+	(
+		cd work2 &&
+		test_rev_parse false false false
+	)
+
+ok 13 - outside
+
+expecting success of 1501.14 'inside work tree': 
+	(
+		cd work &&
+		GIT_WORK_TREE=. &&
+		test_rev_parse false false true ""
+	)
+
+'actual.prefix' is not empty, it contains:
+
+ok 14 - inside work tree
+
+expecting success of 1501.15 'subdir of work tree': 
+	(
+		cd work/sub/dir &&
+		GIT_WORK_TREE=../.. &&
+		test_rev_parse false false true sub/dir/
+	)
+
+ok 15 - subdir of work tree
+
+expecting success of 1501.16 'setup: GIT_WORK_TREE=absolute, below git dir': 
+	mv work repo.git/work &&
+	mv work2 repo.git/work2 &&
+	GIT_DIR=$(pwd)/repo.git &&
+	GIT_CONFIG=$GIT_DIR/config &&
+	GIT_WORK_TREE=$(pwd)/repo.git/work &&
+	export GIT_DIR GIT_CONFIG GIT_WORK_TREE
+
+ok 16 - setup: GIT_WORK_TREE=absolute, below git dir
+
+expecting success of 1501.17 'outside': 
+	echo outside &&
+	test_rev_parse false false false
+
+outside
+ok 17 - outside
+
+expecting success of 1501.18 'in repo.git': 
+	(
+		cd repo.git &&
+		test_rev_parse false true false
+	) &&
+	(
+		cd repo.git/objects &&
+		test_rev_parse false true false
+	) &&
+	(
+		cd repo.git/work2 &&
+		test_rev_parse false true false
+	)
+
+ok 18 - in repo.git
+
+expecting success of 1501.19 'inside work tree': 
+	(
+		cd repo.git/work &&
+		test_rev_parse false true true ""
+	)
+
+'actual.prefix' is not empty, it contains:
+
+ok 19 - inside work tree
+
+expecting success of 1501.20 'subdir of work tree': 
+	(
+		cd repo.git/work/sub/dir &&
+		test_rev_parse false true true sub/dir/
+	)
+
+ok 20 - subdir of work tree
+
+expecting success of 1501.21 'find work tree from repo': 
+	echo sub/dir/untracked >expected &&
+	cat <<-\EOF >repo.git/work/.gitignore &&
+	expected.*
+	actual.*
+	.gitignore
+	EOF
+	>repo.git/work/sub/dir/untracked &&
+	(
+		cd repo.git &&
+		git ls-files --others --exclude-standard >../actual
+	) &&
+	test_cmp expected actual
+
+ok 21 - find work tree from repo
+
+expecting success of 1501.22 'find work tree from work tree': 
+	echo sub/dir/tracked >expected &&
+	>repo.git/work/sub/dir/tracked &&
+	(
+		cd repo.git/work/sub/dir &&
+		git --git-dir=../../.. add tracked
+	) &&
+	(
+		cd repo.git &&
+		git ls-files >../actual
+	) &&
+	test_cmp expected actual
+
+ok 22 - find work tree from work tree
+
+expecting success of 1501.23 '_gently() groks relative GIT_DIR & GIT_WORK_TREE': 
+	(
+		cd repo.git/work/sub/dir &&
+		GIT_DIR=../../.. &&
+		GIT_WORK_TREE=../.. &&
+		GIT_PAGER= &&
+		export GIT_DIR GIT_WORK_TREE GIT_PAGER &&
+
+		git diff --exit-code tracked &&
+		echo changed >tracked &&
+		test_must_fail git diff --exit-code tracked
+	)
+
+diff --git a/sub/dir/tracked b/sub/dir/tracked
+index e69de29..5ea2ed4 100644
+--- a/sub/dir/tracked
++++ b/sub/dir/tracked
+@@ -0,0 +1 @@
++changed
+ok 23 - _gently() groks relative GIT_DIR & GIT_WORK_TREE
+
+expecting success of 1501.24 'diff-index respects work tree under .git dir': 
+	cat >diff-index-cached.expected <<-EOF &&
+	:000000 100644 $ZERO_OID $EMPTY_BLOB A	sub/dir/tracked
+	EOF
+	cat >diff-index.expected <<-EOF &&
+	:000000 100644 $ZERO_OID $ZERO_OID A	sub/dir/tracked
+	EOF
+
+	(
+		GIT_DIR=repo.git &&
+		GIT_WORK_TREE=repo.git/work &&
+		export GIT_DIR GIT_WORK_TREE &&
+		git diff-index $EMPTY_TREE >diff-index.actual &&
+		git diff-index --cached $EMPTY_TREE >diff-index-cached.actual
+	) &&
+	test_cmp diff-index.expected diff-index.actual &&
+	test_cmp diff-index-cached.expected diff-index-cached.actual
+
+ok 24 - diff-index respects work tree under .git dir
+
+expecting success of 1501.25 'diff-files respects work tree under .git dir': 
+	cat >diff-files.expected <<-EOF &&
+	:100644 100644 $EMPTY_BLOB $ZERO_OID M	sub/dir/tracked
+	EOF
+
+	(
+		GIT_DIR=repo.git &&
+		GIT_WORK_TREE=repo.git/work &&
+		export GIT_DIR GIT_WORK_TREE &&
+		git diff-files >diff-files.actual
+	) &&
+	test_cmp diff-files.expected diff-files.actual
+
+ok 25 - diff-files respects work tree under .git dir
+
+expecting success of 1501.26 'git diff respects work tree under .git dir': 
+	cat >diff-TREE.expected <<-EOF &&
+	diff --git a/sub/dir/tracked b/sub/dir/tracked
+	new file mode 100644
+	index 0000000..$CHANGED_BLOB7
+	--- /dev/null
+	+++ b/sub/dir/tracked
+	@@ -0,0 +1 @@
+	+changed
+	EOF
+	cat >diff-TREE-cached.expected <<-EOF &&
+	diff --git a/sub/dir/tracked b/sub/dir/tracked
+	new file mode 100644
+	index 0000000..$EMPTY_BLOB7
+	EOF
+	cat >diff-FILES.expected <<-EOF &&
+	diff --git a/sub/dir/tracked b/sub/dir/tracked
+	index $EMPTY_BLOB7..$CHANGED_BLOB7 100644
+	--- a/sub/dir/tracked
+	+++ b/sub/dir/tracked
+	@@ -0,0 +1 @@
+	+changed
+	EOF
+
+	(
+		GIT_DIR=repo.git &&
+		GIT_WORK_TREE=repo.git/work &&
+		export GIT_DIR GIT_WORK_TREE &&
+		git diff $EMPTY_TREE >diff-TREE.actual &&
+		git diff --cached $EMPTY_TREE >diff-TREE-cached.actual &&
+		git diff >diff-FILES.actual
+	) &&
+	test_cmp diff-TREE.expected diff-TREE.actual &&
+	test_cmp diff-TREE-cached.expected diff-TREE-cached.actual &&
+	test_cmp diff-FILES.expected diff-FILES.actual
+
+ok 26 - git diff respects work tree under .git dir
+
+expecting success of 1501.27 'git grep': 
+	echo dir/tracked >expected.grep &&
+	(
+		cd repo.git/work/sub &&
+		GIT_DIR=../.. &&
+		GIT_WORK_TREE=.. &&
+		export GIT_DIR GIT_WORK_TREE &&
+		git grep -l changed >../../../actual.grep
+	) &&
+	test_cmp expected.grep actual.grep
+
+ok 27 - git grep
+
+expecting success of 1501.28 'git commit': 
+	(
+		cd repo.git &&
+		GIT_DIR=. GIT_WORK_TREE=work git commit -a -m done
+	)
+
+[master (root-commit) 271ed29] done
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/dir/tracked
+ok 28 - git commit
+
+expecting success of 1501.29 'absolute pathspec should fail gracefully': 
+	(
+		cd repo.git &&
+		test_might_fail git config --unset core.worktree &&
+		test_must_fail git log HEAD -- /home
+	)
+
+fatal: /home: '/home' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t1501-work-tree/repo.git/work'
+ok 29 - absolute pathspec should fail gracefully
+
+expecting success of 1501.30 'make_relative_path handles double slashes in GIT_DIR': 
+	>dummy_file &&
+	echo git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file &&
+	git --git-dir="$(pwd)//repo.git" --work-tree="$(pwd)" add dummy_file
+
+git --git-dir=/build/reproducible-path/git-2.47.2/t/trash directory.t1501-work-tree//repo.git --work-tree=/build/reproducible-path/git-2.47.2/t/trash directory.t1501-work-tree add dummy_file
+ok 30 - make_relative_path handles double slashes in GIT_DIR
+
+expecting success of 1501.31 'relative $GIT_WORK_TREE and git subprocesses': 
+	GIT_DIR=repo.git GIT_WORK_TREE=repo.git/work \
+	test-tool subprocess --setup-work-tree rev-parse --show-toplevel >actual &&
+	echo "$(pwd)/repo.git/work" >expected &&
+	test_cmp expected actual
+
+ok 31 - relative $GIT_WORK_TREE and git subprocesses
+
+expecting success of 1501.32 'Multi-worktree setup': 
+	mkdir work &&
+	mkdir -p repo.git/repos/foo &&
+	cp repo.git/HEAD repo.git/index repo.git/repos/foo &&
+	{ cp repo.git/sharedindex.* repo.git/repos/foo || :; } &&
+	sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE
+
+cp: cannot stat 'repo.git/sharedindex.*': No such file or directory
+ok 32 - Multi-worktree setup
+
+expecting success of 1501.33 'GIT_DIR set (1)': 
+	echo "gitdir: repo.git/repos/foo" >gitfile &&
+	echo ../.. >repo.git/repos/foo/commondir &&
+	(
+		cd work &&
+		GIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&
+		test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
+		test_cmp expect actual
+	)
+
+ok 33 - GIT_DIR set (1)
+
+expecting success of 1501.34 'GIT_DIR set (2)': 
+	echo "gitdir: repo.git/repos/foo" >gitfile &&
+	echo "$(pwd)/repo.git" >repo.git/repos/foo/commondir &&
+	(
+		cd work &&
+		GIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&
+		test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
+		test_cmp expect actual
+	)
+
+ok 34 - GIT_DIR set (2)
+
+expecting success of 1501.35 'Auto discovery': 
+	echo "gitdir: repo.git/repos/foo" >.git &&
+	echo ../.. >repo.git/repos/foo/commondir &&
+	(
+		cd work &&
+		git rev-parse --git-common-dir >actual &&
+		test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
+		test_cmp expect actual &&
+		echo haha >data1 &&
+		git add data1 &&
+		git ls-files --full-name :/ | grep data1 >actual &&
+		echo work/data1 >expect &&
+		test_cmp expect actual
+	)
+
+ok 35 - Auto discovery
+
+expecting success of 1501.36 '$GIT_DIR/common overrides core.worktree': 
+	mkdir elsewhere &&
+	git --git-dir=repo.git config core.worktree "$TRASH_DIRECTORY/elsewhere" &&
+	echo "gitdir: repo.git/repos/foo" >.git &&
+	echo ../.. >repo.git/repos/foo/commondir &&
+	(
+		cd work &&
+		git rev-parse --git-common-dir >actual &&
+		test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
+		test_cmp expect actual &&
+		echo haha >data2 &&
+		git add data2 &&
+		git ls-files --full-name :/ | grep data2 >actual &&
+		echo work/data2 >expect &&
+		test_cmp expect actual
+	)
+
+ok 36 - $GIT_DIR/common overrides core.worktree
+
+expecting success of 1501.37 '$GIT_WORK_TREE overrides $GIT_DIR/common': 
+	echo "gitdir: repo.git/repos/foo" >.git &&
+	echo ../.. >repo.git/repos/foo/commondir &&
+	(
+		cd work &&
+		echo haha >data3 &&
+		git --git-dir=../.git --work-tree=. add data3 &&
+		git ls-files --full-name -- :/ | grep data3 >actual &&
+		echo data3 >expect &&
+		test_cmp expect actual
+	)
+
+ok 37 - $GIT_WORK_TREE overrides $GIT_DIR/common
+
+expecting success of 1501.38 'error out gracefully on invalid $GIT_WORK_TREE': 
+	(
+		GIT_WORK_TREE=/.invalid/work/tree &&
+		export GIT_WORK_TREE &&
+		test_expect_code 128 git rev-parse
+	)
+
+fatal: Invalid path '/.invalid': No such file or directory
+ok 38 - error out gracefully on invalid $GIT_WORK_TREE
+
+expecting success of 1501.39 'refs work with relative gitdir and work tree': 
+	git init relative &&
+	git -C relative commit --allow-empty -m one &&
+	git -C relative commit --allow-empty -m two &&
+
+	GIT_DIR=relative/.git GIT_WORK_TREE=relative git reset HEAD^ &&
+
+	git -C relative log -1 --format=%s >actual &&
+	echo one >expect &&
 	test_cmp expect actual
 
-ok 12 - verify respects --end-of-options
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1501-work-tree/relative/.git/
+[master (root-commit) 61ba98b] one
+ Author: A U Thor <author@example.com>
+[master 2b4e70d] two
+ Author: A U Thor <author@example.com>
+ok 39 - refs work with relative gitdir and work tree
 
-# passed all 12 test(s)
-1..12
+# passed all 39 test(s)
+1..39
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1505-rev-parse-last.sh ***
@@ -67413,11 +67416,6 @@
 1..44
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1509-root-work-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1506-rev-parse-diagnosis.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1506-rev-parse-diagnosis/.git/
 expecting success of 1506.1 'set up basic repo': 
@@ -67771,6 +67769,11 @@
 1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1509-root-work-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1507-rev-parse-upstream.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1507-rev-parse-upstream/.git/
 expecting success of 1507.1 'setup': 
@@ -69173,743 +69176,6 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1512-rev-parse-disambiguation.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1512-rev-parse-disambiguation/.git/
-expecting success of 1512.1 'ambiguous blob output': 
-	git init --bare blob.prefix &&
-	(
-		cd blob.prefix &&
-
-		# Both start with "dead..", under both SHA-1 and SHA-256
-		echo brocdnra | git hash-object -w --stdin &&
-		echo brigddsv | git hash-object -w --stdin &&
-
-		# Both start with "beef.."
-		echo 1agllotbh | git hash-object -w --stdin &&
-		echo 1bbfctrkc | git hash-object -w --stdin
-	) &&
-
-	test_must_fail git -C blob.prefix rev-parse dead &&
-	test_cmp_failed_rev_parse blob.prefix beef <<-\EOF
-	error: short object ID beef... is ambiguous
-	hint: The candidates are:
-	hint:   beef... blob
-	hint:   beef... blob
-	fatal: ambiguous argument 'beef...': unknown revision or path not in the working tree.
-	Use '--' to separate paths from revisions, like this:
-	'git <command> [<revision>...] -- [<file>...]'
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1512-rev-parse-disambiguation/blob.prefix/
-dead7b21a85f6dc7a24cbc4bb04a008db70bc04a
-dead9d36640e108d9eb449ed5966fd0c6d4e6b7f
-beefc9be42a87abd92326257a995bf20a24c788f
-beef2b0b99a5a8a36d91ea9ecd766af6352eafd9
-error: short object ID dead is ambiguous
-hint: The candidates are:
-hint:   dead7b2 blob
-hint:   dead9d3 blob
-fatal: ambiguous argument 'dead': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-dead
-beef
-ok 1 - ambiguous blob output
-
-expecting success of 1512.2 'ambiguous loose bad object parsed as OBJ_BAD': 
-	git init --bare blob.bad &&
-	(
-		cd blob.bad &&
-
-		# Both have the prefix "bad0"
-		echo xyzfaowcoh | git hash-object -t bad -w --stdin --literally &&
-		echo xyzhjpyvwl | git hash-object -t bad -w --stdin --literally
-	) &&
-
-	test_cmp_failed_rev_parse blob.bad bad0 <<-\EOF
-	error: short object ID bad0... is ambiguous
-	fatal: invalid object type
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1512-rev-parse-disambiguation/blob.bad/
-bad0bd4672dee1b4d3b8088534ed5a0362bc8d59
-bad0853730d9d114ac789f0ce89039d224bf66c9
-ok 2 - ambiguous loose bad object parsed as OBJ_BAD
-
-expecting success of 1512.3 'ambigous zlib corrupt loose blob': 
-	git init --bare blob.corrupt &&
-	(
-		cd blob.corrupt &&
-
-		# Both have the prefix "cafe"
-		echo bnkxmdwz | git hash-object -w --stdin &&
-		oid=$(echo bmwsjxzi | git hash-object -w --stdin) &&
-
-		oidf=objects/$(test_oid_to_path "$oid") &&
-		chmod 755 $oidf &&
-		echo broken >$oidf
-	) &&
-
-	test_cmp_failed_rev_parse blob.corrupt cafe <<-\EOF
-	error: short object ID cafe... is ambiguous
-	error: inflate: data stream error (incorrect header check)
-	error: unable to unpack cafe... header
-	error: inflate: data stream error (incorrect header check)
-	error: unable to unpack cafe... header
-	hint: The candidates are:
-	hint:   cafe... [bad object]
-	hint:   cafe... blob
-	fatal: ambiguous argument 'cafe...': unknown revision or path not in the working tree.
-	Use '--' to separate paths from revisions, like this:
-	'git <command> [<revision>...] -- [<file>...]'
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1512-rev-parse-disambiguation/blob.corrupt/
-cafe3f2e27174acdf9aa3a394d73714cdcf533d9
-cafe
-ok 3 - ambigous zlib corrupt loose blob
-
-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 1512.4 'blob and tree': 
-	test_tick &&
-	(
-		test_write_lines 0 1 2 3 4 5 6 7 8 9 &&
-		echo &&
-		echo b1rwzyc3
-	) >a0blgqsjc &&
-
-	# create one blob 0000000000b36
-	git add a0blgqsjc &&
-
-	# create one tree 0000000000cdc
-	git write-tree
-
-0000000000cdcf04beb2fab69e65622616294984
-ok 4 - blob and tree
-
-expecting success of 1512.5 'warn ambiguity when no candidate matches type hint': 
-	test_must_fail git rev-parse --verify 000000000^{commit} 2>actual &&
-	test_grep "short object ID 000000000 is ambiguous" actual
-
-error: short object ID 000000000 is ambiguous
-ok 5 - warn ambiguity when no candidate matches type hint
-
-expecting success of 1512.6 'disambiguate tree-ish': 
-	# feed tree-ish in an unambiguous way
-	git rev-parse --verify 0000000000cdc:a0blgqsjc &&
-
-	# ambiguous at the object name level, but there is only one
-	# such tree-ish (the other is a blob)
-	git rev-parse --verify 000000000:a0blgqsjc
-
-0000000000b36b6aa7ea4b75318ed078f55505c3
-0000000000b36b6aa7ea4b75318ed078f55505c3
-ok 6 - disambiguate tree-ish
-
-expecting success of 1512.7 'disambiguate blob': 
-	sed -e "s/|$//" >patch <<-EOF &&
-	diff --git a/frotz b/frotz
-	index 000000000..ffffff 100644
-	--- a/frotz
-	+++ b/frotz
-	@@ -10,3 +10,4 @@
-	 9
-	 |
-	 b1rwzyc3
-	+irwry
-	EOF
-	(
-		GIT_INDEX_FILE=frotz &&
-		export GIT_INDEX_FILE &&
-		git apply --build-fake-ancestor frotz patch &&
-		git cat-file blob :frotz >actual
-	) &&
-	test_cmp a0blgqsjc actual
-
-ok 7 - disambiguate blob
-
-expecting success of 1512.8 'disambiguate tree': 
-	commit=$(echo "d7xm" | git commit-tree 000000000) &&
-	# this commit is fffff2e and not ambiguous with the 00000* objects
-	test $(git rev-parse $commit^{tree}) = $(git rev-parse 0000000000cdc)
-
-ok 8 - disambiguate tree
-
-expecting success of 1512.9 'first commit': 
-	# create one commit 0000000000e4f
-	git commit -m a2onsxbvj
-
-[main (root-commit) 0000000000e] a2onsxbvj
- Author: A U Thor <author@example.com>
- 1 file changed, 12 insertions(+)
- create mode 100644 a0blgqsjc
-ok 9 - first commit
-
-expecting success of 1512.10 'disambiguate commit-ish': 
-	# feed commit-ish in an unambiguous way
-	git rev-parse --verify 0000000000e4f^{commit} &&
-
-	# ambiguous at the object name level, but there is only one
-	# such commit (the others are tree and blob)
-	git rev-parse --verify 000000000^{commit} &&
-
-	# likewise
-	git rev-parse --verify 000000000^0
-
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-ok 10 - disambiguate commit-ish
-
-expecting success of 1512.11 'disambiguate commit': 
-	commit=$(echo "hoaxj" | git commit-tree 0000000000cdc -p 000000000) &&
-	# this commit is ffffffd8 and not ambiguous with the 00000* objects
-	test $(git rev-parse $commit^) = $(git rev-parse 0000000000e4f)
-
-ok 11 - disambiguate commit
-
-expecting success of 1512.12 'log name1..name2 takes only commit-ishes on both ends': 
-	# These are underspecified from the prefix-length point of view
-	# to disambiguate the commit with other objects, but there is only
-	# one commit that has 00000* prefix at this point.
-	git log 000000000..000000000 &&
-	git log ..000000000 &&
-	git log 000000000.. &&
-	git log 000000000...000000000 &&
-	git log ...000000000 &&
-	git log 000000000...
-
-ok 12 - log name1..name2 takes only commit-ishes on both ends
-
-expecting success of 1512.13 'rev-parse name1..name2 takes only commit-ishes on both ends': 
-	# Likewise.
-	git rev-parse 000000000..000000000 &&
-	git rev-parse ..000000000 &&
-	git rev-parse 000000000..
-
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-ok 13 - rev-parse name1..name2 takes only commit-ishes on both ends
-
-expecting success of 1512.14 'git log takes only commit-ish': 
-	# Likewise.
-	git log 000000000
-
-commit 0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    a2onsxbvj
-ok 14 - git log takes only commit-ish
-
-expecting success of 1512.15 'git reset takes only commit-ish': 
-	# Likewise.
-	git reset 000000000
-
-ok 15 - git reset takes only commit-ish
-
-expecting success of 1512.16 'first tag': 
-	# create one tag 0000000000f8f
-	git tag -a -m j7cp83um v1.0.0
-
-ok 16 - first tag
-
-checking known breakage of 1512.17 'two semi-ambiguous commit-ish': 
-	# At this point, we have a tag 0000000000f8f that points
-	# at a commit 0000000000e4f, and a tree and a blob that
-	# share 0000000000 prefix with these tag and commit.
-	#
-	# Once the parser becomes ultra-smart, it could notice that
-	# 0000000000 before ^{commit} name many different objects, but
-	# that only two (HEAD and v1.0.0 tag) can be peeled to commit,
-	# and that peeling them down to commit yield the same commit
-	# without ambiguity.
-	git rev-parse --verify 0000000000^{commit} &&
-
-	# likewise
-	git log 0000000000..0000000000 &&
-	git log ..0000000000 &&
-	git log 0000000000.. &&
-	git log 0000000000...0000000000 &&
-	git log ...0000000000 &&
-	git log 0000000000...
-
-error: short object ID 0000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f tag 2005-04-07 - v1.0.0
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-fatal: Needed a single revision
-not ok 17 - two semi-ambiguous commit-ish # TODO known breakage
-
-checking known breakage of 1512.18 'three semi-ambiguous tree-ish': 
-	# Likewise for tree-ish.  HEAD, v1.0.0 and HEAD^{tree} share
-	# the prefix but peeling them to tree yields the same thing
-	git rev-parse --verify 0000000000^{tree}
-
-error: short object ID 0000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f tag 2005-04-07 - v1.0.0
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000000c tree
-fatal: Needed a single revision
-not ok 18 - three semi-ambiguous tree-ish # TODO known breakage
-
-expecting success of 1512.19 'parse describe name': 
-	# feed an unambiguous describe name
-	git rev-parse --verify v1.0.0-0-g0000000000e4f &&
-
-	# ambiguous at the object name level, but there is only one
-	# such commit (others are blob, tree and tag)
-	git rev-parse --verify v1.0.0-0-g000000000
-
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-ok 19 - parse describe name
-
-expecting success of 1512.20 'more history': 
-	# commit 0000000000043
-	git mv a0blgqsjc d12cr3h8t &&
-	echo h62xsjeu >>d12cr3h8t &&
-	git add d12cr3h8t &&
-
-	test_tick &&
-	git commit -m czy8f73t &&
-
-	# commit 00000000008ec
-	git mv d12cr3h8t j000jmpzn &&
-	echo j08bekfvt >>j000jmpzn &&
-	git add j000jmpzn &&
-
-	test_tick &&
-	git commit -m ioiley5o &&
-
-	# commit 0000000005b0
-	git checkout v1.0.0^0 &&
-	git mv a0blgqsjc f5518nwu &&
-
-	test_write_lines h62xsjeu j08bekfvt kg7xflhm >>f5518nwu &&
-	git add f5518nwu &&
-
-	test_tick &&
-	git commit -m b3wettvi &&
-	side=$(git rev-parse HEAD) &&
-
-	# commit 000000000066
-	git checkout main &&
-
-	# If you use recursive, merge will fail and you will need to
-	# clean up a0blgqsjc as well.  If you use resolve, merge will
-	# succeed.
-	test_might_fail git merge --no-commit -s recursive $side &&
-	git rm -f f5518nwu j000jmpzn &&
-
-	test_might_fail git rm -f a0blgqsjc &&
-	(
-		git cat-file blob $side:f5518nwu &&
-		echo j3l0i9s6
-	) >ab2gs879 &&
-	git add ab2gs879 &&
-
-	test_tick &&
-	git commit -m ad2uee
-
-
-[main 00000000000] czy8f73t
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename a0blgqsjc => d12cr3h8t (76%)
-[main 00000000008] ioiley5o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename d12cr3h8t => j000jmpzn (79%)
-Note: switching to 'v1.0.0^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain 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 0000000000e a2onsxbvj
-[detached HEAD 0000000005] b3wettvi
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- rename a0blgqsjc => f5518nwu (51%)
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  0000000005 b3wettvi
-
-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> 0000000005
-
-Switched to branch 'main'
-Auto-merging a0blgqsjc
-CONFLICT (rename/rename): a0blgqsjc renamed to j000jmpzn in HEAD and to f5518nwu in 0000000005b0d85f595e1a98533157ea161798da.
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'f5518nwu'
-rm 'j000jmpzn'
-rm 'a0blgqsjc'
-[main 00000000006] ad2uee
- Author: A U Thor <author@example.com>
-ok 20 - more history
-
-checking known breakage of 1512.21 'parse describe name taking advantage of generation': 
-	# ambiguous at the object name level, but there is only one
-	# such commit at generation 0
-	git rev-parse --verify v1.0.0-0-g000000000 &&
-
-	# likewise for generation 2 and 4
-	git rev-parse --verify v1.0.0-2-g000000000 &&
-	git rev-parse --verify v1.0.0-4-g000000000
-
-fatal: Needed a single revision
-not ok 21 - parse describe name taking advantage of generation # TODO known breakage
-
-expecting success of 1512.22 'parse describe name not ignoring ambiguity': 
-	# ambiguous at the object name level, and there are two such
-	# commits at generation 1
-	test_must_fail git rev-parse --verify v1.0.0-1-g000000000
-
-fatal: Needed a single revision
-ok 22 - parse describe name not ignoring ambiguity
-
-expecting success of 1512.23 'ambiguous commit-ish': 
-	# Now there are many commits that begin with the
-	# common prefix, none of these should pick one at
-	# random.  They all should result in ambiguity errors.
-	test_must_fail git rev-parse --verify 00000000^{commit} &&
-
-	# likewise
-	test_must_fail git log 000000000..000000000 &&
-	test_must_fail git log ..000000000 &&
-	test_must_fail git log 000000000.. &&
-	test_must_fail git log 000000000...000000000 &&
-	test_must_fail git log ...000000000 &&
-	test_must_fail git log 000000000...
-
-error: short object ID 00000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: Needed a single revision
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '000000000..000000000': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '..000000000': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '000000000..': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '000000000...000000000': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '...000000000': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '000000000...': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 23 - ambiguous commit-ish
-
-expecting success of 1512.24 'ambiguous tags peel to treeish': 
-	test_must_fail git rev-parse 0000000000f^{tree}
-
-error: short object ID 0000000000f is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   0000000000fd tree
-fatal: ambiguous argument '0000000000f^{tree}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-0000000000f^{tree}
-ok 24 - ambiguous tags peel to treeish
-
-expecting success of 1512.25 'rev-parse --disambiguate': 
-	# The test creates 16 objects that share the prefix and two
-	# commits created by commit-tree in earlier tests share a
-	# different prefix.
-	git rev-parse --disambiguate=000000000 >actual &&
-	test_line_count = 16 actual &&
-	test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000
-
-ok 25 - rev-parse --disambiguate
-
-expecting success of 1512.26 'rev-parse --disambiguate drops duplicates': 
-	git rev-parse --disambiguate=000000000 >expect &&
-	git pack-objects .git/objects/pack/pack <expect &&
-	git rev-parse --disambiguate=000000000 >actual &&
-	test_cmp expect actual
-
-bdfb78b16a1cd3c3b1ebf4cca29330c92a46fc43
-ok 26 - rev-parse --disambiguate drops duplicates
-
-expecting success of 1512.27 'ambiguous 40-hex ref': 
-	TREE=$(git mktree </dev/null) &&
-	REF=$(git rev-parse HEAD) &&
-	VAL=$(git commit-tree $TREE </dev/null) &&
-	git update-ref refs/heads/$REF $VAL &&
-	test $(git rev-parse $REF 2>err) = $REF &&
-	grep "refname.*${REF}.*ambiguous" err
-
-warning: refname '0000000000663a70a94c2b280b575855256220fa' is ambiguous.
-ok 27 - ambiguous 40-hex ref
-
-expecting success of 1512.28 'ambiguous short sha1 ref': 
-	TREE=$(git mktree </dev/null) &&
-	REF=$(git rev-parse --short HEAD) &&
-	VAL=$(git commit-tree $TREE </dev/null) &&
-	git update-ref refs/heads/$REF $VAL &&
-	test $(git rev-parse $REF 2>err) = $VAL &&
-	grep "refname.*${REF}.*ambiguous" err
-
-warning: refname '00000000006' is ambiguous.
-ok 28 - ambiguous short sha1 ref
-
-expecting success of 1512.29 'ambiguity errors are not repeated (raw)': 
-	test_must_fail git rev-parse 00000 2>stderr &&
-	grep "is ambiguous" stderr >errors &&
-	test_line_count = 1 errors
-
-00000
-ok 29 - ambiguity errors are not repeated (raw)
-
-expecting success of 1512.30 'ambiguity errors are not repeated (treeish)': 
-	test_must_fail git rev-parse 00000:foo 2>stderr &&
-	grep "is ambiguous" stderr >errors &&
-	test_line_count = 1 errors
-
-00000:foo
-ok 30 - ambiguity errors are not repeated (treeish)
-
-expecting success of 1512.31 'ambiguity errors are not repeated (peel)': 
-	test_must_fail git rev-parse 00000^{commit} 2>stderr &&
-	grep "is ambiguous" stderr >errors &&
-	test_line_count = 1 errors
-
-00000^{commit}
-ok 31 - ambiguity errors are not repeated (peel)
-
-expecting success of 1512.32 'ambiguity hints': 
-	test_must_fail git rev-parse 000000000 2>stderr &&
-	grep ^hint: stderr >hints &&
-	# 16 candidates, plus one intro line
-	test_line_count = 17 hints
-
-000000000
-ok 32 - ambiguity hints
-
-expecting success of 1512.33 'ambiguity hints respect type': 
-	test_must_fail git rev-parse 000000000^{commit} 2>stderr &&
-	grep ^hint: stderr >hints &&
-	# 5 commits, 1 tag (which is a committish), plus intro line
-	test_line_count = 7 hints
-
-000000000^{commit}
-ok 33 - ambiguity hints respect type
-
-expecting success of 1512.34 'failed type-selector still shows hint': 
-	# these two blobs share the same prefix "ee3d", but neither
-	# will pass for a commit
-	echo 851 | git hash-object --stdin -w &&
-	echo 872 | git hash-object --stdin -w &&
-	test_must_fail git rev-parse ee3d^{commit} 2>stderr &&
-	grep ^hint: stderr >hints &&
-	test_line_count = 3 hints
-
-ee3de9906b5e9a4a369e91cba4235487a7e10351
-ee3d8abaa95a7395b373892b2593de2f426814e2
-ee3d^{commit}
-ok 34 - failed type-selector still shows hint
-
-expecting success of 1512.35 'core.disambiguate config can prefer types': 
-	# ambiguous between tree and tag
-	sha1=0000000000f &&
-	test_must_fail git rev-parse $sha1 &&
-	git rev-parse $sha1^{commit} &&
-	git -c core.disambiguate=committish rev-parse $sha1
-
-error: short object ID 0000000000f is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   0000000000fd tree
-hint:   0000000000f2 blob
-fatal: ambiguous argument '0000000000f': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-0000000000f
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000f8f5507ab27a0d7bd3c75c0f64ffe0
-ok 35 - core.disambiguate config can prefer types
-
-expecting success of 1512.36 'core.disambiguate does not override context': 
-	# treeish ambiguous between tag and tree
-	test_must_fail \
-		git -c core.disambiguate=committish rev-parse $sha1^{tree}
-
-error: short object ID 0000000000f is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   0000000000fd tree
-fatal: ambiguous argument '0000000000f^{tree}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-0000000000f^{tree}
-ok 36 - core.disambiguate does not override context
-
-expecting success of 1512.37 'ambiguous commits are printed by type first, then hash order': 
-	test_must_fail git rev-parse 0000 2>stderr &&
-	grep ^hint: stderr >hints &&
-	grep 0000 hints >objects &&
-	cat >expected <<-\EOF &&
-	tag
-	commit
-	tree
-	blob
-	EOF
-	awk "{print \$3}" <objects >objects.types &&
-	uniq <objects.types >objects.types.uniq &&
-	test_cmp expected objects.types.uniq &&
-	for type in tag commit tree blob
-	do
-		grep $type objects >$type.objects &&
-		sort $type.objects >$type.objects.sorted &&
-		test_cmp $type.objects.sorted $type.objects || return 1
-	done
-
-0000
-ok 37 - ambiguous commits are printed by type first, then hash order
-
-expecting success of 1512.38 'cat-file --batch and --batch-check show ambiguous': 
-	echo "0000 ambiguous" >expect &&
-	echo 0000 | git cat-file --batch-check >actual 2>err &&
-	test_cmp expect actual &&
-	test_grep hint: err &&
-	echo 0000 | git cat-file --batch >actual 2>err &&
-	test_cmp expect actual &&
-	test_grep hint: err
-
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-hint:   000000000002 tree
-hint:   00000000005 tree
-hint:   00000000009 tree
-hint:   0000000000c tree
-hint:   0000000000fd tree
-hint:   00000000001 blob
-hint:   00000000003 blob
-hint:   0000000000a blob
-hint:   0000000000b blob
-hint:   0000000000f2 blob
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-hint:   000000000002 tree
-hint:   00000000005 tree
-hint:   00000000009 tree
-hint:   0000000000c tree
-hint:   0000000000fd tree
-hint:   00000000001 blob
-hint:   00000000003 blob
-hint:   0000000000a blob
-hint:   0000000000b blob
-hint:   0000000000f2 blob
-ok 38 - cat-file --batch and --batch-check show ambiguous
-
-# still have 3 known breakage(s)
-# passed all remaining 35 test(s)
-1..38
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1400-update-ref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1400-update-ref/.git/
 expecting success of 1400.1 'setup': 
@@ -71614,8 +70880,8 @@
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
 refs/bisect/something
---- main-head	2026-03-04 07:55:50.695352315 +0000
-+++ worktree-head	2026-03-04 07:55:50.615352315 +0000
+--- main-head	2025-01-30 02:08:17.350855462 +0000
++++ worktree-head	2025-01-30 02:08:17.262854934 +0000
 @@ -1 +1 @@
 -58a052250c09f010b95ad9bfe32f35d704eda1a0
 +b62e0cb4990da3244885da90fe7d493334cca9f5
@@ -72875,6 +72141,743 @@
 1..278
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1512-rev-parse-disambiguation.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1512-rev-parse-disambiguation/.git/
+expecting success of 1512.1 'ambiguous blob output': 
+	git init --bare blob.prefix &&
+	(
+		cd blob.prefix &&
+
+		# Both start with "dead..", under both SHA-1 and SHA-256
+		echo brocdnra | git hash-object -w --stdin &&
+		echo brigddsv | git hash-object -w --stdin &&
+
+		# Both start with "beef.."
+		echo 1agllotbh | git hash-object -w --stdin &&
+		echo 1bbfctrkc | git hash-object -w --stdin
+	) &&
+
+	test_must_fail git -C blob.prefix rev-parse dead &&
+	test_cmp_failed_rev_parse blob.prefix beef <<-\EOF
+	error: short object ID beef... is ambiguous
+	hint: The candidates are:
+	hint:   beef... blob
+	hint:   beef... blob
+	fatal: ambiguous argument 'beef...': unknown revision or path not in the working tree.
+	Use '--' to separate paths from revisions, like this:
+	'git <command> [<revision>...] -- [<file>...]'
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1512-rev-parse-disambiguation/blob.prefix/
+dead7b21a85f6dc7a24cbc4bb04a008db70bc04a
+dead9d36640e108d9eb449ed5966fd0c6d4e6b7f
+beefc9be42a87abd92326257a995bf20a24c788f
+beef2b0b99a5a8a36d91ea9ecd766af6352eafd9
+error: short object ID dead is ambiguous
+hint: The candidates are:
+hint:   dead7b2 blob
+hint:   dead9d3 blob
+fatal: ambiguous argument 'dead': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+dead
+beef
+ok 1 - ambiguous blob output
+
+expecting success of 1512.2 'ambiguous loose bad object parsed as OBJ_BAD': 
+	git init --bare blob.bad &&
+	(
+		cd blob.bad &&
+
+		# Both have the prefix "bad0"
+		echo xyzfaowcoh | git hash-object -t bad -w --stdin --literally &&
+		echo xyzhjpyvwl | git hash-object -t bad -w --stdin --literally
+	) &&
+
+	test_cmp_failed_rev_parse blob.bad bad0 <<-\EOF
+	error: short object ID bad0... is ambiguous
+	fatal: invalid object type
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1512-rev-parse-disambiguation/blob.bad/
+bad0bd4672dee1b4d3b8088534ed5a0362bc8d59
+bad0853730d9d114ac789f0ce89039d224bf66c9
+ok 2 - ambiguous loose bad object parsed as OBJ_BAD
+
+expecting success of 1512.3 'ambigous zlib corrupt loose blob': 
+	git init --bare blob.corrupt &&
+	(
+		cd blob.corrupt &&
+
+		# Both have the prefix "cafe"
+		echo bnkxmdwz | git hash-object -w --stdin &&
+		oid=$(echo bmwsjxzi | git hash-object -w --stdin) &&
+
+		oidf=objects/$(test_oid_to_path "$oid") &&
+		chmod 755 $oidf &&
+		echo broken >$oidf
+	) &&
+
+	test_cmp_failed_rev_parse blob.corrupt cafe <<-\EOF
+	error: short object ID cafe... is ambiguous
+	error: inflate: data stream error (incorrect header check)
+	error: unable to unpack cafe... header
+	error: inflate: data stream error (incorrect header check)
+	error: unable to unpack cafe... header
+	hint: The candidates are:
+	hint:   cafe... [bad object]
+	hint:   cafe... blob
+	fatal: ambiguous argument 'cafe...': unknown revision or path not in the working tree.
+	Use '--' to separate paths from revisions, like this:
+	'git <command> [<revision>...] -- [<file>...]'
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1512-rev-parse-disambiguation/blob.corrupt/
+cafe3f2e27174acdf9aa3a394d73714cdcf533d9
+cafe
+ok 3 - ambigous zlib corrupt loose blob
+
+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 1512.4 'blob and tree': 
+	test_tick &&
+	(
+		test_write_lines 0 1 2 3 4 5 6 7 8 9 &&
+		echo &&
+		echo b1rwzyc3
+	) >a0blgqsjc &&
+
+	# create one blob 0000000000b36
+	git add a0blgqsjc &&
+
+	# create one tree 0000000000cdc
+	git write-tree
+
+0000000000cdcf04beb2fab69e65622616294984
+ok 4 - blob and tree
+
+expecting success of 1512.5 'warn ambiguity when no candidate matches type hint': 
+	test_must_fail git rev-parse --verify 000000000^{commit} 2>actual &&
+	test_grep "short object ID 000000000 is ambiguous" actual
+
+error: short object ID 000000000 is ambiguous
+ok 5 - warn ambiguity when no candidate matches type hint
+
+expecting success of 1512.6 'disambiguate tree-ish': 
+	# feed tree-ish in an unambiguous way
+	git rev-parse --verify 0000000000cdc:a0blgqsjc &&
+
+	# ambiguous at the object name level, but there is only one
+	# such tree-ish (the other is a blob)
+	git rev-parse --verify 000000000:a0blgqsjc
+
+0000000000b36b6aa7ea4b75318ed078f55505c3
+0000000000b36b6aa7ea4b75318ed078f55505c3
+ok 6 - disambiguate tree-ish
+
+expecting success of 1512.7 'disambiguate blob': 
+	sed -e "s/|$//" >patch <<-EOF &&
+	diff --git a/frotz b/frotz
+	index 000000000..ffffff 100644
+	--- a/frotz
+	+++ b/frotz
+	@@ -10,3 +10,4 @@
+	 9
+	 |
+	 b1rwzyc3
+	+irwry
+	EOF
+	(
+		GIT_INDEX_FILE=frotz &&
+		export GIT_INDEX_FILE &&
+		git apply --build-fake-ancestor frotz patch &&
+		git cat-file blob :frotz >actual
+	) &&
+	test_cmp a0blgqsjc actual
+
+ok 7 - disambiguate blob
+
+expecting success of 1512.8 'disambiguate tree': 
+	commit=$(echo "d7xm" | git commit-tree 000000000) &&
+	# this commit is fffff2e and not ambiguous with the 00000* objects
+	test $(git rev-parse $commit^{tree}) = $(git rev-parse 0000000000cdc)
+
+ok 8 - disambiguate tree
+
+expecting success of 1512.9 'first commit': 
+	# create one commit 0000000000e4f
+	git commit -m a2onsxbvj
+
+[main (root-commit) 0000000000e] a2onsxbvj
+ Author: A U Thor <author@example.com>
+ 1 file changed, 12 insertions(+)
+ create mode 100644 a0blgqsjc
+ok 9 - first commit
+
+expecting success of 1512.10 'disambiguate commit-ish': 
+	# feed commit-ish in an unambiguous way
+	git rev-parse --verify 0000000000e4f^{commit} &&
+
+	# ambiguous at the object name level, but there is only one
+	# such commit (the others are tree and blob)
+	git rev-parse --verify 000000000^{commit} &&
+
+	# likewise
+	git rev-parse --verify 000000000^0
+
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+ok 10 - disambiguate commit-ish
+
+expecting success of 1512.11 'disambiguate commit': 
+	commit=$(echo "hoaxj" | git commit-tree 0000000000cdc -p 000000000) &&
+	# this commit is ffffffd8 and not ambiguous with the 00000* objects
+	test $(git rev-parse $commit^) = $(git rev-parse 0000000000e4f)
+
+ok 11 - disambiguate commit
+
+expecting success of 1512.12 'log name1..name2 takes only commit-ishes on both ends': 
+	# These are underspecified from the prefix-length point of view
+	# to disambiguate the commit with other objects, but there is only
+	# one commit that has 00000* prefix at this point.
+	git log 000000000..000000000 &&
+	git log ..000000000 &&
+	git log 000000000.. &&
+	git log 000000000...000000000 &&
+	git log ...000000000 &&
+	git log 000000000...
+
+ok 12 - log name1..name2 takes only commit-ishes on both ends
+
+expecting success of 1512.13 'rev-parse name1..name2 takes only commit-ishes on both ends': 
+	# Likewise.
+	git rev-parse 000000000..000000000 &&
+	git rev-parse ..000000000 &&
+	git rev-parse 000000000..
+
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+ok 13 - rev-parse name1..name2 takes only commit-ishes on both ends
+
+expecting success of 1512.14 'git log takes only commit-ish': 
+	# Likewise.
+	git log 000000000
+
+commit 0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    a2onsxbvj
+ok 14 - git log takes only commit-ish
+
+expecting success of 1512.15 'git reset takes only commit-ish': 
+	# Likewise.
+	git reset 000000000
+
+ok 15 - git reset takes only commit-ish
+
+expecting success of 1512.16 'first tag': 
+	# create one tag 0000000000f8f
+	git tag -a -m j7cp83um v1.0.0
+
+ok 16 - first tag
+
+checking known breakage of 1512.17 'two semi-ambiguous commit-ish': 
+	# At this point, we have a tag 0000000000f8f that points
+	# at a commit 0000000000e4f, and a tree and a blob that
+	# share 0000000000 prefix with these tag and commit.
+	#
+	# Once the parser becomes ultra-smart, it could notice that
+	# 0000000000 before ^{commit} name many different objects, but
+	# that only two (HEAD and v1.0.0 tag) can be peeled to commit,
+	# and that peeling them down to commit yield the same commit
+	# without ambiguity.
+	git rev-parse --verify 0000000000^{commit} &&
+
+	# likewise
+	git log 0000000000..0000000000 &&
+	git log ..0000000000 &&
+	git log 0000000000.. &&
+	git log 0000000000...0000000000 &&
+	git log ...0000000000 &&
+	git log 0000000000...
+
+error: short object ID 0000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f tag 2005-04-07 - v1.0.0
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+fatal: Needed a single revision
+not ok 17 - two semi-ambiguous commit-ish # TODO known breakage
+
+checking known breakage of 1512.18 'three semi-ambiguous tree-ish': 
+	# Likewise for tree-ish.  HEAD, v1.0.0 and HEAD^{tree} share
+	# the prefix but peeling them to tree yields the same thing
+	git rev-parse --verify 0000000000^{tree}
+
+error: short object ID 0000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f tag 2005-04-07 - v1.0.0
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000000c tree
+fatal: Needed a single revision
+not ok 18 - three semi-ambiguous tree-ish # TODO known breakage
+
+expecting success of 1512.19 'parse describe name': 
+	# feed an unambiguous describe name
+	git rev-parse --verify v1.0.0-0-g0000000000e4f &&
+
+	# ambiguous at the object name level, but there is only one
+	# such commit (others are blob, tree and tag)
+	git rev-parse --verify v1.0.0-0-g000000000
+
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+ok 19 - parse describe name
+
+expecting success of 1512.20 'more history': 
+	# commit 0000000000043
+	git mv a0blgqsjc d12cr3h8t &&
+	echo h62xsjeu >>d12cr3h8t &&
+	git add d12cr3h8t &&
+
+	test_tick &&
+	git commit -m czy8f73t &&
+
+	# commit 00000000008ec
+	git mv d12cr3h8t j000jmpzn &&
+	echo j08bekfvt >>j000jmpzn &&
+	git add j000jmpzn &&
+
+	test_tick &&
+	git commit -m ioiley5o &&
+
+	# commit 0000000005b0
+	git checkout v1.0.0^0 &&
+	git mv a0blgqsjc f5518nwu &&
+
+	test_write_lines h62xsjeu j08bekfvt kg7xflhm >>f5518nwu &&
+	git add f5518nwu &&
+
+	test_tick &&
+	git commit -m b3wettvi &&
+	side=$(git rev-parse HEAD) &&
+
+	# commit 000000000066
+	git checkout main &&
+
+	# If you use recursive, merge will fail and you will need to
+	# clean up a0blgqsjc as well.  If you use resolve, merge will
+	# succeed.
+	test_might_fail git merge --no-commit -s recursive $side &&
+	git rm -f f5518nwu j000jmpzn &&
+
+	test_might_fail git rm -f a0blgqsjc &&
+	(
+		git cat-file blob $side:f5518nwu &&
+		echo j3l0i9s6
+	) >ab2gs879 &&
+	git add ab2gs879 &&
+
+	test_tick &&
+	git commit -m ad2uee
+
+
+[main 00000000000] czy8f73t
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename a0blgqsjc => d12cr3h8t (76%)
+[main 00000000008] ioiley5o
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename d12cr3h8t => j000jmpzn (79%)
+Note: switching to 'v1.0.0^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain 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 0000000000e a2onsxbvj
+[detached HEAD 0000000005] b3wettvi
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ rename a0blgqsjc => f5518nwu (51%)
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  0000000005 b3wettvi
+
+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> 0000000005
+
+Switched to branch 'main'
+Auto-merging a0blgqsjc
+CONFLICT (rename/rename): a0blgqsjc renamed to j000jmpzn in HEAD and to f5518nwu in 0000000005b0d85f595e1a98533157ea161798da.
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'f5518nwu'
+rm 'j000jmpzn'
+rm 'a0blgqsjc'
+[main 00000000006] ad2uee
+ Author: A U Thor <author@example.com>
+ok 20 - more history
+
+checking known breakage of 1512.21 'parse describe name taking advantage of generation': 
+	# ambiguous at the object name level, but there is only one
+	# such commit at generation 0
+	git rev-parse --verify v1.0.0-0-g000000000 &&
+
+	# likewise for generation 2 and 4
+	git rev-parse --verify v1.0.0-2-g000000000 &&
+	git rev-parse --verify v1.0.0-4-g000000000
+
+fatal: Needed a single revision
+not ok 21 - parse describe name taking advantage of generation # TODO known breakage
+
+expecting success of 1512.22 'parse describe name not ignoring ambiguity': 
+	# ambiguous at the object name level, and there are two such
+	# commits at generation 1
+	test_must_fail git rev-parse --verify v1.0.0-1-g000000000
+
+fatal: Needed a single revision
+ok 22 - parse describe name not ignoring ambiguity
+
+expecting success of 1512.23 'ambiguous commit-ish': 
+	# Now there are many commits that begin with the
+	# common prefix, none of these should pick one at
+	# random.  They all should result in ambiguity errors.
+	test_must_fail git rev-parse --verify 00000000^{commit} &&
+
+	# likewise
+	test_must_fail git log 000000000..000000000 &&
+	test_must_fail git log ..000000000 &&
+	test_must_fail git log 000000000.. &&
+	test_must_fail git log 000000000...000000000 &&
+	test_must_fail git log ...000000000 &&
+	test_must_fail git log 000000000...
+
+error: short object ID 00000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: Needed a single revision
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '000000000..000000000': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '..000000000': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '000000000..': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '000000000...000000000': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '...000000000': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '000000000...': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 23 - ambiguous commit-ish
+
+expecting success of 1512.24 'ambiguous tags peel to treeish': 
+	test_must_fail git rev-parse 0000000000f^{tree}
+
+error: short object ID 0000000000f is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   0000000000fd tree
+fatal: ambiguous argument '0000000000f^{tree}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+0000000000f^{tree}
+ok 24 - ambiguous tags peel to treeish
+
+expecting success of 1512.25 'rev-parse --disambiguate': 
+	# The test creates 16 objects that share the prefix and two
+	# commits created by commit-tree in earlier tests share a
+	# different prefix.
+	git rev-parse --disambiguate=000000000 >actual &&
+	test_line_count = 16 actual &&
+	test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000
+
+ok 25 - rev-parse --disambiguate
+
+expecting success of 1512.26 'rev-parse --disambiguate drops duplicates': 
+	git rev-parse --disambiguate=000000000 >expect &&
+	git pack-objects .git/objects/pack/pack <expect &&
+	git rev-parse --disambiguate=000000000 >actual &&
+	test_cmp expect actual
+
+bdfb78b16a1cd3c3b1ebf4cca29330c92a46fc43
+ok 26 - rev-parse --disambiguate drops duplicates
+
+expecting success of 1512.27 'ambiguous 40-hex ref': 
+	TREE=$(git mktree </dev/null) &&
+	REF=$(git rev-parse HEAD) &&
+	VAL=$(git commit-tree $TREE </dev/null) &&
+	git update-ref refs/heads/$REF $VAL &&
+	test $(git rev-parse $REF 2>err) = $REF &&
+	grep "refname.*${REF}.*ambiguous" err
+
+warning: refname '0000000000663a70a94c2b280b575855256220fa' is ambiguous.
+ok 27 - ambiguous 40-hex ref
+
+expecting success of 1512.28 'ambiguous short sha1 ref': 
+	TREE=$(git mktree </dev/null) &&
+	REF=$(git rev-parse --short HEAD) &&
+	VAL=$(git commit-tree $TREE </dev/null) &&
+	git update-ref refs/heads/$REF $VAL &&
+	test $(git rev-parse $REF 2>err) = $VAL &&
+	grep "refname.*${REF}.*ambiguous" err
+
+warning: refname '00000000006' is ambiguous.
+ok 28 - ambiguous short sha1 ref
+
+expecting success of 1512.29 'ambiguity errors are not repeated (raw)': 
+	test_must_fail git rev-parse 00000 2>stderr &&
+	grep "is ambiguous" stderr >errors &&
+	test_line_count = 1 errors
+
+00000
+ok 29 - ambiguity errors are not repeated (raw)
+
+expecting success of 1512.30 'ambiguity errors are not repeated (treeish)': 
+	test_must_fail git rev-parse 00000:foo 2>stderr &&
+	grep "is ambiguous" stderr >errors &&
+	test_line_count = 1 errors
+
+00000:foo
+ok 30 - ambiguity errors are not repeated (treeish)
+
+expecting success of 1512.31 'ambiguity errors are not repeated (peel)': 
+	test_must_fail git rev-parse 00000^{commit} 2>stderr &&
+	grep "is ambiguous" stderr >errors &&
+	test_line_count = 1 errors
+
+00000^{commit}
+ok 31 - ambiguity errors are not repeated (peel)
+
+expecting success of 1512.32 'ambiguity hints': 
+	test_must_fail git rev-parse 000000000 2>stderr &&
+	grep ^hint: stderr >hints &&
+	# 16 candidates, plus one intro line
+	test_line_count = 17 hints
+
+000000000
+ok 32 - ambiguity hints
+
+expecting success of 1512.33 'ambiguity hints respect type': 
+	test_must_fail git rev-parse 000000000^{commit} 2>stderr &&
+	grep ^hint: stderr >hints &&
+	# 5 commits, 1 tag (which is a committish), plus intro line
+	test_line_count = 7 hints
+
+000000000^{commit}
+ok 33 - ambiguity hints respect type
+
+expecting success of 1512.34 'failed type-selector still shows hint': 
+	# these two blobs share the same prefix "ee3d", but neither
+	# will pass for a commit
+	echo 851 | git hash-object --stdin -w &&
+	echo 872 | git hash-object --stdin -w &&
+	test_must_fail git rev-parse ee3d^{commit} 2>stderr &&
+	grep ^hint: stderr >hints &&
+	test_line_count = 3 hints
+
+ee3de9906b5e9a4a369e91cba4235487a7e10351
+ee3d8abaa95a7395b373892b2593de2f426814e2
+ee3d^{commit}
+ok 34 - failed type-selector still shows hint
+
+expecting success of 1512.35 'core.disambiguate config can prefer types': 
+	# ambiguous between tree and tag
+	sha1=0000000000f &&
+	test_must_fail git rev-parse $sha1 &&
+	git rev-parse $sha1^{commit} &&
+	git -c core.disambiguate=committish rev-parse $sha1
+
+error: short object ID 0000000000f is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   0000000000fd tree
+hint:   0000000000f2 blob
+fatal: ambiguous argument '0000000000f': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+0000000000f
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000f8f5507ab27a0d7bd3c75c0f64ffe0
+ok 35 - core.disambiguate config can prefer types
+
+expecting success of 1512.36 'core.disambiguate does not override context': 
+	# treeish ambiguous between tag and tree
+	test_must_fail \
+		git -c core.disambiguate=committish rev-parse $sha1^{tree}
+
+error: short object ID 0000000000f is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   0000000000fd tree
+fatal: ambiguous argument '0000000000f^{tree}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+0000000000f^{tree}
+ok 36 - core.disambiguate does not override context
+
+expecting success of 1512.37 'ambiguous commits are printed by type first, then hash order': 
+	test_must_fail git rev-parse 0000 2>stderr &&
+	grep ^hint: stderr >hints &&
+	grep 0000 hints >objects &&
+	cat >expected <<-\EOF &&
+	tag
+	commit
+	tree
+	blob
+	EOF
+	awk "{print \$3}" <objects >objects.types &&
+	uniq <objects.types >objects.types.uniq &&
+	test_cmp expected objects.types.uniq &&
+	for type in tag commit tree blob
+	do
+		grep $type objects >$type.objects &&
+		sort $type.objects >$type.objects.sorted &&
+		test_cmp $type.objects.sorted $type.objects || return 1
+	done
+
+0000
+ok 37 - ambiguous commits are printed by type first, then hash order
+
+expecting success of 1512.38 'cat-file --batch and --batch-check show ambiguous': 
+	echo "0000 ambiguous" >expect &&
+	echo 0000 | git cat-file --batch-check >actual 2>err &&
+	test_cmp expect actual &&
+	test_grep hint: err &&
+	echo 0000 | git cat-file --batch >actual 2>err &&
+	test_cmp expect actual &&
+	test_grep hint: err
+
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+hint:   000000000002 tree
+hint:   00000000005 tree
+hint:   00000000009 tree
+hint:   0000000000c tree
+hint:   0000000000fd tree
+hint:   00000000001 blob
+hint:   00000000003 blob
+hint:   0000000000a blob
+hint:   0000000000b blob
+hint:   0000000000f2 blob
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+hint:   000000000002 tree
+hint:   00000000005 tree
+hint:   00000000009 tree
+hint:   0000000000c tree
+hint:   0000000000fd tree
+hint:   00000000001 blob
+hint:   00000000003 blob
+hint:   0000000000a blob
+hint:   0000000000b blob
+hint:   0000000000f2 blob
+ok 38 - cat-file --batch and --batch-check show ambiguous
+
+# still have 3 known breakage(s)
+# passed all remaining 35 test(s)
+1..38
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1517-outside-repo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1517-outside-repo/.git/
 expecting success of 1517.1 'set up a non-repo directory and test file': 
@@ -73256,411 +73259,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1800-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1800-hook/.git/
-expecting success of 1800.1 'git hook usage': 
-	test_expect_code 129 git hook &&
-	test_expect_code 129 git hook run &&
-	test_expect_code 129 git hook run -h &&
-	test_expect_code 129 git hook run --unknown 2>err &&
-	grep "unknown option" err
-
-error: need a subcommand
-usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
-
-usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
-
-    --[no-]ignore-missing silently ignore missing requested <hook-name>
-    --[no-]to-stdin <path>
-                          file to read into hooks' stdin
-
-usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
-
-    --[no-]ignore-missing silently ignore missing requested <hook-name>
-    --[no-]to-stdin <path>
-                          file to read into hooks' stdin
-
-error: unknown option `unknown'
-ok 1 - git hook usage
-
-expecting success of 1800.2 'git hook run: nonexistent hook': 
-	cat >stderr.expect <<-\EOF &&
-	error: cannot find a hook named test-hook
-	EOF
-	test_expect_code 1 git hook run test-hook 2>stderr.actual &&
-	test_cmp stderr.expect stderr.actual
-
-ok 2 - git hook run: nonexistent hook
-
-expecting success of 1800.3 'git hook run: nonexistent hook with --ignore-missing': 
-	git hook run --ignore-missing does-not-exist 2>stderr.actual &&
-	test_must_be_empty stderr.actual
-
-ok 3 - git hook run: nonexistent hook with --ignore-missing
-
-expecting success of 1800.4 'git hook run: basic': 
-	test_hook test-hook <<-EOF &&
-	echo Test hook
-	EOF
-
-	cat >expect <<-\EOF &&
-	Test hook
-	EOF
-	git hook run test-hook 2>actual &&
-	test_cmp expect actual
-
-ok 4 - git hook run: basic
-
-expecting success of 1800.5 'git hook run: stdout and stderr both write to our stderr': 
-	test_hook test-hook <<-EOF &&
-	echo >&1 Will end up on stderr
-	echo >&2 Will end up on stderr
-	EOF
-
-	cat >stderr.expect <<-\EOF &&
-	Will end up on stderr
-	Will end up on stderr
-	EOF
-	git hook run test-hook >stdout.actual 2>stderr.actual &&
-	test_cmp stderr.expect stderr.actual &&
-	test_must_be_empty stdout.actual
-
-ok 5 - git hook run: stdout and stderr both write to our stderr
-
-expecting success of 1800.6 'git hook run: exit code 1 is passed along': 
-		test_hook test-hook <<-EOF &&
-		exit $code
-		EOF
-
-		test_expect_code $code git hook run test-hook
-	
-ok 6 - git hook run: exit code 1 is passed along
-
-expecting success of 1800.7 'git hook run: exit code 2 is passed along': 
-		test_hook test-hook <<-EOF &&
-		exit $code
-		EOF
-
-		test_expect_code $code git hook run test-hook
-	
-ok 7 - git hook run: exit code 2 is passed along
-
-expecting success of 1800.8 'git hook run: exit code 128 is passed along': 
-		test_hook test-hook <<-EOF &&
-		exit $code
-		EOF
-
-		test_expect_code $code git hook run test-hook
-	
-ok 8 - git hook run: exit code 128 is passed along
-
-expecting success of 1800.9 'git hook run: exit code 129 is passed along': 
-		test_hook test-hook <<-EOF &&
-		exit $code
-		EOF
-
-		test_expect_code $code git hook run test-hook
-	
-ok 9 - git hook run: exit code 129 is passed along
-
-expecting success of 1800.10 'git hook run arg u ments without -- is not allowed': 
-	test_expect_code 129 git hook run test-hook arg u ments
-
-usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
-
-    --[no-]ignore-missing silently ignore missing requested <hook-name>
-    --[no-]to-stdin <path>
-                          file to read into hooks' stdin
-
-ok 10 - git hook run arg u ments without -- is not allowed
-
-expecting success of 1800.11 'git hook run -- pass arguments': 
-	test_hook test-hook <<-\EOF &&
-	echo $1
-	echo $2
-	EOF
-
-	cat >expect <<-EOF &&
-	arg
-	u ments
-	EOF
-
-	git hook run test-hook -- arg "u ments" 2>actual &&
-	test_cmp expect actual
-
-ok 11 - git hook run -- pass arguments
-
-expecting success of 1800.12 'git hook run -- out-of-repo runs excluded': 
-	test_hook test-hook <<-EOF &&
-	echo Test hook
-	EOF
-
-	nongit test_must_fail git hook run test-hook
-
-fatal: not a git repository (or any of the parent directories): .git
-ok 12 - git hook run -- out-of-repo runs excluded
-
-expecting success of 1800.13 'git -c core.hooksPath=<PATH> hook run': 
-	mkdir my-hooks &&
-	write_script my-hooks/test-hook <<-\EOF &&
-	echo Hook ran $1
-	EOF
-
-	cat >expect <<-\EOF &&
-	Test hook
-	Hook ran one
-	Hook ran two
-	Hook ran three
-	Hook ran four
-	EOF
-
-	test_hook test-hook <<-EOF &&
-	echo Test hook
-	EOF
-
-	# Test various ways of specifying the path. See also
-	# t1350-config-hooks-path.sh
-	>actual &&
-	git hook run test-hook -- ignored 2>>actual &&
-	git -c core.hooksPath=my-hooks hook run test-hook -- one 2>>actual &&
-	git -c core.hooksPath=my-hooks/ hook run test-hook -- two 2>>actual &&
-	git -c core.hooksPath="$PWD/my-hooks" hook run test-hook -- three 2>>actual &&
-	git -c core.hooksPath="$PWD/my-hooks/" hook run test-hook -- four 2>>actual &&
-	test_cmp expect actual
-
-ok 13 - git -c core.hooksPath=<PATH> hook run
-
-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 1800.14 'git hook run: stdout and stderr are connected to a TTY': 
-	test_hook_tty hook run pre-commit
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1800-hook/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 14 - git hook run: stdout and stderr are connected to a TTY
-
-expecting success of 1800.15 'git commit: stdout and stderr are connected to a TTY': 
-	test_hook_tty commit -m"B.new"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1800-hook/repo/.git/
-[master (root-commit) a3899a0] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master 7763d60] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[master 990192d] B.new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ok 15 - git commit: stdout and stderr are connected to a TTY
-
-expecting success of 1800.16 'git hook run a hook with a bad shebang': 
-	test_when_finished "rm -rf bad-hooks" &&
-	mkdir bad-hooks &&
-	write_script bad-hooks/test-hook "/bad/path/no/spaces" </dev/null &&
-
-	test_expect_code 1 git \
-		-c core.hooksPath=bad-hooks \
-		hook run test-hook >out 2>err &&
-	test_must_be_empty out &&
-
-	# TODO: We should emit the same (or at least a more similar)
-	# error on MINGW (essentially Git for Windows) and all other
-	# platforms.. See the OS-specific code in start_command()
-	grep -E "^(error|fatal): cannot (exec|spawn) .*bad-hooks/test-hook" err
-
-fatal: cannot exec 'bad-hooks/test-hook': No such file or directory
-ok 16 - git hook run a hook with a bad shebang
-
-expecting success of 1800.17 'stdin to hooks': 
-	write_script .git/hooks/test-hook <<-\EOF &&
-	echo BEGIN stdin
-	cat
-	echo END stdin
-	EOF
-
-	cat >expect <<-EOF &&
-	BEGIN stdin
-	hello
-	END stdin
-	EOF
-
-	echo hello >input &&
-	git hook run --to-stdin=input test-hook 2>actual &&
-	test_cmp expect actual
-
-ok 17 - stdin to hooks
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2003-checkout-cache-mkdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2003-checkout-cache-mkdir/.git/
-expecting success of 2003.1 'setup': 
-	mkdir path1 &&
-	echo frotz >path0 &&
-	echo rezrov >path1/file1 &&
-	git update-index --add path0 path1/file1
-
-ok 1 - setup
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 2003.2 'have symlink in place where dir is expected.': 
-	rm -fr path0 path1 &&
-	mkdir path2 &&
-	ln -s path2 path1 &&
-	git checkout-index -f -a &&
-	test ! -h path1 && test -d path1 &&
-	test -f path1/file1 && test ! -f path2/file1
-
-ok 2 - have symlink in place where dir is expected.
-
-expecting success of 2003.3 'use --prefix=path2/': 
-	rm -fr path0 path1 path2 &&
-	mkdir path2 &&
-	git checkout-index --prefix=path2/ -f -a &&
-	test -f path2/path0 &&
-	test -f path2/path1/file1 &&
-	test ! -f path0 &&
-	test ! -f path1/file1
-
-ok 3 - use --prefix=path2/
-
-expecting success of 2003.4 'use --prefix=tmp-': 
-	rm -fr path0 path1 path2 tmp* &&
-	git checkout-index --prefix=tmp- -f -a &&
-	test -f tmp-path0 &&
-	test -f tmp-path1/file1 &&
-	test ! -f path0 &&
-	test ! -f path1/file1
-
-ok 4 - use --prefix=tmp-
-
-expecting success of 2003.5 'use --prefix=tmp- but with a conflicting file and dir': 
-	rm -fr path0 path1 path2 tmp* &&
-	echo nitfol >tmp-path1 &&
-	mkdir tmp-path0 &&
-	git checkout-index --prefix=tmp- -f -a &&
-	test -f tmp-path0 &&
-	test -f tmp-path1/file1 &&
-	test ! -f path0 &&
-	test ! -f path1/file1
-
-ok 5 - use --prefix=tmp- but with a conflicting file and dir
-
-expecting success of 2003.6 'use --prefix=tmp/orary/ where tmp is a symlink': 
-	rm -fr path0 path1 path2 tmp* &&
-	mkdir tmp1 tmp1/orary &&
-	ln -s tmp1 tmp &&
-	git checkout-index --prefix=tmp/orary/ -f -a &&
-	test -d tmp1/orary &&
-	test -f tmp1/orary/path0 &&
-	test -f tmp1/orary/path1/file1 &&
-	test -h tmp
-
-ok 6 - use --prefix=tmp/orary/ where tmp is a symlink
-
-expecting success of 2003.7 'use --prefix=tmp/orary- where tmp is a symlink': 
-	rm -fr path0 path1 path2 tmp* &&
-	mkdir tmp1 &&
-	ln -s tmp1 tmp &&
-	git checkout-index --prefix=tmp/orary- -f -a &&
-	test -f tmp1/orary-path0 &&
-	test -f tmp1/orary-path1/file1 &&
-	test -h tmp
-
-ok 7 - use --prefix=tmp/orary- where tmp is a symlink
-
-expecting success of 2003.8 'use --prefix=tmp- where tmp-path1 is a symlink': 
-	rm -fr path0 path1 path2 tmp* &&
-	mkdir tmp1 &&
-	ln -s tmp1 tmp-path1 &&
-	git checkout-index --prefix=tmp- -f -a &&
-	test -f tmp-path0 &&
-	test ! -h tmp-path1 &&
-	test -d tmp-path1 &&
-	test -f tmp-path1/file1
-
-ok 8 - use --prefix=tmp- where tmp-path1 is a symlink
-
-expecting success of 2003.9 'apply filter from working tree .gitattributes with --prefix': 
-	rm -fr path0 path1 path2 tmp* &&
-	mkdir path1 &&
-	mkdir tmp &&
-	git config filter.replace-all.smudge "sed -e s/./,/g" &&
-	git config filter.replace-all.clean cat &&
-	git config filter.replace-all.required true &&
-	echo "file1 filter=replace-all" >path1/.gitattributes &&
-	git checkout-index --prefix=tmp/ -f -a &&
-	echo frotz >expected &&
-	test_cmp expected tmp/path0 &&
-	echo ,,,,,, >expected &&
-	test_cmp expected tmp/path1/file1
-
-ok 9 - apply filter from working tree .gitattributes with --prefix
-
-expecting success of 2003.10 'apply CRLF filter from working tree .gitattributes with --prefix': 
-	rm -fr path0 path1 path2 tmp* &&
-	mkdir path1 &&
-	mkdir tmp &&
-	echo "file1 eol=crlf" >path1/.gitattributes &&
-	git checkout-index --prefix=tmp/ -f -a &&
-	echo rezrovQ >expected &&
-	tr \\015 Q <tmp/path1/file1 >actual &&
-	test_cmp expected actual
-
-ok 10 - apply CRLF filter from working tree .gitattributes with --prefix
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1300-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1300-config/.git/
 expecting success of 1300.1 'setup whitespace config': 
@@ -79355,6 +78953,411 @@
 1..480
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2003-checkout-cache-mkdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2003-checkout-cache-mkdir/.git/
+expecting success of 2003.1 'setup': 
+	mkdir path1 &&
+	echo frotz >path0 &&
+	echo rezrov >path1/file1 &&
+	git update-index --add path0 path1/file1
+
+ok 1 - setup
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 2003.2 'have symlink in place where dir is expected.': 
+	rm -fr path0 path1 &&
+	mkdir path2 &&
+	ln -s path2 path1 &&
+	git checkout-index -f -a &&
+	test ! -h path1 && test -d path1 &&
+	test -f path1/file1 && test ! -f path2/file1
+
+ok 2 - have symlink in place where dir is expected.
+
+expecting success of 2003.3 'use --prefix=path2/': 
+	rm -fr path0 path1 path2 &&
+	mkdir path2 &&
+	git checkout-index --prefix=path2/ -f -a &&
+	test -f path2/path0 &&
+	test -f path2/path1/file1 &&
+	test ! -f path0 &&
+	test ! -f path1/file1
+
+ok 3 - use --prefix=path2/
+
+expecting success of 2003.4 'use --prefix=tmp-': 
+	rm -fr path0 path1 path2 tmp* &&
+	git checkout-index --prefix=tmp- -f -a &&
+	test -f tmp-path0 &&
+	test -f tmp-path1/file1 &&
+	test ! -f path0 &&
+	test ! -f path1/file1
+
+ok 4 - use --prefix=tmp-
+
+expecting success of 2003.5 'use --prefix=tmp- but with a conflicting file and dir': 
+	rm -fr path0 path1 path2 tmp* &&
+	echo nitfol >tmp-path1 &&
+	mkdir tmp-path0 &&
+	git checkout-index --prefix=tmp- -f -a &&
+	test -f tmp-path0 &&
+	test -f tmp-path1/file1 &&
+	test ! -f path0 &&
+	test ! -f path1/file1
+
+ok 5 - use --prefix=tmp- but with a conflicting file and dir
+
+expecting success of 2003.6 'use --prefix=tmp/orary/ where tmp is a symlink': 
+	rm -fr path0 path1 path2 tmp* &&
+	mkdir tmp1 tmp1/orary &&
+	ln -s tmp1 tmp &&
+	git checkout-index --prefix=tmp/orary/ -f -a &&
+	test -d tmp1/orary &&
+	test -f tmp1/orary/path0 &&
+	test -f tmp1/orary/path1/file1 &&
+	test -h tmp
+
+ok 6 - use --prefix=tmp/orary/ where tmp is a symlink
+
+expecting success of 2003.7 'use --prefix=tmp/orary- where tmp is a symlink': 
+	rm -fr path0 path1 path2 tmp* &&
+	mkdir tmp1 &&
+	ln -s tmp1 tmp &&
+	git checkout-index --prefix=tmp/orary- -f -a &&
+	test -f tmp1/orary-path0 &&
+	test -f tmp1/orary-path1/file1 &&
+	test -h tmp
+
+ok 7 - use --prefix=tmp/orary- where tmp is a symlink
+
+expecting success of 2003.8 'use --prefix=tmp- where tmp-path1 is a symlink': 
+	rm -fr path0 path1 path2 tmp* &&
+	mkdir tmp1 &&
+	ln -s tmp1 tmp-path1 &&
+	git checkout-index --prefix=tmp- -f -a &&
+	test -f tmp-path0 &&
+	test ! -h tmp-path1 &&
+	test -d tmp-path1 &&
+	test -f tmp-path1/file1
+
+ok 8 - use --prefix=tmp- where tmp-path1 is a symlink
+
+expecting success of 2003.9 'apply filter from working tree .gitattributes with --prefix': 
+	rm -fr path0 path1 path2 tmp* &&
+	mkdir path1 &&
+	mkdir tmp &&
+	git config filter.replace-all.smudge "sed -e s/./,/g" &&
+	git config filter.replace-all.clean cat &&
+	git config filter.replace-all.required true &&
+	echo "file1 filter=replace-all" >path1/.gitattributes &&
+	git checkout-index --prefix=tmp/ -f -a &&
+	echo frotz >expected &&
+	test_cmp expected tmp/path0 &&
+	echo ,,,,,, >expected &&
+	test_cmp expected tmp/path1/file1
+
+ok 9 - apply filter from working tree .gitattributes with --prefix
+
+expecting success of 2003.10 'apply CRLF filter from working tree .gitattributes with --prefix': 
+	rm -fr path0 path1 path2 tmp* &&
+	mkdir path1 &&
+	mkdir tmp &&
+	echo "file1 eol=crlf" >path1/.gitattributes &&
+	git checkout-index --prefix=tmp/ -f -a &&
+	echo rezrovQ >expected &&
+	tr \\015 Q <tmp/path1/file1 >actual &&
+	test_cmp expected actual
+
+ok 10 - apply CRLF filter from working tree .gitattributes with --prefix
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1800-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1800-hook/.git/
+expecting success of 1800.1 'git hook usage': 
+	test_expect_code 129 git hook &&
+	test_expect_code 129 git hook run &&
+	test_expect_code 129 git hook run -h &&
+	test_expect_code 129 git hook run --unknown 2>err &&
+	grep "unknown option" err
+
+error: need a subcommand
+usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+
+usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+
+    --[no-]ignore-missing silently ignore missing requested <hook-name>
+    --[no-]to-stdin <path>
+                          file to read into hooks' stdin
+
+usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+
+    --[no-]ignore-missing silently ignore missing requested <hook-name>
+    --[no-]to-stdin <path>
+                          file to read into hooks' stdin
+
+error: unknown option `unknown'
+ok 1 - git hook usage
+
+expecting success of 1800.2 'git hook run: nonexistent hook': 
+	cat >stderr.expect <<-\EOF &&
+	error: cannot find a hook named test-hook
+	EOF
+	test_expect_code 1 git hook run test-hook 2>stderr.actual &&
+	test_cmp stderr.expect stderr.actual
+
+ok 2 - git hook run: nonexistent hook
+
+expecting success of 1800.3 'git hook run: nonexistent hook with --ignore-missing': 
+	git hook run --ignore-missing does-not-exist 2>stderr.actual &&
+	test_must_be_empty stderr.actual
+
+ok 3 - git hook run: nonexistent hook with --ignore-missing
+
+expecting success of 1800.4 'git hook run: basic': 
+	test_hook test-hook <<-EOF &&
+	echo Test hook
+	EOF
+
+	cat >expect <<-\EOF &&
+	Test hook
+	EOF
+	git hook run test-hook 2>actual &&
+	test_cmp expect actual
+
+ok 4 - git hook run: basic
+
+expecting success of 1800.5 'git hook run: stdout and stderr both write to our stderr': 
+	test_hook test-hook <<-EOF &&
+	echo >&1 Will end up on stderr
+	echo >&2 Will end up on stderr
+	EOF
+
+	cat >stderr.expect <<-\EOF &&
+	Will end up on stderr
+	Will end up on stderr
+	EOF
+	git hook run test-hook >stdout.actual 2>stderr.actual &&
+	test_cmp stderr.expect stderr.actual &&
+	test_must_be_empty stdout.actual
+
+ok 5 - git hook run: stdout and stderr both write to our stderr
+
+expecting success of 1800.6 'git hook run: exit code 1 is passed along': 
+		test_hook test-hook <<-EOF &&
+		exit $code
+		EOF
+
+		test_expect_code $code git hook run test-hook
+	
+ok 6 - git hook run: exit code 1 is passed along
+
+expecting success of 1800.7 'git hook run: exit code 2 is passed along': 
+		test_hook test-hook <<-EOF &&
+		exit $code
+		EOF
+
+		test_expect_code $code git hook run test-hook
+	
+ok 7 - git hook run: exit code 2 is passed along
+
+expecting success of 1800.8 'git hook run: exit code 128 is passed along': 
+		test_hook test-hook <<-EOF &&
+		exit $code
+		EOF
+
+		test_expect_code $code git hook run test-hook
+	
+ok 8 - git hook run: exit code 128 is passed along
+
+expecting success of 1800.9 'git hook run: exit code 129 is passed along': 
+		test_hook test-hook <<-EOF &&
+		exit $code
+		EOF
+
+		test_expect_code $code git hook run test-hook
+	
+ok 9 - git hook run: exit code 129 is passed along
+
+expecting success of 1800.10 'git hook run arg u ments without -- is not allowed': 
+	test_expect_code 129 git hook run test-hook arg u ments
+
+usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+
+    --[no-]ignore-missing silently ignore missing requested <hook-name>
+    --[no-]to-stdin <path>
+                          file to read into hooks' stdin
+
+ok 10 - git hook run arg u ments without -- is not allowed
+
+expecting success of 1800.11 'git hook run -- pass arguments': 
+	test_hook test-hook <<-\EOF &&
+	echo $1
+	echo $2
+	EOF
+
+	cat >expect <<-EOF &&
+	arg
+	u ments
+	EOF
+
+	git hook run test-hook -- arg "u ments" 2>actual &&
+	test_cmp expect actual
+
+ok 11 - git hook run -- pass arguments
+
+expecting success of 1800.12 'git hook run -- out-of-repo runs excluded': 
+	test_hook test-hook <<-EOF &&
+	echo Test hook
+	EOF
+
+	nongit test_must_fail git hook run test-hook
+
+fatal: not a git repository (or any of the parent directories): .git
+ok 12 - git hook run -- out-of-repo runs excluded
+
+expecting success of 1800.13 'git -c core.hooksPath=<PATH> hook run': 
+	mkdir my-hooks &&
+	write_script my-hooks/test-hook <<-\EOF &&
+	echo Hook ran $1
+	EOF
+
+	cat >expect <<-\EOF &&
+	Test hook
+	Hook ran one
+	Hook ran two
+	Hook ran three
+	Hook ran four
+	EOF
+
+	test_hook test-hook <<-EOF &&
+	echo Test hook
+	EOF
+
+	# Test various ways of specifying the path. See also
+	# t1350-config-hooks-path.sh
+	>actual &&
+	git hook run test-hook -- ignored 2>>actual &&
+	git -c core.hooksPath=my-hooks hook run test-hook -- one 2>>actual &&
+	git -c core.hooksPath=my-hooks/ hook run test-hook -- two 2>>actual &&
+	git -c core.hooksPath="$PWD/my-hooks" hook run test-hook -- three 2>>actual &&
+	git -c core.hooksPath="$PWD/my-hooks/" hook run test-hook -- four 2>>actual &&
+	test_cmp expect actual
+
+ok 13 - git -c core.hooksPath=<PATH> hook run
+
+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 1800.14 'git hook run: stdout and stderr are connected to a TTY': 
+	test_hook_tty hook run pre-commit
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1800-hook/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 14 - git hook run: stdout and stderr are connected to a TTY
+
+expecting success of 1800.15 'git commit: stdout and stderr are connected to a TTY': 
+	test_hook_tty commit -m"B.new"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1800-hook/repo/.git/
+[master (root-commit) a3899a0] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master 7763d60] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[master 990192d] B.new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ok 15 - git commit: stdout and stderr are connected to a TTY
+
+expecting success of 1800.16 'git hook run a hook with a bad shebang': 
+	test_when_finished "rm -rf bad-hooks" &&
+	mkdir bad-hooks &&
+	write_script bad-hooks/test-hook "/bad/path/no/spaces" </dev/null &&
+
+	test_expect_code 1 git \
+		-c core.hooksPath=bad-hooks \
+		hook run test-hook >out 2>err &&
+	test_must_be_empty out &&
+
+	# TODO: We should emit the same (or at least a more similar)
+	# error on MINGW (essentially Git for Windows) and all other
+	# platforms.. See the OS-specific code in start_command()
+	grep -E "^(error|fatal): cannot (exec|spawn) .*bad-hooks/test-hook" err
+
+fatal: cannot exec 'bad-hooks/test-hook': No such file or directory
+ok 16 - git hook run a hook with a bad shebang
+
+expecting success of 1800.17 'stdin to hooks': 
+	write_script .git/hooks/test-hook <<-\EOF &&
+	echo BEGIN stdin
+	cat
+	echo END stdin
+	EOF
+
+	cat >expect <<-EOF &&
+	BEGIN stdin
+	hello
+	END stdin
+	EOF
+
+	echo hello >input &&
+	git hook run --to-stdin=input test-hook 2>actual &&
+	test_cmp expect actual
+
+ok 17 - stdin to hooks
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2005-checkout-index-symlinks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2005-checkout-index-symlinks/.git/
 expecting success of 2005.1 'preparation': 
@@ -79379,6 +79382,87 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2007-checkout-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1700-split-index.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1700-split-index/.git/
 expecting success of 1700.1 'setup': 
@@ -80127,7 +80211,7 @@
 	test_grep "unable to read sha1 file of file ($missing_blob)" stderr &&
 	test_grep "unable to read sha1 file of symlink ($missing_blob)" stderr
 
-.merge_file_z2vnow	file
+.merge_file_qJYvvQ	file
 error: unable to read sha1 file of file (3685f0bc3974902b137f7dc59ac799c006cdec92)
 error: unable to read sha1 file of symlink (3685f0bc3974902b137f7dc59ac799c006cdec92)
 ok 7 - checkout-index --temp correctly reports error on missing blobs
@@ -80158,87 +80242,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2007-checkout-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2008-checkout-subdir.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2008-checkout-subdir/.git/
 expecting success of 2008.1 'setup': 
@@ -80456,7 +80459,7 @@
 	git checkout-index --stage=all -- path1 &&
 	test_path_is_missing path1
 
-.merge_file_DAQ5zK .merge_file_L4vsGj .merge_file_tByhFO	path1
+.merge_file_Boo6e1 .merge_file_tFVyPk .merge_file_BfKkni	path1
 ok 10 - --stage=all implies --temp
 
 expecting success of 2004.11 'overriding --stage=all resets implied --temp': 
@@ -80986,410 +80989,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2012-checkout-last.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2012-checkout-last/.git/
-expecting success of 2012.1 'setup': 
-	test_commit initial world hello &&
-	git branch other &&
-	test_commit --append second world "hello again"
-
-[main (root-commit) b77667e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-[main 5146e8d] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 2012.2 '"checkout -" does not work initially': 
-	test_must_fail git checkout -
-
-error: pathspec '-' did not match any file(s) known to git
-ok 2 - "checkout -" does not work initially
-
-expecting success of 2012.3 'first branch switch': 
-	git checkout other
-
-Switched to branch 'other'
-ok 3 - first branch switch
-
-expecting success of 2012.4 '"checkout -" switches back': 
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref main
-
-Switched to branch 'main'
-ok 4 - "checkout -" switches back
-
-expecting success of 2012.5 '"checkout -" switches forth': 
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref other
-
-Switched to branch 'other'
-ok 5 - "checkout -" switches forth
-
-expecting success of 2012.6 'detach HEAD': 
-	git checkout $(git rev-parse HEAD)
-
-Note: switching to 'b77667e36f2efc50d31c716f0d5e6db09fe4a8e9'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b77667e initial
-ok 6 - detach HEAD
-
-expecting success of 2012.7 '"checkout -" attaches again': 
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref other
-
-Switched to branch 'other'
-ok 7 - "checkout -" attaches again
-
-expecting success of 2012.8 '"checkout -" detaches again': 
-	git checkout - &&
-
-	git rev-parse other >expect &&
-	git rev-parse HEAD >actual &&
-	test_cmp expect actual &&
-
-	test_must_fail git symbolic-ref HEAD
-
-Note: switching to 'b77667e36f2efc50d31c716f0d5e6db09fe4a8e9'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b77667e initial
-fatal: ref HEAD is not a symbolic ref
-ok 8 - "checkout -" detaches again
-
-expecting success of 2012.9 'more switches': 
-	for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
-	do
-		git checkout -b branch$i || return 1
-	done
-
-Switched to a new branch 'branch16'
-Switched to a new branch 'branch15'
-Switched to a new branch 'branch14'
-Switched to a new branch 'branch13'
-Switched to a new branch 'branch12'
-Switched to a new branch 'branch11'
-Switched to a new branch 'branch10'
-Switched to a new branch 'branch9'
-Switched to a new branch 'branch8'
-Switched to a new branch 'branch7'
-Switched to a new branch 'branch6'
-Switched to a new branch 'branch5'
-Switched to a new branch 'branch4'
-Switched to a new branch 'branch3'
-Switched to a new branch 'branch2'
-Switched to a new branch 'branch1'
-ok 9 - more switches
-
-expecting success of 2012.10 'switch to the last': 
-	more_switches &&
-	git checkout @{-1} &&
-	test_cmp_symbolic_HEAD_ref branch2
-
-Switched to branch 'branch16'
-Switched to branch 'branch15'
-Switched to branch 'branch14'
-Switched to branch 'branch13'
-Switched to branch 'branch12'
-Switched to branch 'branch11'
-Switched to branch 'branch10'
-Switched to branch 'branch9'
-Switched to branch 'branch8'
-Switched to branch 'branch7'
-Switched to branch 'branch6'
-Switched to branch 'branch5'
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-Switched to branch 'branch2'
-Switched to branch 'branch1'
-Switched to branch 'branch2'
-ok 10 - switch to the last
-
-expecting success of 2012.11 'switch to second from the last': 
-	more_switches &&
-	git checkout @{-2} &&
-	test_cmp_symbolic_HEAD_ref branch3
-
-Switched to branch 'branch16'
-Switched to branch 'branch15'
-Switched to branch 'branch14'
-Switched to branch 'branch13'
-Switched to branch 'branch12'
-Switched to branch 'branch11'
-Switched to branch 'branch10'
-Switched to branch 'branch9'
-Switched to branch 'branch8'
-Switched to branch 'branch7'
-Switched to branch 'branch6'
-Switched to branch 'branch5'
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-Switched to branch 'branch2'
-Switched to branch 'branch1'
-Switched to branch 'branch3'
-ok 11 - switch to second from the last
-
-expecting success of 2012.12 'switch to third from the last': 
-	more_switches &&
-	git checkout @{-3} &&
-	test_cmp_symbolic_HEAD_ref branch4
-
-Switched to branch 'branch16'
-Switched to branch 'branch15'
-Switched to branch 'branch14'
-Switched to branch 'branch13'
-Switched to branch 'branch12'
-Switched to branch 'branch11'
-Switched to branch 'branch10'
-Switched to branch 'branch9'
-Switched to branch 'branch8'
-Switched to branch 'branch7'
-Switched to branch 'branch6'
-Switched to branch 'branch5'
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-Switched to branch 'branch2'
-Switched to branch 'branch1'
-Switched to branch 'branch4'
-ok 12 - switch to third from the last
-
-expecting success of 2012.13 'switch to fourth from the last': 
-	more_switches &&
-	git checkout @{-4} &&
-	test_cmp_symbolic_HEAD_ref branch5
-
-Switched to branch 'branch16'
-Switched to branch 'branch15'
-Switched to branch 'branch14'
-Switched to branch 'branch13'
-Switched to branch 'branch12'
-Switched to branch 'branch11'
-Switched to branch 'branch10'
-Switched to branch 'branch9'
-Switched to branch 'branch8'
-Switched to branch 'branch7'
-Switched to branch 'branch6'
-Switched to branch 'branch5'
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-Switched to branch 'branch2'
-Switched to branch 'branch1'
-Switched to branch 'branch5'
-ok 13 - switch to fourth from the last
-
-expecting success of 2012.14 'switch to twelfth from the last': 
-	more_switches &&
-	git checkout @{-12} &&
-	test_cmp_symbolic_HEAD_ref branch13
-
-Switched to branch 'branch16'
-Switched to branch 'branch15'
-Switched to branch 'branch14'
-Switched to branch 'branch13'
-Switched to branch 'branch12'
-Switched to branch 'branch11'
-Switched to branch 'branch10'
-Switched to branch 'branch9'
-Switched to branch 'branch8'
-Switched to branch 'branch7'
-Switched to branch 'branch6'
-Switched to branch 'branch5'
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-Switched to branch 'branch2'
-Switched to branch 'branch1'
-Switched to branch 'branch13'
-ok 14 - switch to twelfth from the last
-
-expecting success of 2012.15 'merge base test setup': 
-	git checkout -b another other &&
-	test_commit --append third world "hello again"
-
-Switched to a new branch 'another'
-[another d04d7df] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 15 - merge base test setup
-
-expecting success of 2012.16 'another...main': 
-	git checkout another &&
-	git checkout another...main &&
-
-	git rev-parse --verify main^ >expect &&
-	git rev-parse --verify HEAD >actual &&
-	test_cmp expect actual
-
-Already on 'another'
-Note: switching to 'another...main'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b77667e initial
-ok 16 - another...main
-
-expecting success of 2012.17 '...main': 
-	git checkout another &&
-	git checkout ...main &&
-
-	git rev-parse --verify main^ >expect &&
-	git rev-parse --verify HEAD >actual &&
-	test_cmp expect actual
-
-Previous HEAD position was b77667e initial
-Switched to branch 'another'
-Note: switching to '...main'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b77667e initial
-ok 17 - ...main
-
-expecting success of 2012.18 'main...': 
-	git checkout another &&
-	git checkout main... &&
-
-	git rev-parse --verify main^ >expect &&
-	git rev-parse --verify HEAD >actual &&
-	test_cmp expect actual
-
-Previous HEAD position was b77667e initial
-Switched to branch 'another'
-Note: switching to 'main...'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b77667e initial
-ok 18 - main...
-
-expecting success of 2012.19 '"checkout -" works after a rebase A': 
-	git checkout main &&
-	git checkout other &&
-	git rebase main &&
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref main
-
-Previous HEAD position was b77667e initial
-Switched to branch 'main'
-Switched to branch 'other'
-Successfully rebased and updated refs/heads/other.
-Switched to branch 'main'
-ok 19 - "checkout -" works after a rebase A
-
-expecting success of 2012.20 '"checkout -" works after a rebase A B': 
-	git branch moodle main~1 &&
-	git checkout main &&
-	git checkout other &&
-	git rebase main moodle &&
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref main
-
-Already on 'main'
-Switched to branch 'other'
-Successfully rebased and updated refs/heads/moodle.
-Switched to branch 'main'
-ok 20 - "checkout -" works after a rebase A B
-
-expecting success of 2012.21 '"checkout -" works after a rebase -i A': 
-	git checkout main &&
-	git checkout other &&
-	git rebase -i main &&
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref main
-
-Already on 'main'
-Switched to branch 'other'
-Successfully rebased and updated refs/heads/other.
-Switched to branch 'main'
-ok 21 - "checkout -" works after a rebase -i A
-
-expecting success of 2012.22 '"checkout -" works after a rebase -i A B': 
-	git branch foodle main~1 &&
-	git checkout main &&
-	git checkout other &&
-	git rebase main foodle &&
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref main
-
-Already on 'main'
-Switched to branch 'other'
-Successfully rebased and updated refs/heads/foodle.
-Switched to branch 'main'
-ok 22 - "checkout -" works after a rebase -i A B
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1450-fsck.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1450-fsck/.git/
 expecting success of 1450.1 'setup': 
@@ -83003,7 +82602,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00666256 s, 0.2 kB/s
+1 byte copied, 0.00108725 s, 0.9 kB/s
 error: .git/objects/pack/pack-8be9f6a4139bcddd74c3d2ed343bb71e87863c4b.pack pack checksum mismatch
 ok 79 - fsck fails on corrupt packfile
 
@@ -83459,14 +83058,500 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0450-txt-doc-vs-help.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t2012-checkout-last.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2012-checkout-last/.git/
+expecting success of 2012.1 'setup': 
+	test_commit initial world hello &&
+	git branch other &&
+	test_commit --append second world "hello again"
 
-expecting success of 0450.2 'list of txt and help mismatches is sorted': 
+[main (root-commit) b77667e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world
+[main 5146e8d] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 2012.2 '"checkout -" does not work initially': 
+	test_must_fail git checkout -
+
+error: pathspec '-' did not match any file(s) known to git
+ok 2 - "checkout -" does not work initially
+
+expecting success of 2012.3 'first branch switch': 
+	git checkout other
+
+Switched to branch 'other'
+ok 3 - first branch switch
+
+expecting success of 2012.4 '"checkout -" switches back': 
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
+
+Switched to branch 'main'
+ok 4 - "checkout -" switches back
+
+expecting success of 2012.5 '"checkout -" switches forth': 
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref other
+
+Switched to branch 'other'
+ok 5 - "checkout -" switches forth
+
+expecting success of 2012.6 'detach HEAD': 
+	git checkout $(git rev-parse HEAD)
+
+Note: switching to 'b77667e36f2efc50d31c716f0d5e6db09fe4a8e9'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at b77667e initial
+ok 6 - detach HEAD
+
+expecting success of 2012.7 '"checkout -" attaches again': 
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref other
+
+Switched to branch 'other'
+ok 7 - "checkout -" attaches again
+
+expecting success of 2012.8 '"checkout -" detaches again': 
+	git checkout - &&
+
+	git rev-parse other >expect &&
+	git rev-parse HEAD >actual &&
+	test_cmp expect actual &&
+
+	test_must_fail git symbolic-ref HEAD
+
+Note: switching to 'b77667e36f2efc50d31c716f0d5e6db09fe4a8e9'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at b77667e initial
+fatal: ref HEAD is not a symbolic ref
+ok 8 - "checkout -" detaches again
+
+expecting success of 2012.9 'more switches': 
+	for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
+	do
+		git checkout -b branch$i || return 1
+	done
+
+Switched to a new branch 'branch16'
+Switched to a new branch 'branch15'
+Switched to a new branch 'branch14'
+Switched to a new branch 'branch13'
+Switched to a new branch 'branch12'
+Switched to a new branch 'branch11'
+Switched to a new branch 'branch10'
+Switched to a new branch 'branch9'
+Switched to a new branch 'branch8'
+Switched to a new branch 'branch7'
+Switched to a new branch 'branch6'
+Switched to a new branch 'branch5'
+Switched to a new branch 'branch4'
+Switched to a new branch 'branch3'
+Switched to a new branch 'branch2'
+Switched to a new branch 'branch1'
+ok 9 - more switches
+
+expecting success of 2012.10 'switch to the last': 
+	more_switches &&
+	git checkout @{-1} &&
+	test_cmp_symbolic_HEAD_ref branch2
+
+Switched to branch 'branch16'
+Switched to branch 'branch15'
+Switched to branch 'branch14'
+Switched to branch 'branch13'
+Switched to branch 'branch12'
+Switched to branch 'branch11'
+Switched to branch 'branch10'
+Switched to branch 'branch9'
+Switched to branch 'branch8'
+Switched to branch 'branch7'
+Switched to branch 'branch6'
+Switched to branch 'branch5'
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+Switched to branch 'branch2'
+Switched to branch 'branch1'
+Switched to branch 'branch2'
+ok 10 - switch to the last
+
+expecting success of 2012.11 'switch to second from the last': 
+	more_switches &&
+	git checkout @{-2} &&
+	test_cmp_symbolic_HEAD_ref branch3
+
+Switched to branch 'branch16'
+Switched to branch 'branch15'
+Switched to branch 'branch14'
+Switched to branch 'branch13'
+Switched to branch 'branch12'
+Switched to branch 'branch11'
+Switched to branch 'branch10'
+Switched to branch 'branch9'
+Switched to branch 'branch8'
+Switched to branch 'branch7'
+Switched to branch 'branch6'
+Switched to branch 'branch5'
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+Switched to branch 'branch2'
+Switched to branch 'branch1'
+Switched to branch 'branch3'
+ok 11 - switch to second from the last
+
+expecting success of 2012.12 'switch to third from the last': 
+	more_switches &&
+	git checkout @{-3} &&
+	test_cmp_symbolic_HEAD_ref branch4
+
+Switched to branch 'branch16'
+Switched to branch 'branch15'
+Switched to branch 'branch14'
+Switched to branch 'branch13'
+Switched to branch 'branch12'
+Switched to branch 'branch11'
+Switched to branch 'branch10'
+Switched to branch 'branch9'
+Switched to branch 'branch8'
+Switched to branch 'branch7'
+Switched to branch 'branch6'
+Switched to branch 'branch5'
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+Switched to branch 'branch2'
+Switched to branch 'branch1'
+Switched to branch 'branch4'
+ok 12 - switch to third from the last
+
+expecting success of 2012.13 'switch to fourth from the last': 
+	more_switches &&
+	git checkout @{-4} &&
+	test_cmp_symbolic_HEAD_ref branch5
+
+Switched to branch 'branch16'
+Switched to branch 'branch15'
+Switched to branch 'branch14'
+Switched to branch 'branch13'
+Switched to branch 'branch12'
+Switched to branch 'branch11'
+Switched to branch 'branch10'
+Switched to branch 'branch9'
+Switched to branch 'branch8'
+Switched to branch 'branch7'
+Switched to branch 'branch6'
+Switched to branch 'branch5'
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+Switched to branch 'branch2'
+Switched to branch 'branch1'
+Switched to branch 'branch5'
+ok 13 - switch to fourth from the last
+
+expecting success of 2012.14 'switch to twelfth from the last': 
+	more_switches &&
+	git checkout @{-12} &&
+	test_cmp_symbolic_HEAD_ref branch13
+
+Switched to branch 'branch16'
+Switched to branch 'branch15'
+Switched to branch 'branch14'
+Switched to branch 'branch13'
+Switched to branch 'branch12'
+Switched to branch 'branch11'
+Switched to branch 'branch10'
+Switched to branch 'branch9'
+Switched to branch 'branch8'
+Switched to branch 'branch7'
+Switched to branch 'branch6'
+Switched to branch 'branch5'
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+Switched to branch 'branch2'
+Switched to branch 'branch1'
+Switched to branch 'branch13'
+ok 14 - switch to twelfth from the last
+
+expecting success of 2012.15 'merge base test setup': 
+	git checkout -b another other &&
+	test_commit --append third world "hello again"
+
+Switched to a new branch 'another'
+[another d04d7df] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 15 - merge base test setup
+
+expecting success of 2012.16 'another...main': 
+	git checkout another &&
+	git checkout another...main &&
+
+	git rev-parse --verify main^ >expect &&
+	git rev-parse --verify HEAD >actual &&
+	test_cmp expect actual
+
+Already on 'another'
+Note: switching to 'another...main'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at b77667e initial
+ok 16 - another...main
+
+expecting success of 2012.17 '...main': 
+	git checkout another &&
+	git checkout ...main &&
+
+	git rev-parse --verify main^ >expect &&
+	git rev-parse --verify HEAD >actual &&
+	test_cmp expect actual
+
+Previous HEAD position was b77667e initial
+Switched to branch 'another'
+Note: switching to '...main'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at b77667e initial
+ok 17 - ...main
+
+expecting success of 2012.18 'main...': 
+	git checkout another &&
+	git checkout main... &&
+
+	git rev-parse --verify main^ >expect &&
+	git rev-parse --verify HEAD >actual &&
+	test_cmp expect actual
+
+Previous HEAD position was b77667e initial
+Switched to branch 'another'
+Note: switching to 'main...'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at b77667e initial
+ok 18 - main...
+
+expecting success of 2012.19 '"checkout -" works after a rebase A': 
+	git checkout main &&
+	git checkout other &&
+	git rebase main &&
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
+
+Previous HEAD position was b77667e initial
+Switched to branch 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/other.
+Switched to branch 'main'
+ok 19 - "checkout -" works after a rebase A
+
+expecting success of 2012.20 '"checkout -" works after a rebase A B': 
+	git branch moodle main~1 &&
+	git checkout main &&
+	git checkout other &&
+	git rebase main moodle &&
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
+
+Already on 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/moodle.
+Switched to branch 'main'
+ok 20 - "checkout -" works after a rebase A B
+
+expecting success of 2012.21 '"checkout -" works after a rebase -i A': 
+	git checkout main &&
+	git checkout other &&
+	git rebase -i main &&
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
+
+Already on 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/other.
+Switched to branch 'main'
+ok 21 - "checkout -" works after a rebase -i A
+
+expecting success of 2012.22 '"checkout -" works after a rebase -i A B': 
+	git branch foodle main~1 &&
+	git checkout main &&
+	git checkout other &&
+	git rebase main foodle &&
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
+
+Already on 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/foodle.
+Switched to branch 'main'
+ok 22 - "checkout -" works after a rebase -i A B
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2019-checkout-ambiguous-ref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0450-txt-doc-vs-help.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 txt and help mismatches is sorted': 
 	sort -u "$TEST_DIRECTORY"/t0450/txt-help-mismatches >expect &&
 	if ! test_cmp expect "$TEST_DIRECTORY"/t0450/txt-help-mismatches
 	then
@@ -83523,8 +83608,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:16.071352315 +0000
-+++ help	2026-03-04 07:55:16.139352315 +0000
+--- txt	2025-01-30 02:07:26.606551167 +0000
++++ help	2025-01-30 02:07:26.674551574 +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]
@@ -83582,8 +83667,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:16.579352315 +0000
-+++ help	2026-03-04 07:55:16.631352315 +0000
+--- txt	2025-01-30 02:07:27.118554237 +0000
++++ help	2025-01-30 02:07:27.170554549 +0000
 @@ -1,10 +1,2 @@
 -git am [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
 -       [--[no-]3way] [--interactive] [--committer-date-is-author-date]
@@ -83697,8 +83782,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:17.511352315 +0000
-+++ help	2026-03-04 07:55:17.551352315 +0000
+--- txt	2025-01-30 02:07:28.166560521 +0000
++++ help	2025-01-30 02:07:28.210560785 +0000
 @@ -1,9 +1 @@
 -git apply [--stat] [--numstat] [--summary] [--check]
 -          [--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
@@ -83760,8 +83845,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:17.883352315 +0000
-+++ help	2026-03-04 07:55:17.943352315 +0000
+--- txt	2025-01-30 02:07:28.662563496 +0000
++++ help	2025-01-30 02:07:28.722563855 +0000
 @@ -1,4 +1,4 @@
 -git archive [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
 -            [-o <file> | --output=<file>] [--worktree-attributes]
@@ -83821,8 +83906,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:18.303352315 +0000
-+++ help	2026-03-04 07:55:18.359352315 +0000
+--- txt	2025-01-30 02:07:29.222566854 +0000
++++ help	2025-01-30 02:07:29.266567118 +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>...]
@@ -83885,8 +83970,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:18.759352315 +0000
-+++ help	2026-03-04 07:55:18.803352315 +0000
+--- txt	2025-01-30 02:07:29.778570188 +0000
++++ help	2025-01-30 02:07:29.850570620 +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>]
@@ -83944,8 +84029,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:19.107352315 +0000
-+++ help	2026-03-04 07:55:19.151352315 +0000
+--- txt	2025-01-30 02:07:30.334573522 +0000
++++ help	2025-01-30 02:07:30.422574050 +0000
 @@ -1,16 +1,8 @@
 -git branch [--color[=<when>] | --no-color] [--show-current]
 -           [-v [--abbrev=<n> | --no-abbrev]]
@@ -84321,8 +84406,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:21.647352315 +0000
-+++ help	2026-03-04 07:55:21.679352315 +0000
+--- txt	2025-01-30 02:07:34.382597796 +0000
++++ help	2025-01-30 02:07:34.434598108 +0000
 @@ -1,4 +1,2 @@
 -git check-ref-format [--normalize]
 -                     [--[no-]allow-onelevel] [--refspec-pattern]
@@ -84379,8 +84464,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:22.063352315 +0000
-+++ help	2026-03-04 07:55:22.091352315 +0000
+--- txt	2025-01-30 02:07:34.926601059 +0000
++++ help	2025-01-30 02:07:34.994601466 +0000
 @@ -1,9 +1,2 @@
 -git checkout [-q] [-f] [-m] [<branch>]
 -git checkout [-q] [-f] [-m] --detach [<branch>]
@@ -84474,8 +84559,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:22.643352315 +0000
-+++ help	2026-03-04 07:55:22.695352315 +0000
+--- txt	2025-01-30 02:07:35.774606144 +0000
++++ help	2025-01-30 02:07:35.818606408 +0000
 @@ -1,6 +1 @@
 -git checkout-index [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
 -                   [--stage=<number>|all]
@@ -84684,8 +84769,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:24.155352315 +0000
-+++ help	2026-03-04 07:55:24.191352315 +0000
+--- txt	2025-01-30 02:07:38.190620632 +0000
++++ help	2025-01-30 02:07:38.266621087 +0000
 @@ -1,9 +1 @@
 -git clone [--template=<template-directory>]
 -          [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
@@ -84747,8 +84832,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:24.467352315 +0000
-+++ help	2026-03-04 07:55:24.499352315 +0000
+--- txt	2025-01-30 02:07:38.802624302 +0000
++++ help	2025-01-30 02:07:38.854624613 +0000
 @@ -1,2 +1 @@
 -git column [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]
 -           [--indent=<string>] [--nl=<string>] [--padding=<n>]
@@ -85053,8 +85138,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:26.531352315 +0000
-+++ help	2026-03-04 07:55:26.551352315 +0000
+--- txt	2025-01-30 02:07:42.358645626 +0000
++++ help	2025-01-30 02:07:42.486646393 +0000
 @@ -0,0 +1 @@
 +git credential (fill|approve|reject)
 not ok 147 - credential -h output and SYNOPSIS agree # TODO known breakage
@@ -85107,8 +85192,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:26.863352315 +0000
-+++ help	2026-03-04 07:55:26.907352315 +0000
+--- txt	2025-01-30 02:07:42.934649080 +0000
++++ help	2025-01-30 02:07:43.070649895 +0000
 @@ -0,0 +1 @@
 +git credential-cache [<options>] <action>
 not ok 152 - credential-cache -h output and SYNOPSIS agree # TODO known breakage
@@ -85211,8 +85296,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:27.503352315 +0000
-+++ help	2026-03-04 07:55:27.571352315 +0000
+--- txt	2025-01-30 02:07:44.030655652 +0000
++++ help	2025-01-30 02:07:44.150656372 +0000
 @@ -0,0 +1 @@
 +git credential-store [<options>] <action>
 not ok 162 - credential-store -h output and SYNOPSIS agree # TODO known breakage
@@ -85615,8 +85700,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:30.427352315 +0000
-+++ help	2026-03-04 07:55:30.475352315 +0000
+--- txt	2025-01-30 02:07:48.486682373 +0000
++++ help	2025-01-30 02:07:48.542682709 +0000
 @@ -1 +1 @@
 -git fast-export [<options>] | git fast-import
 +git fast-export [<rev-list-opts>]
@@ -85670,8 +85755,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:30.931352315 +0000
-+++ help	2026-03-04 07:55:30.955352315 +0000
+--- txt	2025-01-30 02:07:49.018685564 +0000
++++ help	2025-01-30 02:07:49.078685923 +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>]
@@ -85775,8 +85860,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:31.415352315 +0000
-+++ help	2026-03-04 07:55:31.423352315 +0000
+--- txt	2025-01-30 02:07:50.138692280 +0000
++++ help	2025-01-30 02:07:50.182692544 +0000
 @@ -1,4 +1 @@
 -git fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]
 -               [--upload-pack=<git-upload-pack>]
@@ -85833,8 +85918,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:31.671352315 +0000
-+++ help	2026-03-04 07:55:31.687352315 +0000
+--- txt	2025-01-30 02:07:50.702695662 +0000
++++ help	2025-01-30 02:07:50.766696046 +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>
@@ -85889,8 +85974,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:31.899352315 +0000
-+++ help	2026-03-04 07:55:31.927352315 +0000
+--- txt	2025-01-30 02:07:51.230698828 +0000
++++ help	2025-01-30 02:07:51.290699188 +0000
 @@ -1,7 +1,4 @@
 -git for-each-ref [--count=<count>] [--shell|--perl|--python|--tcl]
 -                 [(--sort=<key>)...] [--format=<format>]
@@ -86003,8 +86088,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:32.551352315 +0000
-+++ help	2026-03-04 07:55:32.595352315 +0000
+--- txt	2025-01-30 02:07:52.270705065 +0000
++++ help	2025-01-30 02:07:52.322705377 +0000
 @@ -1,23 +1 @@
 -git format-patch [-k] [(-o|--output-directory) <dir> | --stdout]
 -                 [--no-thread | --thread[=<style>]]
@@ -86130,8 +86215,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:33.211352315 +0000
-+++ help	2026-03-04 07:55:33.239352315 +0000
+--- txt	2025-01-30 02:07:53.382711733 +0000
++++ help	2025-01-30 02:07:53.442712093 +0000
 @@ -1 +1,4 @@
 -git fsck-objects ...
 +git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
@@ -86188,8 +86273,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:33.567352315 +0000
-+++ help	2026-03-04 07:55:33.611352315 +0000
+--- txt	2025-01-30 02:07:53.882714731 +0000
++++ help	2025-01-30 02:07:53.930715019 +0000
 @@ -1,4 +1,4 @@
 -git fsmonitor--daemon start
 -git fsmonitor--daemon run
@@ -86247,8 +86332,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:33.895352315 +0000
-+++ help	2026-03-04 07:55:33.967352315 +0000
+--- txt	2025-01-30 02:07:54.426717994 +0000
++++ help	2025-01-30 02:07:54.478718305 +0000
 @@ -1 +1 @@
 -git gc [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]
 +git gc [<options>]
@@ -86352,8 +86437,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:34.571352315 +0000
-+++ help	2026-03-04 07:55:34.611352315 +0000
+--- txt	2025-01-30 02:07:55.462724206 +0000
++++ help	2025-01-30 02:07:55.502724446 +0000
 @@ -1,21 +1 @@
 -git grep [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]
 -         [-v | --invert-match] [-h|-H] [--full-name]
@@ -86577,8 +86662,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:36.071352315 +0000
-+++ help	2026-03-04 07:55:36.111352315 +0000
+--- txt	2025-01-30 02:07:57.494736391 +0000
++++ help	2025-01-30 02:07:57.542736679 +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>]
@@ -86684,8 +86769,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:36.735352315 +0000
-+++ help	2026-03-04 07:55:36.771352315 +0000
+--- txt	2025-01-30 02:07:58.566742820 +0000
++++ help	2025-01-30 02:07:58.630743204 +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>]
@@ -86793,8 +86878,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:37.527352315 +0000
-+++ help	2026-03-04 07:55:37.583352315 +0000
+--- txt	2025-01-30 02:07:59.634749224 +0000
++++ help	2025-01-30 02:07:59.706749656 +0000
 @@ -1 +1,2 @@
  git log [<options>] [<revision-range>] [[--] <path>...]
 +git show [<options>] <object>...
@@ -86848,8 +86933,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:37.879352315 +0000
-+++ help	2026-03-04 07:55:37.915352315 +0000
+--- txt	2025-01-30 02:08:00.178752487 +0000
++++ help	2025-01-30 02:08:00.234752822 +0000
 @@ -1,13 +1 @@
 -git ls-files [-z] [-t] [-v] [-f]
 -             [-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
@@ -86965,8 +87050,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:38.647352315 +0000
-+++ help	2026-03-04 07:55:38.679352315 +0000
+--- txt	2025-01-30 02:08:01.278759083 +0000
++++ help	2025-01-30 02:08:01.342759467 +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>]
@@ -87022,8 +87107,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:39.007352315 +0000
-+++ help	2026-03-04 07:55:39.031352315 +0000
+--- txt	2025-01-30 02:08:01.758761961 +0000
++++ help	2025-01-30 02:08:01.810762273 +0000
 @@ -1,3 +1 @@
 -git mailinfo [-k|-b] [-u | --encoding=<encoding> | -n]
 -             [--[no-]scissors] [--quoted-cr=<action>]
@@ -87079,8 +87164,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:39.347352315 +0000
-+++ help	2026-03-04 07:55:39.387352315 +0000
+--- txt	2025-01-30 02:08:02.250764912 +0000
++++ help	2025-01-30 02:08:02.310765271 +0000
 @@ -1,2 +1 @@
 -git mailsplit [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]
 -              -o<directory> [--] [(<mbox>|<Maildir>)...]
@@ -87135,8 +87220,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:39.707352315 +0000
-+++ help	2026-03-04 07:55:39.755352315 +0000
+--- txt	2025-01-30 02:08:02.838768438 +0000
++++ help	2025-01-30 02:08:02.902768821 +0000
 @@ -1,3 +1 @@
 -git maintenance run [<options>]
 -git maintenance start [--scheduler=<scheduler>]
@@ -87192,8 +87277,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:40.051352315 +0000
-+++ help	2026-03-04 07:55:40.103352315 +0000
+--- txt	2025-01-30 02:08:03.374771652 +0000
++++ help	2025-01-30 02:08:03.438772036 +0000
 @@ -1,6 +1,3 @@
 -git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
 -          [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
@@ -87304,8 +87389,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:40.599352315 +0000
-+++ help	2026-03-04 07:55:40.635352315 +0000
+--- txt	2025-01-30 02:08:04.566778800 +0000
++++ help	2025-01-30 02:08:04.634779208 +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>]
@@ -87361,8 +87446,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:40.947352315 +0000
-+++ help	2026-03-04 07:55:40.983352315 +0000
+--- txt	2025-01-30 02:08:05.146782278 +0000
++++ help	2025-01-30 02:08:05.218782710 +0000
 @@ -1 +1 @@
 -git merge-index [-o] [-q] <merge-program> (-a | ( [--] <file>...) )
 +git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])
@@ -87721,8 +87806,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:43.411352315 +0000
-+++ help	2026-03-04 07:55:43.431352315 +0000
+--- txt	2025-01-30 02:08:08.978805257 +0000
++++ help	2025-01-30 02:08:09.038805617 +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>]
@@ -87829,8 +87914,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:44.115352315 +0000
-+++ help	2026-03-04 07:55:44.151352315 +0000
+--- txt	2025-01-30 02:08:10.106812022 +0000
++++ help	2025-01-30 02:08:10.166812382 +0000
 @@ -1,2 +1,3 @@
 -git name-rev [--tags] [--refs=<pattern>]
 -             ( --all | --annotate-stdin | <commit-ish>... )
@@ -87887,8 +87972,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:44.503352315 +0000
-+++ help	2026-03-04 07:55:44.527352315 +0000
+--- txt	2025-01-30 02:08:10.686815500 +0000
++++ help	2025-01-30 02:08:10.746815860 +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>] [<object>]
@@ -87962,8 +88047,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:44.883352315 +0000
-+++ help	2026-03-04 07:55:44.919352315 +0000
+--- txt	2025-01-30 02:08:11.202818594 +0000
++++ help	2025-01-30 02:08:11.262818954 +0000
 @@ -1,7 +1,2 @@
 -git pack-objects [-q | --progress | --all-progress] [--all-progress-implied]
 -                 [--no-reuse-delta] [--delta-base-offset] [--non-empty]
@@ -88355,8 +88440,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:47.779352315 +0000
-+++ help	2026-03-04 07:55:47.819352315 +0000
+--- txt	2025-01-30 02:08:15.378843636 +0000
++++ help	2025-01-30 02:08:15.454844092 +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]
@@ -88415,8 +88500,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:48.163352315 +0000
-+++ help	2026-03-04 07:55:48.195352315 +0000
+--- txt	2025-01-30 02:08:15.978847234 +0000
++++ help	2025-01-30 02:08:16.054847690 +0000
 @@ -1,5 +1,3 @@
 -git range-diff [--color=[<when>]] [--no-color] [<diff-options>]
 -               [--no-dual-color] [--creation-factor=<factor>]
@@ -88526,8 +88611,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:48.943352315 +0000
-+++ help	2026-03-04 07:55:48.979352315 +0000
+--- txt	2025-01-30 02:08:17.154854287 +0000
++++ help	2025-01-30 02:08:17.214854646 +0000
 @@ -1,5 +1,3 @@
 -git rebase [-i | --interactive] [<options>] [--exec <cmd>]
 -           [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
@@ -88737,8 +88822,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:50.435352315 +0000
-+++ help	2026-03-04 07:55:50.483352315 +0000
+--- txt	2025-01-30 02:08:19.222866688 +0000
++++ help	2025-01-30 02:08:19.274867000 +0000
 @@ -1,13 +1,13 @@
  git remote [-v | --verbose]
 -git remote add [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
@@ -88809,8 +88894,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:50.851352315 +0000
-+++ help	2026-03-04 07:55:50.903352315 +0000
+--- txt	2025-01-30 02:08:19.786870070 +0000
++++ help	2025-01-30 02:08:19.838870382 +0000
 @@ -1 +1 @@
 -git remote add <nick> "ext::<command>[ <arguments>...]"
 +git remote-ext <remote> <url>
@@ -88864,8 +88949,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:51.195352315 +0000
-+++ help	2026-03-04 07:55:51.295352315 +0000
+--- txt	2025-01-30 02:08:20.258872900 +0000
++++ help	2025-01-30 02:08:20.362873524 +0000
 @@ -0,0 +1 @@
 +git remote-fd <remote> <url>
 not ok 507 - remote-fd -h output and SYNOPSIS agree # TODO known breakage
@@ -88918,8 +89003,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:51.619352315 +0000
-+++ help	2026-03-04 07:55:51.663352315 +0000
+--- txt	2025-01-30 02:08:20.870876570 +0000
++++ help	2025-01-30 02:08:20.926876906 +0000
 @@ -1 +1 @@
 -git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]
 +git repack [<options>]
@@ -89123,8 +89208,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:53.387352315 +0000
-+++ help	2026-03-04 07:55:53.443352315 +0000
+--- txt	2025-01-30 02:08:23.118890051 +0000
++++ help	2025-01-30 02:08:23.186890459 +0000
 @@ -1,4 +1,4 @@
 +git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
  git reset [-q] [<tree-ish>] [--] <pathspec>...
@@ -89183,8 +89268,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:53.927352315 +0000
-+++ help	2026-03-04 07:55:53.963352315 +0000
+--- txt	2025-01-30 02:08:23.698893529 +0000
++++ help	2025-01-30 02:08:23.754893865 +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]
@@ -89290,8 +89375,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:54.791352315 +0000
-+++ help	2026-03-04 07:55:54.839352315 +0000
+--- txt	2025-01-30 02:08:24.726899694 +0000
++++ help	2025-01-30 02:08:24.790900078 +0000
 @@ -1 +1,3 @@
 -git rev-parse [<options>] <arg>...
 +git rev-parse --parseopt [<options>] -- [<args>...]
@@ -89547,8 +89632,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:56.799352315 +0000
-+++ help	2026-03-04 07:55:56.855352315 +0000
+--- txt	2025-01-30 02:08:27.454916053 +0000
++++ help	2025-01-30 02:08:27.522916461 +0000
 @@ -1 +1,2 @@
 -git show [<options>] [<object>...]
 +git log [<options>] [<revision-range>] [[--] <path>...]
@@ -89803,8 +89888,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:55:59.183352315 +0000
-+++ help	2026-03-04 07:55:59.243352315 +0000
+--- txt	2025-01-30 02:08:30.166932316 +0000
++++ help	2025-01-30 02:08:30.214932604 +0000
 @@ -1 +1 @@
 -git stage <arg>...
 +git add [<options>] [--] <pathspec>...
@@ -90039,8 +90124,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:56:01.543352315 +0000
-+++ help	2026-03-04 07:56:01.587352315 +0000
+--- txt	2025-01-30 02:08:32.650947212 +0000
++++ help	2025-01-30 02:08:32.698947500 +0000
 @@ -1,4 +1 @@
 -git switch [<options>] [--no-guess] <branch>
 -git switch [<options>] --detach [<start-point>]
@@ -90297,8 +90382,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:56:03.707352315 +0000
-+++ help	2026-03-04 07:56:03.743352315 +0000
+--- txt	2025-01-30 02:08:35.338963331 +0000
++++ help	2025-01-30 02:08:35.386963619 +0000
 @@ -1,19 +1 @@
 -git update-index
 -                 [--add] [--remove | --force-remove] [--replace]
@@ -90370,8 +90455,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:56:04.199352315 +0000
-+++ help	2026-03-04 07:56:04.255352315 +0000
+--- txt	2025-01-30 02:08:35.846966377 +0000
++++ help	2025-01-30 02:08:35.894966665 +0000
 @@ -1 +1,3 @@
 -git update-ref [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])
 +git update-ref [<options>] -d <refname> [<old-oid>]
@@ -90858,8 +90943,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp txt help
 	
---- txt	2026-03-04 07:56:08.655352315 +0000
-+++ help	2026-03-04 07:56:08.695352315 +0000
+--- txt	2025-01-30 02:08:41.394999647 +0000
++++ help	2025-01-30 02:08:41.450999983 +0000
 @@ -1 +1,2 @@
 -git whatchanged <option>...
 +git log [<options>] [<revision-range>] [[--] <path>...]
@@ -90971,413 +91056,6 @@
 1..712
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2019-checkout-ambiguous-ref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2021-checkout-overwrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2021-checkout-overwrite/.git/
-expecting success of 2021.1 'setup': 
-
-	mkdir -p a/b/c &&
-	>a/b/c/d &&
-	git add -A &&
-	git commit -m base &&
-	git tag start
-
-[master (root-commit) 6ef9cb1] base
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/b/c/d
-ok 1 - setup
-
-expecting success of 2021.2 'create a commit where dir a/b changed to file': 
-
-	git checkout -b file &&
-	rm -rf a/b &&
-	>a/b &&
-	git add -A &&
-	git commit -m "dir to file"
-
-Switched to a new branch 'file'
-[file ef05f50] dir to file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a/{b/c/d => b} (100%)
-ok 2 - create a commit where dir a/b changed to file
-
-expecting success of 2021.3 'checkout commit with dir must not remove untracked a/b': 
-
-	git rm --cached a/b &&
-	git commit -m "un-track the file" &&
-	test_must_fail git checkout start &&
-	test -f a/b
-
-rm 'a/b'
-[file 1d595a3] un-track the file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 a/b
-error: The following untracked working tree files would be overwritten by checkout:
-	a/b
-Please move or remove them before you switch branches.
-Aborting
-ok 3 - checkout commit with dir must not remove untracked a/b
-
-expecting success of 2021.4 'create a commit where dir a/b changed to symlink': 
-
-	rm -rf a/b &&	# cleanup if previous test failed
-	git checkout -f -b symlink start &&
-	rm -rf a/b &&
-	git add -A &&
-	test_ln_s_add foo a/b &&
-	git commit -m "dir to symlink"
-
-Switched to a new branch 'symlink'
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[symlink 6de6f3e] dir to symlink
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 a/b
- delete mode 100644 a/b/c/d
-ok 4 - create a commit where dir a/b changed to symlink
-
-expecting success of 2021.5 'checkout commit with dir must not remove untracked a/b': 
-
-	git rm --cached a/b &&
-	git commit -m "un-track the symlink" &&
-	test_must_fail git checkout start
-
-rm 'a/b'
-[symlink 43da882] un-track the symlink
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 120000 a/b
-error: The following untracked working tree files would be overwritten by checkout:
-	a/b
-Please move or remove them before you switch branches.
-Aborting
-ok 5 - checkout commit with dir must not remove untracked a/b
-
-expecting success of 2021.6 'the symlink remained': 
-
-	test -h a/b
-
-ok 6 - the symlink remained
-
-expecting success of 2021.7 'cleanup after previous symlink tests': 
-	rm a/b
-
-ok 7 - cleanup after previous symlink tests
-
-expecting success of 2021.8 'checkout -f must not follow symlinks when removing entries': 
-	git checkout -f start &&
-	mkdir dir &&
-	>dir/f &&
-	git add dir/f &&
-	git commit -m "add dir/f" &&
-	mv dir untracked &&
-	ln -s untracked dir &&
-	git checkout -f HEAD~ &&
-	test_path_is_file untracked/f
-
-Note: switching to 'start'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6ef9cb1 base
-[detached HEAD 63af845] add dir/f
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir/f
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  63af845 add dir/f
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 63af845
-
-HEAD is now at 6ef9cb1 base
-ok 8 - checkout -f must not follow symlinks when removing entries
-
-expecting success of 2021.9 'checkout --overwrite-ignore should succeed if only ignored files in the way': 
-	git checkout -b df_conflict &&
-	test_commit contents some_dir &&
-	git checkout start &&
-	mkdir some_dir &&
-	echo autogenerated information >some_dir/ignore &&
-	echo ignore >.git/info/exclude &&
-	git checkout --overwrite-ignore df_conflict &&
-	test_path_is_file some_dir
-
-Switched to a new branch 'df_conflict'
-[df_conflict aa83f36] contents
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 some_dir
-Note: switching to 'start'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6ef9cb1 base
-Previous HEAD position was 6ef9cb1 base
-Switched to branch 'df_conflict'
-ok 9 - checkout --overwrite-ignore should succeed if only ignored files in the way
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2022-checkout-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2016-checkout-patch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2016-checkout-patch/.git/
 expecting success of 2016.1 'setup': 
@@ -92106,6 +91784,331 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2021-checkout-overwrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2021-checkout-overwrite/.git/
+expecting success of 2021.1 'setup': 
+
+	mkdir -p a/b/c &&
+	>a/b/c/d &&
+	git add -A &&
+	git commit -m base &&
+	git tag start
+
+[master (root-commit) 6ef9cb1] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/b/c/d
+ok 1 - setup
+
+expecting success of 2021.2 'create a commit where dir a/b changed to file': 
+
+	git checkout -b file &&
+	rm -rf a/b &&
+	>a/b &&
+	git add -A &&
+	git commit -m "dir to file"
+
+Switched to a new branch 'file'
+[file ef05f50] dir to file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a/{b/c/d => b} (100%)
+ok 2 - create a commit where dir a/b changed to file
+
+expecting success of 2021.3 'checkout commit with dir must not remove untracked a/b': 
+
+	git rm --cached a/b &&
+	git commit -m "un-track the file" &&
+	test_must_fail git checkout start &&
+	test -f a/b
+
+rm 'a/b'
+[file 1d595a3] un-track the file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 a/b
+error: The following untracked working tree files would be overwritten by checkout:
+	a/b
+Please move or remove them before you switch branches.
+Aborting
+ok 3 - checkout commit with dir must not remove untracked a/b
+
+expecting success of 2021.4 'create a commit where dir a/b changed to symlink': 
+
+	rm -rf a/b &&	# cleanup if previous test failed
+	git checkout -f -b symlink start &&
+	rm -rf a/b &&
+	git add -A &&
+	test_ln_s_add foo a/b &&
+	git commit -m "dir to symlink"
+
+Switched to a new branch 'symlink'
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[symlink 6de6f3e] dir to symlink
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 120000 a/b
+ delete mode 100644 a/b/c/d
+ok 4 - create a commit where dir a/b changed to symlink
+
+expecting success of 2021.5 'checkout commit with dir must not remove untracked a/b': 
+
+	git rm --cached a/b &&
+	git commit -m "un-track the symlink" &&
+	test_must_fail git checkout start
+
+rm 'a/b'
+[symlink 43da882] un-track the symlink
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 120000 a/b
+error: The following untracked working tree files would be overwritten by checkout:
+	a/b
+Please move or remove them before you switch branches.
+Aborting
+ok 5 - checkout commit with dir must not remove untracked a/b
+
+expecting success of 2021.6 'the symlink remained': 
+
+	test -h a/b
+
+ok 6 - the symlink remained
+
+expecting success of 2021.7 'cleanup after previous symlink tests': 
+	rm a/b
+
+ok 7 - cleanup after previous symlink tests
+
+expecting success of 2021.8 'checkout -f must not follow symlinks when removing entries': 
+	git checkout -f start &&
+	mkdir dir &&
+	>dir/f &&
+	git add dir/f &&
+	git commit -m "add dir/f" &&
+	mv dir untracked &&
+	ln -s untracked dir &&
+	git checkout -f HEAD~ &&
+	test_path_is_file untracked/f
+
+Note: switching to 'start'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6ef9cb1 base
+[detached HEAD 63af845] add dir/f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir/f
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  63af845 add dir/f
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 63af845
+
+HEAD is now at 6ef9cb1 base
+ok 8 - checkout -f must not follow symlinks when removing entries
+
+expecting success of 2021.9 'checkout --overwrite-ignore should succeed if only ignored files in the way': 
+	git checkout -b df_conflict &&
+	test_commit contents some_dir &&
+	git checkout start &&
+	mkdir some_dir &&
+	echo autogenerated information >some_dir/ignore &&
+	echo ignore >.git/info/exclude &&
+	git checkout --overwrite-ignore df_conflict &&
+	test_path_is_file some_dir
+
+Switched to a new branch 'df_conflict'
+[df_conflict aa83f36] contents
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 some_dir
+Note: switching to 'start'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6ef9cb1 base
+Previous HEAD position was 6ef9cb1 base
+Switched to branch 'df_conflict'
+ok 9 - checkout --overwrite-ignore should succeed if only ignored files in the way
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2022-checkout-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2023-checkout-m.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2023-checkout-m/.git/
 expecting success of 2023.1 'setup': 
@@ -92297,6 +92300,206 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2026-checkout-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2026-checkout-pathspec-file/.git/
+expecting success of 2026.1 'setup': 
+	test_commit file0 &&
+
+	echo 1 >fileA.t &&
+	echo 1 >fileB.t &&
+	echo 1 >fileC.t &&
+	echo 1 >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 1" &&
+
+	echo 2 >fileA.t &&
+	echo 2 >fileB.t &&
+	echo 2 >fileC.t &&
+	echo 2 >fileD.t &&
+	git add 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 46ee160] files 1
+ 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
+[master 774eb8e] files 2
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+ok 1 - setup
+
+expecting success of 2026.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
+
+	echo fileA.t | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 774eb8e files 2
+Updated 1 path from 0465292
+ok 2 - --pathspec-from-file from stdin
+
+expecting success of 2026.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git checkout --pathspec-from-file=list HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 774eb8e files 2
+Updated 1 path from 0465292
+ok 3 - --pathspec-from-file from file
+
+expecting success of 2026.4 'NUL delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git checkout --pathspec-from-file=- --pathspec-file-nul HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 774eb8e files 2
+Updated 2 paths from 0465292
+ok 4 - NUL delimiters
+
+expecting success of 2026.5 'LF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 774eb8e files 2
+Updated 2 paths from 0465292
+ok 5 - LF delimiters
+
+expecting success of 2026.6 'no trailing delimiter': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 774eb8e files 2
+Updated 2 paths from 0465292
+ok 6 - no trailing delimiter
+
+expecting success of 2026.7 'CRLF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 774eb8e files 2
+Updated 2 paths from 0465292
+ok 7 - CRLF delimiters
+
+expecting success of 2026.8 'quotes': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git checkout --pathspec-from-file=list HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 774eb8e files 2
+Updated 1 path from 0465292
+ok 8 - quotes
+
+expecting success of 2026.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git checkout --pathspec-from-file=list --pathspec-file-nul HEAD^1
+
+HEAD is now at 774eb8e 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 2026.10 'only touches what was listed': 
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileB.t
+	M  fileC.t
+	EOF
+	verify_expect
+
+HEAD is now at 774eb8e files 2
+Updated 2 paths from 0465292
+ok 10 - only touches what was listed
+
+expecting success of 2026.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+
+	test_must_fail git checkout --pathspec-from-file=list --detach 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--detach. cannot be used together" err &&
+
+	test_must_fail git checkout --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 checkout --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 checkout --pathspec-file-nul 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
+
+HEAD is now at 774eb8e files 2
+fatal: options '--pathspec-from-file' and '--detach' cannot be used together
+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 11 - error conditions
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2020-checkout-detach.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2020-checkout-detach/.git/
 expecting success of 2020.1 'setup': 
@@ -92936,206 +93139,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2026-checkout-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2026-checkout-pathspec-file/.git/
-expecting success of 2026.1 'setup': 
-	test_commit file0 &&
-
-	echo 1 >fileA.t &&
-	echo 1 >fileB.t &&
-	echo 1 >fileC.t &&
-	echo 1 >fileD.t &&
-	git add fileA.t fileB.t fileC.t fileD.t &&
-	git commit -m "files 1" &&
-
-	echo 2 >fileA.t &&
-	echo 2 >fileB.t &&
-	echo 2 >fileC.t &&
-	echo 2 >fileD.t &&
-	git add 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 46ee160] files 1
- 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
-[master 774eb8e] files 2
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+), 4 deletions(-)
-ok 1 - setup
-
-expecting success of 2026.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
-
-	echo fileA.t | git checkout --pathspec-from-file=- HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	M  fileA.t
-	EOF
-	verify_expect
-
-HEAD is now at 774eb8e files 2
-Updated 1 path from 0465292
-ok 2 - --pathspec-from-file from stdin
-
-expecting success of 2026.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
-
-	echo fileA.t >list &&
-	git checkout --pathspec-from-file=list HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	M  fileA.t
-	EOF
-	verify_expect
-
-HEAD is now at 774eb8e files 2
-Updated 1 path from 0465292
-ok 3 - --pathspec-from-file from file
-
-expecting success of 2026.4 'NUL delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\0fileB.t\0" | git checkout --pathspec-from-file=- --pathspec-file-nul HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	M  fileA.t
-	M  fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 774eb8e files 2
-Updated 2 paths from 0465292
-ok 4 - NUL delimiters
-
-expecting success of 2026.5 'LF delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\nfileB.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	M  fileA.t
-	M  fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 774eb8e files 2
-Updated 2 paths from 0465292
-ok 5 - LF delimiters
-
-expecting success of 2026.6 'no trailing delimiter': 
-	restore_checkpoint &&
-
-	printf "fileA.t\nfileB.t" | git checkout --pathspec-from-file=- HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	M  fileA.t
-	M  fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 774eb8e files 2
-Updated 2 paths from 0465292
-ok 6 - no trailing delimiter
-
-expecting success of 2026.7 'CRLF delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\r\nfileB.t\r\n" | git checkout --pathspec-from-file=- HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	M  fileA.t
-	M  fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 774eb8e files 2
-Updated 2 paths from 0465292
-ok 7 - CRLF delimiters
-
-expecting success of 2026.8 'quotes': 
-	restore_checkpoint &&
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	git checkout --pathspec-from-file=list HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	M  fileA.t
-	EOF
-	verify_expect
-
-HEAD is now at 774eb8e files 2
-Updated 1 path from 0465292
-ok 8 - quotes
-
-expecting success of 2026.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	test_must_fail git checkout --pathspec-from-file=list --pathspec-file-nul HEAD^1
-
-HEAD is now at 774eb8e 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 2026.10 'only touches what was listed': 
-	restore_checkpoint &&
-
-	printf "fileB.t\nfileC.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	M  fileB.t
-	M  fileC.t
-	EOF
-	verify_expect
-
-HEAD is now at 774eb8e files 2
-Updated 2 paths from 0465292
-ok 10 - only touches what was listed
-
-expecting success of 2026.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-
-	test_must_fail git checkout --pathspec-from-file=list --detach 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--detach. cannot be used together" err &&
-
-	test_must_fail git checkout --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 checkout --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 checkout --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
-
-HEAD is now at 774eb8e files 2
-fatal: options '--pathspec-from-file' and '--detach' cannot be used together
-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 11 - error conditions
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2050-git-dir-relative.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2050-git-dir-relative/.git/
 expecting success of 2050.1 'Setting up post-commit hook': 
@@ -94566,45 +94569,6 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2081-parallel-checkout-collisions.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2071-restore-patch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2071-restore-patch/.git/
 expecting success of 2071.1 'setup': 
@@ -94888,6 +94852,45 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2081-parallel-checkout-collisions.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2100-update-cache-badpath.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2100-update-cache-badpath/.git/
 checking prerequisite: SYMLINKS
@@ -94931,6 +94934,1002 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2102-update-index-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2102-update-index-symlinks/.git/
+expecting success of 2102.1 'preparation': 
+git config core.symlinks false &&
+l=$(printf file | git hash-object -t blob -w --stdin) &&
+echo "120000 $l	symlink" | git update-index --index-info
+ok 1 - preparation
+
+expecting success of 2102.2 'modify the symbolic link': 
+printf new-file > symlink &&
+git update-index symlink
+ok 2 - modify the symbolic link
+
+expecting success of 2102.3 'the index entry must still be a symbolic link': 
+case "$(git ls-files --stage --cached symlink)" in
+120000" "*symlink) echo pass;;
+*) echo fail; git ls-files --stage --cached symlink; false;;
+esac
+pass
+ok 3 - the index entry must still be a symbolic link
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t1701-racy-split-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2101-update-index-reupdate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2101-update-index-reupdate/.git/
+expecting success of 2101.1 'update-index --add': 
+	echo hello world >file1 &&
+	echo goodbye people >file2 &&
+	git update-index --add file1 file2 &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object file1) 0	file1
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+
+ok 1 - update-index --add
+
+expecting success of 2101.2 'update-index --again': 
+	rm -f file1 &&
+	echo hello everybody >file2 &&
+	if git update-index --again
+	then
+		echo should have refused to remove file1
+		exit 1
+	else
+		echo happy - failed as expected
+	fi &&
+	git ls-files -s >current &&
+	cmp current expected
+
+error: file1: does not exist and --remove not passed
+fatal: Unable to process path file1
+happy - failed as expected
+ok 2 - update-index --again
+
+expecting success of 2101.3 'update-index --remove --again': 
+	git update-index --remove --again &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+
+ok 3 - update-index --remove --again
+
+expecting success of 2101.4 'first commit': git commit -m initial
+[master (root-commit) 823d2a7] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 4 - first commit
+
+expecting success of 2101.5 'update-index again': 
+	mkdir -p dir1 &&
+	echo hello world >dir1/file3 &&
+	echo goodbye people >file2 &&
+	git update-index --add file2 dir1/file3 &&
+	echo hello everybody >file2 &&
+	echo happy >dir1/file3 &&
+	git update-index --again &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+
+ok 5 - update-index again
+
+expecting success of 2101.6 'update-index --update from subdir': 
+	echo not so happy >file2 &&
+	(cd dir1 &&
+	cat ../file2 >file3 &&
+	git update-index --again
+	) &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $file2 0	file2
+	EOF
+	test_cmp expected current
+
+ok 6 - update-index --update from subdir
+
+expecting success of 2101.7 'update-index --update with pathspec': 
+	echo very happy >file2 &&
+	cat file2 >dir1/file3 &&
+	git update-index --again dir1/ &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $file2 0	file2
+	EOF
+	cmp current expected
+
+ok 7 - update-index --update with pathspec
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2030-unresolve-info.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2030-unresolve-info/.git/
 expecting success of 2030.1 'setup': 
@@ -95429,237 +96428,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2102-update-index-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2102-update-index-symlinks/.git/
-expecting success of 2102.1 'preparation': 
-git config core.symlinks false &&
-l=$(printf file | git hash-object -t blob -w --stdin) &&
-echo "120000 $l	symlink" | git update-index --index-info
-ok 1 - preparation
-
-expecting success of 2102.2 'modify the symbolic link': 
-printf new-file > symlink &&
-git update-index symlink
-ok 2 - modify the symbolic link
-
-expecting success of 2102.3 'the index entry must still be a symbolic link': 
-case "$(git ls-files --stage --cached symlink)" in
-120000" "*symlink) echo pass;;
-*) echo fail; git ls-files --stage --cached symlink; false;;
-esac
-pass
-ok 3 - the index entry must still be a symbolic link
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2101-update-index-reupdate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2101-update-index-reupdate/.git/
-expecting success of 2101.1 'update-index --add': 
-	echo hello world >file1 &&
-	echo goodbye people >file2 &&
-	git update-index --add file1 file2 &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object file1) 0	file1
-	100644 $(git hash-object file2) 0	file2
-	EOF
-	cmp current expected
-
-ok 1 - update-index --add
-
-expecting success of 2101.2 'update-index --again': 
-	rm -f file1 &&
-	echo hello everybody >file2 &&
-	if git update-index --again
-	then
-		echo should have refused to remove file1
-		exit 1
-	else
-		echo happy - failed as expected
-	fi &&
-	git ls-files -s >current &&
-	cmp current expected
-
-error: file1: does not exist and --remove not passed
-fatal: Unable to process path file1
-happy - failed as expected
-ok 2 - update-index --again
-
-expecting success of 2101.3 'update-index --remove --again': 
-	git update-index --remove --again &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object file2) 0	file2
-	EOF
-	cmp current expected
-
-ok 3 - update-index --remove --again
-
-expecting success of 2101.4 'first commit': git commit -m initial
-[master (root-commit) 823d2a7] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 4 - first commit
-
-expecting success of 2101.5 'update-index again': 
-	mkdir -p dir1 &&
-	echo hello world >dir1/file3 &&
-	echo goodbye people >file2 &&
-	git update-index --add file2 dir1/file3 &&
-	echo hello everybody >file2 &&
-	echo happy >dir1/file3 &&
-	git update-index --again &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object dir1/file3) 0	dir1/file3
-	100644 $(git hash-object file2) 0	file2
-	EOF
-	cmp current expected
-
-ok 5 - update-index again
-
-expecting success of 2101.6 'update-index --update from subdir': 
-	echo not so happy >file2 &&
-	(cd dir1 &&
-	cat ../file2 >file3 &&
-	git update-index --again
-	) &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object dir1/file3) 0	dir1/file3
-	100644 $file2 0	file2
-	EOF
-	test_cmp expected current
-
-ok 6 - update-index --update from subdir
-
-expecting success of 2101.7 'update-index --update with pathspec': 
-	echo very happy >file2 &&
-	cat file2 >dir1/file3 &&
-	git update-index --again dir1/ &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object dir1/file3) 0	dir1/file3
-	100644 $file2 0	file2
-	EOF
-	cmp current expected
-
-ok 7 - update-index --update with pathspec
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2104-update-index-skip-worktree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2105-update-index-gitfile.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2103-update-index-ignore-missing.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2103-update-index-ignore-missing/.git/
 expecting success of 2103.1 'basics': 
@@ -95835,6 +96603,113 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2105-update-index-gitfile.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2104-update-index-skip-worktree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2082-parallel-checkout-attributes.sh ***
 expecting success of 2082.1 'parallel-checkout with ident': 
 	set_checkout_config 2 0 &&
@@ -96067,71 +96942,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2202-add-addremove.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2107-update-index-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2107-update-index-basic/.git/
 expecting success of 2107.1 'update-index --nonsense fails': 
@@ -96326,6 +97136,71 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2202-add-addremove.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2201-add-update-typechange.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2201-add-update-typechange/.git/
 expecting success of 2201.1 'setup': 
@@ -96825,22 +97700,22 @@
 	reset_files &&
 	update_assert_changed --refresh
 
---- .git/test-mtime-expect	2026-03-04 07:56:21.851352315 +0000
-+++ .git/test-mtime-actual	2026-03-04 07:56:21.863352315 +0000
+--- .git/test-mtime-expect	2025-01-30 02:08:56.447089911 +0000
++++ .git/test-mtime-actual	2025-01-30 02:08:56.463090007 +0000
 @@ -1 +1 @@
 -1234567890
-+1772610981
++1738202936
 ok 3 - --refresh should fix racy timestamp
 
 expecting success of 2108.4 '--really-refresh should fix racy timestamp': 
 	reset_files &&
 	update_assert_changed --really-refresh
 
---- .git/test-mtime-expect	2026-03-04 07:56:22.095352315 +0000
-+++ .git/test-mtime-actual	2026-03-04 07:56:22.107352315 +0000
+--- .git/test-mtime-expect	2025-01-30 02:08:56.787091950 +0000
++++ .git/test-mtime-actual	2025-01-30 02:08:56.799092022 +0000
 @@ -1 +1 @@
 -1234567890
-+1772610982
++1738202936
 ok 4 - --really-refresh should fix racy timestamp
 
 expecting success of 2108.5 '--refresh should fix racy timestamp if other file needs update': 
@@ -96850,11 +97725,11 @@
 	update_assert_changed --refresh
 
 other: needs update
---- .git/test-mtime-expect	2026-03-04 07:56:22.375352315 +0000
-+++ .git/test-mtime-actual	2026-03-04 07:56:22.387352315 +0000
+--- .git/test-mtime-expect	2025-01-30 02:08:57.183094324 +0000
++++ .git/test-mtime-actual	2025-01-30 02:08:57.199094420 +0000
 @@ -1 +1 @@
 -1234567890
-+1772610982
++1738202937
 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': 
@@ -96864,889 +97739,17 @@
 	update_assert_changed --refresh
 
 file: needs update
---- .git/test-mtime-expect	2026-03-04 07:56:22.671352315 +0000
-+++ .git/test-mtime-actual	2026-03-04 07:56:22.699352315 +0000
+--- .git/test-mtime-expect	2025-01-30 02:08:57.623096963 +0000
++++ .git/test-mtime-actual	2025-01-30 02:08:57.639097059 +0000
 @@ -1 +1 @@
 -1234567890
-+1772610982
++1738202937
 ok 6 - --refresh should fix racy timestamp if racy file needs update
 
 # passed all 6 test(s)
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1701-racy-split-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2205-add-worktree-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2205-add-worktree-config/.git/
 expecting success of 2205.1 '1a: setup--config worktree': 
@@ -98014,75 +98017,415 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2300-cd-to-toplevel.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t2203-add-intent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/.git/
+expecting success of 2203.1 'intent to add': 
+	test_commit 1 &&
+	git rm 1.t &&
+	echo hello >1.t &&
+	echo hello >file &&
+	echo hello >elif &&
+	git add -N file &&
+	git add elif &&
+	git add -N 1.t
 
-expecting success of 2300.2 'at physical subdir': 
-		(
-			cd 'repo/sub/dir' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 2 - at physical subdir
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+rm '1.t'
+ok 1 - intent to add
 
-checking prerequisite: SYMLINKS
+expecting success of 2203.2 'git status': 
+	git status --porcelain | grep -v actual >actual &&
+	cat >expect <<-\EOF &&
+	DA 1.t
+	A  elif
+	 A file
+	EOF
+	test_cmp expect actual
 
-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 2 - git status
 
-)
-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 2203.3 'git status with porcelain v2': 
+	git status --porcelain=v2 | grep -v "^?" >actual &&
+	nam1=$(echo 1 | git hash-object --stdin) &&
+	nam2=$(git hash-object elif) &&
+	cat >expect <<-EOF &&
+	1 DA N... 100644 000000 100644 $nam1 $ZERO_OID 1.t
+	1 A. N... 000000 100644 100644 $ZERO_OID $nam2 elif
+	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID file
+	EOF
+	test_cmp expect actual
 
-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
+ok 3 - git status with porcelain v2
 
-expecting success of 2300.5 'at internal symbolic subdir': 
-		(
-			cd 'internal-link' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 5 - at internal symbolic subdir
+expecting success of 2203.4 'check result of "add -N"': 
+	git ls-files -s file >actual &&
+	empty=$(git hash-object --stdin </dev/null) &&
+	echo "100644 $empty 0	file" >expect &&
+	test_cmp expect actual
 
-# passed all 5 test(s)
-1..5
+ok 4 - check result of "add -N"
+
+expecting success of 2203.5 'intent to add is just an ordinary empty blob': 
+	git add -u &&
+	git ls-files -s file >actual &&
+	git ls-files -s elif | sed -e "s/elif/file/" >expect &&
+	test_cmp expect actual
+
+ok 5 - intent to add is just an ordinary empty blob
+
+expecting success of 2203.6 'intent to add does not clobber existing paths': 
+	git add -N file elif &&
+	empty=$(git hash-object --stdin </dev/null) &&
+	git ls-files -s >actual &&
+	! grep "$empty" actual
+
+ok 6 - intent to add does not clobber existing paths
+
+expecting success of 2203.7 'i-t-a entry is simply ignored': 
+	test_tick &&
+	git commit -a -m initial &&
+	git reset --hard &&
+
+	echo xyzzy >rezrov &&
+	echo frotz >nitfol &&
+	git add rezrov &&
+	git add -N nitfol &&
+	git commit -m second &&
+	test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
+	test $(git diff --name-only HEAD -- nitfol | wc -l) = 1 &&
+	test $(git diff --name-only -- nitfol | wc -l) = 1
+
+[master b7cca08] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 elif
+ create mode 100644 file
+HEAD is now at b7cca08 initial
+[master b70ad0b] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 rezrov
+ok 7 - i-t-a entry is simply ignored
+
+expecting success of 2203.8 'can commit with an unrelated i-t-a entry in index': 
+	git reset --hard &&
+	echo bozbar >rezrov &&
+	echo frotz >nitfol &&
+	git add rezrov &&
+	git add -N nitfol &&
+	git commit -m partial rezrov
+
+HEAD is now at b70ad0b second
+[master 1ed15b5] partial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 8 - can commit with an unrelated i-t-a entry in index
+
+expecting success of 2203.9 'can "commit -a" with an i-t-a entry': 
+	git reset --hard &&
+	: >nitfol &&
+	git add -N nitfol &&
+	git commit -a -m all
+
+HEAD is now at 1ed15b5 partial
+[master 415f3ad] all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 nitfol
+ok 9 - can "commit -a" with an i-t-a entry
+
+expecting success of 2203.10 'cache-tree invalidates i-t-a paths': 
+	git reset --hard &&
+	mkdir dir &&
+	: >dir/foo &&
+	git add dir/foo &&
+	git commit -m foo &&
+
+	: >dir/bar &&
+	git add -N dir/bar &&
+	git diff --name-only >actual &&
+	echo dir/bar >expect &&
+	test_cmp expect actual &&
+
+	git write-tree >/dev/null &&
+
+	git diff --name-only >actual &&
+	echo dir/bar >expect &&
+	test_cmp expect actual
+
+HEAD is now at 415f3ad all
+[master 03f6a20] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir/foo
+ok 10 - cache-tree invalidates i-t-a paths
+
+expecting success of 2203.11 'cache-tree does not ignore dir that has i-t-a entries': 
+	git init ita-in-dir &&
+	(
+		cd ita-in-dir &&
+		mkdir 2 &&
+		for f in 1 2/1 2/2 3
+		do
+			echo "$f" >"$f" || return 1
+		done &&
+		git add 1 2/2 3 &&
+		git add -N 2/1 &&
+		git commit -m committed &&
+		git ls-tree -r HEAD >actual &&
+		grep 2/2 actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/ita-in-dir/.git/
+[master (root-commit) 7b0eb4f] committed
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 1
+ create mode 100644 2/2
+ create mode 100644 3
+100644 blob 6b8a6f549c42bad0c52be670caa297a269052aa7	2/2
+ok 11 - cache-tree does not ignore dir that has i-t-a entries
+
+expecting success of 2203.12 'cache-tree does skip dir that becomes empty': 
+	rm -fr ita-in-dir &&
+	git init ita-in-dir &&
+	(
+		cd ita-in-dir &&
+		mkdir -p 1/2/3 &&
+		echo 4 >1/2/3/4 &&
+		git add -N 1/2/3/4 &&
+		git write-tree >actual &&
+		echo $EMPTY_TREE >expected &&
+		test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/ita-in-dir/.git/
+ok 12 - cache-tree does skip dir that becomes empty
+
+expecting success of 2203.13 'commit: ita entries ignored in empty initial commit check': 
+	git init empty-initial-commit &&
+	(
+		cd empty-initial-commit &&
+		: >one &&
+		git add -N one &&
+		test_must_fail git commit -m nothing-new-here
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/empty-initial-commit/.git/
+On branch master
+
+Initial commit
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	new file:   one
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 13 - commit: ita entries ignored in empty initial commit check
+
+expecting success of 2203.14 'commit: ita entries ignored in empty commit check': 
+	git init empty-subsequent-commit &&
+	(
+		cd empty-subsequent-commit &&
+		test_commit one &&
+		: >two &&
+		git add -N two &&
+		test_must_fail git commit -m nothing-new-here
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/empty-subsequent-commit/.git/
+[master (root-commit) 4331c28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	new file:   two
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 14 - commit: ita entries ignored in empty commit check
+
+expecting success of 2203.15 'rename detection finds the right names': 
+	git init rename-detection &&
+	(
+		cd rename-detection &&
+		echo contents >first &&
+		git add first &&
+		git commit -m first &&
+		mv first third &&
+		git add -N third &&
+
+		git status | grep -v "^?" >actual.1 &&
+		test_grep "renamed: *first -> third" actual.1 &&
+
+		git status --porcelain | grep -v "^?" >actual.2 &&
+		cat >expected.2 <<-\EOF &&
+		 R first -> third
+		EOF
+		test_cmp expected.2 actual.2 &&
+
+		hash=$(git hash-object third) &&
+		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
+		cat >expected.3 <<-EOF &&
+		2 .R N... 100644 100644 100644 $hash $hash R100 third	first
+		EOF
+		test_cmp expected.3 actual.3 &&
+
+		git diff --stat >actual.4 &&
+		cat >expected.4 <<-EOF &&
+		 first => third | 0
+		 1 file changed, 0 insertions(+), 0 deletions(-)
+		EOF
+		test_cmp expected.4 actual.4 &&
+
+		git diff --cached --stat >actual.5 &&
+		test_must_be_empty actual.5
+
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/rename-detection/.git/
+[master (root-commit) 0bad72c] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first
+	renamed:    first -> third
+ok 15 - rename detection finds the right names
+
+expecting success of 2203.16 'double rename detection in status': 
+	git init rename-detection-2 &&
+	(
+		cd rename-detection-2 &&
+		echo contents >first &&
+		git add first &&
+		git commit -m first &&
+		git mv first second &&
+		mv second third &&
+		git add -N third &&
+
+		git status | grep -v "^?" >actual.1 &&
+		test_grep "renamed: *first -> second" actual.1 &&
+		test_grep "renamed: *second -> third" actual.1 &&
+
+		git status --porcelain | grep -v "^?" >actual.2 &&
+		cat >expected.2 <<-\EOF &&
+		R  first -> second
+		 R second -> third
+		EOF
+		test_cmp expected.2 actual.2 &&
+
+		hash=$(git hash-object third) &&
+		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
+		cat >expected.3 <<-EOF &&
+		2 R. N... 100644 100644 100644 $hash $hash R100 second	first
+		2 .R N... 100644 100644 100644 $hash $hash R100 third	second
+		EOF
+		test_cmp expected.3 actual.3
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/rename-detection-2/.git/
+[master (root-commit) 0bad72c] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first
+	renamed:    first -> second
+	renamed:    second -> third
+ok 16 - double rename detection in status
+
+expecting success of 2203.17 'i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"': 
+	git reset --hard &&
+	: >empty &&
+	content="foo" &&
+	echo "$content" >not-empty &&
+
+	hash_e=$(git hash-object empty) &&
+	hash_n=$(git hash-object not-empty) &&
+
+	cat >expect.diff_p <<-EOF &&
+	diff --git a/empty b/empty
+	new file mode 100644
+	index 0000000..$(git rev-parse --short $hash_e)
+	diff --git a/not-empty b/not-empty
+	new file mode 100644
+	index 0000000..$(git rev-parse --short $hash_n)
+	--- /dev/null
+	+++ b/not-empty
+	@@ -0,0 +1 @@
+	+$content
+	EOF
+	cat >expect.diff_s <<-EOF &&
+	 create mode 100644 empty
+	 create mode 100644 not-empty
+	EOF
+	cat >expect.diff_a <<-EOF &&
+	:000000 100644 0000000 0000000 A$(printf "\t")empty
+	:000000 100644 0000000 0000000 A$(printf "\t")not-empty
+	EOF
+
+	git add -N empty not-empty &&
+
+	git diff >actual &&
+	test_cmp expect.diff_p actual &&
+
+	git diff --summary >actual &&
+	test_cmp expect.diff_s actual &&
+
+	git diff-files -p >actual &&
+	test_cmp expect.diff_p actual &&
+
+	git diff-files --abbrev >actual &&
+	test_cmp expect.diff_a actual &&
+
+	git diff --cached >actual &&
+	test_must_be_empty actual
+
+HEAD is now at 03f6a20 foo
+ok 17 - i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"
+
+expecting success of 2203.18 '"diff HEAD" includes ita as new files': 
+	git reset --hard &&
+	echo new >new-ita &&
+	oid=$(git hash-object new-ita) &&
+	oid=$(git rev-parse --short $oid) &&
+	git add -N new-ita &&
+	git diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/new-ita b/new-ita
+	new file mode 100644
+	index 0000000..$oid
+	--- /dev/null
+	+++ b/new-ita
+	@@ -0,0 +1 @@
+	+new
+	EOF
+	test_cmp expected actual
+
+HEAD is now at 03f6a20 foo
+ok 18 - "diff HEAD" includes ita as new files
+
+expecting success of 2203.19 'apply --intent-to-add': 
+	git reset --hard &&
+	echo new >new-ita &&
+	git add -N new-ita &&
+	git diff >expected &&
+	grep "new file" expected &&
+	git reset --hard &&
+	git apply --intent-to-add expected &&
+	git diff >actual &&
+	test_cmp expected actual
+
+HEAD is now at 03f6a20 foo
+new file mode 100644
+HEAD is now at 03f6a20 foo
+ok 19 - apply --intent-to-add
+
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2204-add-ignored.sh ***
@@ -98459,415 +98802,75 @@
 1..47
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2203-add-intent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/.git/
-expecting success of 2203.1 'intent to add': 
-	test_commit 1 &&
-	git rm 1.t &&
-	echo hello >1.t &&
-	echo hello >file &&
-	echo hello >elif &&
-	git add -N file &&
-	git add elif &&
-	git add -N 1.t
-
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-rm '1.t'
-ok 1 - intent to add
-
-expecting success of 2203.2 'git status': 
-	git status --porcelain | grep -v actual >actual &&
-	cat >expect <<-\EOF &&
-	DA 1.t
-	A  elif
-	 A file
-	EOF
-	test_cmp expect actual
-
-ok 2 - git status
-
-expecting success of 2203.3 'git status with porcelain v2': 
-	git status --porcelain=v2 | grep -v "^?" >actual &&
-	nam1=$(echo 1 | git hash-object --stdin) &&
-	nam2=$(git hash-object elif) &&
-	cat >expect <<-EOF &&
-	1 DA N... 100644 000000 100644 $nam1 $ZERO_OID 1.t
-	1 A. N... 000000 100644 100644 $ZERO_OID $nam2 elif
-	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID file
-	EOF
-	test_cmp expect actual
-
-ok 3 - git status with porcelain v2
-
-expecting success of 2203.4 'check result of "add -N"': 
-	git ls-files -s file >actual &&
-	empty=$(git hash-object --stdin </dev/null) &&
-	echo "100644 $empty 0	file" >expect &&
-	test_cmp expect actual
-
-ok 4 - check result of "add -N"
-
-expecting success of 2203.5 'intent to add is just an ordinary empty blob': 
-	git add -u &&
-	git ls-files -s file >actual &&
-	git ls-files -s elif | sed -e "s/elif/file/" >expect &&
-	test_cmp expect actual
-
-ok 5 - intent to add is just an ordinary empty blob
-
-expecting success of 2203.6 'intent to add does not clobber existing paths': 
-	git add -N file elif &&
-	empty=$(git hash-object --stdin </dev/null) &&
-	git ls-files -s >actual &&
-	! grep "$empty" actual
-
-ok 6 - intent to add does not clobber existing paths
-
-expecting success of 2203.7 'i-t-a entry is simply ignored': 
-	test_tick &&
-	git commit -a -m initial &&
-	git reset --hard &&
-
-	echo xyzzy >rezrov &&
-	echo frotz >nitfol &&
-	git add rezrov &&
-	git add -N nitfol &&
-	git commit -m second &&
-	test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
-	test $(git diff --name-only HEAD -- nitfol | wc -l) = 1 &&
-	test $(git diff --name-only -- nitfol | wc -l) = 1
-
-[master b7cca08] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 elif
- create mode 100644 file
-HEAD is now at b7cca08 initial
-[master b70ad0b] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 rezrov
-ok 7 - i-t-a entry is simply ignored
-
-expecting success of 2203.8 'can commit with an unrelated i-t-a entry in index': 
-	git reset --hard &&
-	echo bozbar >rezrov &&
-	echo frotz >nitfol &&
-	git add rezrov &&
-	git add -N nitfol &&
-	git commit -m partial rezrov
-
-HEAD is now at b70ad0b second
-[master 1ed15b5] partial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 8 - can commit with an unrelated i-t-a entry in index
-
-expecting success of 2203.9 'can "commit -a" with an i-t-a entry': 
-	git reset --hard &&
-	: >nitfol &&
-	git add -N nitfol &&
-	git commit -a -m all
-
-HEAD is now at 1ed15b5 partial
-[master 415f3ad] all
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 nitfol
-ok 9 - can "commit -a" with an i-t-a entry
-
-expecting success of 2203.10 'cache-tree invalidates i-t-a paths': 
-	git reset --hard &&
-	mkdir dir &&
-	: >dir/foo &&
-	git add dir/foo &&
-	git commit -m foo &&
-
-	: >dir/bar &&
-	git add -N dir/bar &&
-	git diff --name-only >actual &&
-	echo dir/bar >expect &&
-	test_cmp expect actual &&
-
-	git write-tree >/dev/null &&
-
-	git diff --name-only >actual &&
-	echo dir/bar >expect &&
-	test_cmp expect actual
-
-HEAD is now at 415f3ad all
-[master 03f6a20] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir/foo
-ok 10 - cache-tree invalidates i-t-a paths
-
-expecting success of 2203.11 'cache-tree does not ignore dir that has i-t-a entries': 
-	git init ita-in-dir &&
-	(
-		cd ita-in-dir &&
-		mkdir 2 &&
-		for f in 1 2/1 2/2 3
-		do
-			echo "$f" >"$f" || return 1
-		done &&
-		git add 1 2/2 3 &&
-		git add -N 2/1 &&
-		git commit -m committed &&
-		git ls-tree -r HEAD >actual &&
-		grep 2/2 actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/ita-in-dir/.git/
-[master (root-commit) 7b0eb4f] committed
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 1
- create mode 100644 2/2
- create mode 100644 3
-100644 blob 6b8a6f549c42bad0c52be670caa297a269052aa7	2/2
-ok 11 - cache-tree does not ignore dir that has i-t-a entries
-
-expecting success of 2203.12 'cache-tree does skip dir that becomes empty': 
-	rm -fr ita-in-dir &&
-	git init ita-in-dir &&
-	(
-		cd ita-in-dir &&
-		mkdir -p 1/2/3 &&
-		echo 4 >1/2/3/4 &&
-		git add -N 1/2/3/4 &&
-		git write-tree >actual &&
-		echo $EMPTY_TREE >expected &&
-		test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/ita-in-dir/.git/
-ok 12 - cache-tree does skip dir that becomes empty
-
-expecting success of 2203.13 'commit: ita entries ignored in empty initial commit check': 
-	git init empty-initial-commit &&
-	(
-		cd empty-initial-commit &&
-		: >one &&
-		git add -N one &&
-		test_must_fail git commit -m nothing-new-here
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/empty-initial-commit/.git/
-On branch master
-
-Initial commit
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	new file:   one
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 13 - commit: ita entries ignored in empty initial commit check
-
-expecting success of 2203.14 'commit: ita entries ignored in empty commit check': 
-	git init empty-subsequent-commit &&
-	(
-		cd empty-subsequent-commit &&
-		test_commit one &&
-		: >two &&
-		git add -N two &&
-		test_must_fail git commit -m nothing-new-here
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/empty-subsequent-commit/.git/
-[master (root-commit) 4331c28] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	new file:   two
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 14 - commit: ita entries ignored in empty commit check
-
-expecting success of 2203.15 'rename detection finds the right names': 
-	git init rename-detection &&
-	(
-		cd rename-detection &&
-		echo contents >first &&
-		git add first &&
-		git commit -m first &&
-		mv first third &&
-		git add -N third &&
-
-		git status | grep -v "^?" >actual.1 &&
-		test_grep "renamed: *first -> third" actual.1 &&
-
-		git status --porcelain | grep -v "^?" >actual.2 &&
-		cat >expected.2 <<-\EOF &&
-		 R first -> third
-		EOF
-		test_cmp expected.2 actual.2 &&
-
-		hash=$(git hash-object third) &&
-		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
-		cat >expected.3 <<-EOF &&
-		2 .R N... 100644 100644 100644 $hash $hash R100 third	first
-		EOF
-		test_cmp expected.3 actual.3 &&
-
-		git diff --stat >actual.4 &&
-		cat >expected.4 <<-EOF &&
-		 first => third | 0
-		 1 file changed, 0 insertions(+), 0 deletions(-)
-		EOF
-		test_cmp expected.4 actual.4 &&
-
-		git diff --cached --stat >actual.5 &&
-		test_must_be_empty actual.5
-
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/rename-detection/.git/
-[master (root-commit) 0bad72c] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first
-	renamed:    first -> third
-ok 15 - rename detection finds the right names
-
-expecting success of 2203.16 'double rename detection in status': 
-	git init rename-detection-2 &&
-	(
-		cd rename-detection-2 &&
-		echo contents >first &&
-		git add first &&
-		git commit -m first &&
-		git mv first second &&
-		mv second third &&
-		git add -N third &&
-
-		git status | grep -v "^?" >actual.1 &&
-		test_grep "renamed: *first -> second" actual.1 &&
-		test_grep "renamed: *second -> third" actual.1 &&
-
-		git status --porcelain | grep -v "^?" >actual.2 &&
-		cat >expected.2 <<-\EOF &&
-		R  first -> second
-		 R second -> third
-		EOF
-		test_cmp expected.2 actual.2 &&
-
-		hash=$(git hash-object third) &&
-		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
-		cat >expected.3 <<-EOF &&
-		2 R. N... 100644 100644 100644 $hash $hash R100 second	first
-		2 .R N... 100644 100644 100644 $hash $hash R100 third	second
-		EOF
-		test_cmp expected.3 actual.3
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2203-add-intent/rename-detection-2/.git/
-[master (root-commit) 0bad72c] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first
-	renamed:    first -> second
-	renamed:    second -> third
-ok 16 - double rename detection in status
-
-expecting success of 2203.17 'i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"': 
-	git reset --hard &&
-	: >empty &&
-	content="foo" &&
-	echo "$content" >not-empty &&
-
-	hash_e=$(git hash-object empty) &&
-	hash_n=$(git hash-object not-empty) &&
-
-	cat >expect.diff_p <<-EOF &&
-	diff --git a/empty b/empty
-	new file mode 100644
-	index 0000000..$(git rev-parse --short $hash_e)
-	diff --git a/not-empty b/not-empty
-	new file mode 100644
-	index 0000000..$(git rev-parse --short $hash_n)
-	--- /dev/null
-	+++ b/not-empty
-	@@ -0,0 +1 @@
-	+$content
-	EOF
-	cat >expect.diff_s <<-EOF &&
-	 create mode 100644 empty
-	 create mode 100644 not-empty
-	EOF
-	cat >expect.diff_a <<-EOF &&
-	:000000 100644 0000000 0000000 A$(printf "\t")empty
-	:000000 100644 0000000 0000000 A$(printf "\t")not-empty
-	EOF
-
-	git add -N empty not-empty &&
-
-	git diff >actual &&
-	test_cmp expect.diff_p actual &&
-
-	git diff --summary >actual &&
-	test_cmp expect.diff_s actual &&
-
-	git diff-files -p >actual &&
-	test_cmp expect.diff_p actual &&
-
-	git diff-files --abbrev >actual &&
-	test_cmp expect.diff_a actual &&
+*** t2300-cd-to-toplevel.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	git diff --cached >actual &&
-	test_must_be_empty actual
+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
 
-HEAD is now at 03f6a20 foo
-ok 17 - i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"
+checking prerequisite: SYMLINKS
 
-expecting success of 2203.18 '"diff HEAD" includes ita as new files': 
-	git reset --hard &&
-	echo new >new-ita &&
-	oid=$(git hash-object new-ita) &&
-	oid=$(git rev-parse --short $oid) &&
-	git add -N new-ita &&
-	git diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/new-ita b/new-ita
-	new file mode 100644
-	index 0000000..$oid
-	--- /dev/null
-	+++ b/new-ita
-	@@ -0,0 +1 @@
-	+new
-	EOF
-	test_cmp expected actual
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-HEAD is now at 03f6a20 foo
-ok 18 - "diff HEAD" includes ita as new files
+)
+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 2203.19 'apply --intent-to-add': 
-	git reset --hard &&
-	echo new >new-ita &&
-	git add -N new-ita &&
-	git diff >expected &&
-	grep "new file" expected &&
-	git reset --hard &&
-	git apply --intent-to-add expected &&
-	git diff >actual &&
-	test_cmp expected actual
+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
 
-HEAD is now at 03f6a20 foo
-new file mode 100644
-HEAD is now at 03f6a20 foo
-ok 19 - apply --intent-to-add
+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 19 test(s)
-1..19
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2401-worktree-prune.sh ***
@@ -100919,6 +100922,551 @@
 1..68
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2405-worktree-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2405-worktree-submodule/origin/sub/.git/
+[main (root-commit) 69af168] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.t
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2405-worktree-submodule/origin/main/.git/
+[main (root-commit) 1e96f59] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t2405-worktree-submodule/origin/main/sub'...
+done.
+[main 322c452] add sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[main 7829796] file1 updated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+From /build/reproducible-path/git-2.47.2/t/trash directory.t2405-worktree-submodule/origin/sub
+   69af168..7829796  main         -> origin/main
+ * [new tag]         file1updated -> file1updated
+Updating 69af168..7829796
+Fast-forward
+ file1 | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[main d717f19] sub updated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup: create origin repos
+
+expecting success of 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.47.2/t/trash directory.t2405-worktree-submodule/origin/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2403-worktree-move.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+ 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.47.2/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.47.2/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.47.2/t/trash directory.t2403-worktree-move/withsub/.git/
+[master (root-commit) 5e30013] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t2403-worktree-move/withsub/sub'...
+done.
+[master 0d455cb] withsub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Preparing worktree (detached HEAD 0d455cb)
+HEAD is now at 0d455cb 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.47.2/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.47.2/t/trash directory.t2403-worktree-move/moog/.git/
+[master (root-commit) 89d547b] bim
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bim.t
+Preparing worktree (detached HEAD 89d547b)
+HEAD is now at 89d547b bim
+ok 29 - remove cleans up .git/worktrees when empty
+
+expecting success of 2403.30 'remove a repo with uninitialized submodule': 
+	test_config_global protocol.file.allow always &&
+	(
+		cd withsub &&
+		git worktree add to-remove HEAD &&
+		git worktree remove to-remove
+	)
+
+Preparing worktree (detached HEAD 0d455cb)
+HEAD is now at 0d455cb 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 0d455cb)
+HEAD is now at 0d455cb withsub
+Cloning into '/build/reproducible-path/git-2.47.2/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
+
+# passed all 31 test(s)
+1..31
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2406-worktree-repair.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2406-worktree-repair/.git/
 expecting success of 2406.1 'setup': 
@@ -101586,551 +102134,6 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2403-worktree-move.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
- 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.47.2/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.47.2/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.47.2/t/trash directory.t2403-worktree-move/withsub/.git/
-[master (root-commit) 5e30013] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t2403-worktree-move/withsub/sub'...
-done.
-[master 0d455cb] withsub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Preparing worktree (detached HEAD 0d455cb)
-HEAD is now at 0d455cb 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.47.2/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.47.2/t/trash directory.t2403-worktree-move/moog/.git/
-[master (root-commit) 89d547b] bim
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bim.t
-Preparing worktree (detached HEAD 89d547b)
-HEAD is now at 89d547b bim
-ok 29 - remove cleans up .git/worktrees when empty
-
-expecting success of 2403.30 'remove a repo with uninitialized submodule': 
-	test_config_global protocol.file.allow always &&
-	(
-		cd withsub &&
-		git worktree add to-remove HEAD &&
-		git worktree remove to-remove
-	)
-
-Preparing worktree (detached HEAD 0d455cb)
-HEAD is now at 0d455cb 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 0d455cb)
-HEAD is now at 0d455cb withsub
-Cloning into '/build/reproducible-path/git-2.47.2/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
-
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2405-worktree-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2405-worktree-submodule/origin/sub/.git/
-[main (root-commit) 69af168] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.t
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2405-worktree-submodule/origin/main/.git/
-[main (root-commit) 1e96f59] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t2405-worktree-submodule/origin/main/sub'...
-done.
-[main 322c452] add sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[main 7829796] file1 updated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-From /build/reproducible-path/git-2.47.2/t/trash directory.t2405-worktree-submodule/origin/sub
-   69af168..7829796  main         -> origin/main
- * [new tag]         file1updated -> file1updated
-Updating 69af168..7829796
-Fast-forward
- file1 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[main d717f19] sub updated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup: create origin repos
-
-expecting success of 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.47.2/t/trash directory.t2405-worktree-submodule/origin/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3002-ls-files-dashpath.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3002-ls-files-dashpath/.git/
 expecting success of 3002.1 'setup': 
@@ -102201,6 +102204,362 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t2407-worktree-heads.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/.git/
+expecting success of 2407.1 'setup': 
+	test_commit init &&
+
+	for i in 1 2 3 4
+	do
+		git checkout -b conflict-$i &&
+		echo "not I" >$i.t &&
+		git add $i.t &&
+		git commit -m "will conflict" &&
+
+		git checkout - &&
+		test_commit $i &&
+		git branch wt-$i &&
+		git branch fake-$i &&
+		git worktree add wt-$i wt-$i || return 1
+	done &&
+
+	# Create a server that updates each branch by one commit
+	git init server &&
+	test_commit -C server initial &&
+	git remote add server ./server &&
+	for i in 1 2 3 4
+	do
+		git -C server checkout -b wt-$i &&
+		test_commit -C server A-$i || return 1
+	done &&
+	for i in 1 2
+	do
+		git -C server checkout -b fake-$i &&
+		test_commit -C server f-$i || return 1
+	done
+
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Switched to a new branch 'conflict-1'
+[conflict-1 0bd9076] will conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+Switched to branch 'master'
+[master dd232bf] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+Preparing worktree (checking out 'wt-1')
+HEAD is now at dd232bf 1
+Switched to a new branch 'conflict-2'
+[conflict-2 881ff7f] will conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+Switched to branch 'master'
+[master 8f55bc3] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+Preparing worktree (checking out 'wt-2')
+HEAD is now at 8f55bc3 2
+Switched to a new branch 'conflict-3'
+[conflict-3 016e7ca] will conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+Switched to branch 'master'
+[master 4c93b0a] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+Preparing worktree (checking out 'wt-3')
+HEAD is now at 4c93b0a 3
+Switched to a new branch 'conflict-4'
+[conflict-4 11365f4] will conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+Switched to branch 'master'
+[master 3fbd4b0] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+Preparing worktree (checking out 'wt-4')
+HEAD is now at 3fbd4b0 4
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/server/.git/
+[master (root-commit) 31243c6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'wt-1'
+[wt-1 4e3ca6d] A-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A-1.t
+Switched to a new branch 'wt-2'
+[wt-2 3582f45] A-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A-2.t
+Switched to a new branch 'wt-3'
+[wt-3 b62f76d] A-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A-3.t
+Switched to a new branch 'wt-4'
+[wt-4 5e1557d] A-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A-4.t
+Switched to a new branch 'fake-1'
+[fake-1 ae0524d] f-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f-1.t
+Switched to a new branch 'fake-2'
+[fake-2 8b85f46] f-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f-2.t
+ok 1 - setup
+
+expecting success of 2407.2 'refuse to overwrite: checked out in worktree': 
+	for i in 1 2 3 4
+	do
+		test_must_fail git branch -f wt-$i HEAD 2>err &&
+		grep "cannot force update the branch" err &&
+
+		test_must_fail git branch -D wt-$i 2>err &&
+		grep "cannot delete branch" err || return 1
+	done
+
+fatal: cannot force update the branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/wt-1'
+error: cannot delete branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2407-worktree-heads/wt-2'
+error: cannot delete branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2407-worktree-heads/wt-3'
+error: cannot delete branch 'wt-3' used by worktree at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2407-worktree-heads/wt-4'
+error: cannot delete branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/wt-4'
+ok 2 - refuse to overwrite: checked out in worktree
+
+expecting success of 2407.3 'refuse to overwrite: worktree in bisect': 
+	test_when_finished git -C wt-4 bisect reset &&
+
+	# Set up a bisect so HEAD no longer points to wt-4.
+	git -C wt-4 bisect start &&
+	git -C wt-4 bisect bad wt-4 &&
+	git -C wt-4 bisect good wt-1 &&
+
+	test_must_fail git branch -f wt-4 HEAD 2>err &&
+	grep "cannot force update the branch 'wt-4' used by worktree at.*wt-4" err
+
+status: waiting for both good and bad commits
+status: waiting for good commit(s), bad commit known
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[4c93b0a8594e03729f8d4346495db54cf8d767e9] 3
+fatal: cannot force update the branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/wt-4'
+Previous HEAD position was 4c93b0a 3
+Switched to branch 'wt-4'
+ok 3 - refuse to overwrite: worktree in bisect
+
+expecting success of 2407.4 'refuse to overwrite: worktree in rebase (apply)': 
+	test_when_finished git -C wt-2 rebase --abort &&
+
+	# This will fail part-way through due to a conflict.
+	test_must_fail git -C wt-2 rebase --apply conflict-2 &&
+
+	test_must_fail git branch -f wt-2 HEAD 2>err &&
+	grep "cannot force update the branch 'wt-2' used by worktree at.*wt-2" err
+
+First, rewinding head to replay your work on top of it...
+Applying: 2
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+881ff7f will conflict
+virtual 2
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in 2.t
+Auto-merging 2.t
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config 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.47.2/t/trash directory.t2407-worktree-heads/wt-2'
+ok 4 - refuse to overwrite: worktree in rebase (apply)
+
+expecting success of 2407.5 'refuse to overwrite: worktree in rebase (merge)': 
+	test_when_finished git -C wt-2 rebase --abort &&
+
+	# This will fail part-way through due to a conflict.
+	test_must_fail git -C wt-2 rebase conflict-2 &&
+
+	test_must_fail git branch -f wt-2 HEAD 2>err &&
+	grep "cannot force update the branch 'wt-2' used by worktree at.*wt-2" err
+
+Rebasing (1/1)
Auto-merging 2.t
+CONFLICT (add/add): Merge conflict in 2.t
+error: could not apply 8f55bc3... 2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config 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.47.2/t/trash directory.t2407-worktree-heads/wt-2'
+ok 5 - refuse to overwrite: worktree in rebase (merge)
+
+expecting success of 2407.6 'refuse to overwrite: worktree in rebase with --update-refs': 
+	test_when_finished git -C wt-3 rebase --abort &&
+
+	git branch -f can-be-updated wt-3 &&
+	test_must_fail git -C wt-3 rebase --update-refs conflict-3 &&
+
+	for i in 3 4
+	do
+		test_must_fail git branch -f can-be-updated HEAD 2>err &&
+		grep "cannot force update the branch 'can-be-updated' used by worktree at.*wt-3" err ||
+			return 1
+	done
+
+Rebasing (1/3)
Auto-merging 3.t
+CONFLICT (add/add): Merge conflict in 3.t
+error: could not apply 4c93b0a... 3
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config 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.47.2/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.47.2/t/trash directory.t2407-worktree-heads/wt-3'
+ok 6 - refuse to overwrite: worktree in rebase with --update-refs
+
+expecting success of 2407.7 'refuse to fetch over ref: checked out': 
+	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
+	grep "refusing to fetch into branch 'refs/heads/wt-3'" err &&
+
+	# General fetch into refs/heads/ will fail on first ref,
+	# so use a generic error message check.
+	test_must_fail git fetch server +refs/heads/*:refs/heads/* 2>err &&
+	grep "refusing to fetch into branch" err
+
+fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2407-worktree-heads'
+ok 7 - refuse to fetch over ref: checked out
+
+expecting success of 2407.8 'refuse to fetch over ref: worktree in bisect': 
+	test_when_finished git -C wt-4 bisect reset &&
+
+	# Set up a bisect so HEAD no longer points to wt-4.
+	git -C wt-4 bisect start &&
+	git -C wt-4 bisect bad wt-4 &&
+	git -C wt-4 bisect good wt-1 &&
+
+	test_must_fail git fetch server +refs/heads/wt-4:refs/heads/wt-4 2>err &&
+	grep "refusing to fetch into branch" err
+
+status: waiting for both good and bad commits
+status: waiting for good commit(s), bad commit known
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[4c93b0a8594e03729f8d4346495db54cf8d767e9] 3
+fatal: refusing to fetch into branch 'refs/heads/wt-4' checked out at '/build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/wt-4'
+Previous HEAD position was 4c93b0a 3
+Switched to branch 'wt-4'
+ok 8 - refuse to fetch over ref: worktree in bisect
+
+expecting success of 2407.9 'refuse to fetch over ref: worktree in rebase': 
+	test_when_finished git -C wt-3 rebase --abort &&
+
+	# This will fail part-way through due to a conflict.
+	test_must_fail git -C wt-3 rebase conflict-3 &&
+
+	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
+	grep "refusing to fetch into branch" err
+
+Rebasing (1/1)
Auto-merging 3.t
+CONFLICT (add/add): Merge conflict in 3.t
+error: could not apply 4c93b0a... 3
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config 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.47.2/t/trash directory.t2407-worktree-heads/wt-3'
+ok 9 - refuse to fetch over ref: worktree in rebase
+
+expecting success of 2407.10 'refuse to overwrite when in error states': 
+	test_when_finished rm -rf .git/worktrees/wt-*/rebase-merge &&
+	test_when_finished rm -rf .git/worktrees/wt-*/BISECT_* &&
+
+	# Both branches are currently under rebase.
+	mkdir -p .git/worktrees/wt-3/rebase-merge &&
+	touch .git/worktrees/wt-3/rebase-merge/interactive &&
+	echo refs/heads/fake-1 >.git/worktrees/wt-3/rebase-merge/head-name &&
+	echo refs/heads/fake-2 >.git/worktrees/wt-3/rebase-merge/onto &&
+	mkdir -p .git/worktrees/wt-4/rebase-merge &&
+	touch .git/worktrees/wt-4/rebase-merge/interactive &&
+	echo refs/heads/fake-2 >.git/worktrees/wt-4/rebase-merge/head-name &&
+	echo refs/heads/fake-1 >.git/worktrees/wt-4/rebase-merge/onto &&
+
+	# Both branches are currently under bisect.
+	touch .git/worktrees/wt-4/BISECT_LOG &&
+	echo refs/heads/fake-2 >.git/worktrees/wt-4/BISECT_START &&
+	touch .git/worktrees/wt-1/BISECT_LOG &&
+	echo refs/heads/fake-1 >.git/worktrees/wt-1/BISECT_START &&
+
+	for i in 1 2
+	do
+		test_must_fail git branch -f fake-$i HEAD 2>err &&
+		grep "cannot force update the branch 'fake-$i' used by worktree at" err ||
+			return 1
+	done
+
+fatal: cannot force update the branch 'fake-1' used by worktree at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2407-worktree-heads/wt-4'
+ok 10 - refuse to overwrite when in error states
+
+expecting success of 2407.11 'refuse to overwrite during rebase with --update-refs': 
+	git commit --fixup HEAD~2 --allow-empty &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --update-refs HEAD~3 >todo &&
+		! grep "update-refs" todo
+	) &&
+	git branch -f allow-update HEAD~2 &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --update-refs HEAD~3 >todo &&
+		grep "update-ref refs/heads/allow-update" todo
+	)
+
+[master 3e1ca9c] fixup! 2
+ Author: A U Thor <author@example.com>
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+update-ref refs/heads/allow-update
+ok 11 - refuse to overwrite during rebase with --update-refs
+
+expecting success of 2407.12 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
+
+ok 12 - $EDITOR and friends are unchanged
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2080-parallel-checkout-basics.sh ***
 expecting success of 2080.1 'setup repo for checkout with various types of changes': 
 	test_config_global protocol.file.allow always &&
@@ -102663,362 +103022,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t2407-worktree-heads.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/.git/
-expecting success of 2407.1 'setup': 
-	test_commit init &&
-
-	for i in 1 2 3 4
-	do
-		git checkout -b conflict-$i &&
-		echo "not I" >$i.t &&
-		git add $i.t &&
-		git commit -m "will conflict" &&
-
-		git checkout - &&
-		test_commit $i &&
-		git branch wt-$i &&
-		git branch fake-$i &&
-		git worktree add wt-$i wt-$i || return 1
-	done &&
-
-	# Create a server that updates each branch by one commit
-	git init server &&
-	test_commit -C server initial &&
-	git remote add server ./server &&
-	for i in 1 2 3 4
-	do
-		git -C server checkout -b wt-$i &&
-		test_commit -C server A-$i || return 1
-	done &&
-	for i in 1 2
-	do
-		git -C server checkout -b fake-$i &&
-		test_commit -C server f-$i || return 1
-	done
-
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Switched to a new branch 'conflict-1'
-[conflict-1 0bd9076] will conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Switched to branch 'master'
-[master dd232bf] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Preparing worktree (checking out 'wt-1')
-HEAD is now at dd232bf 1
-Switched to a new branch 'conflict-2'
-[conflict-2 881ff7f] will conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Switched to branch 'master'
-[master 8f55bc3] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Preparing worktree (checking out 'wt-2')
-HEAD is now at 8f55bc3 2
-Switched to a new branch 'conflict-3'
-[conflict-3 016e7ca] will conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-Switched to branch 'master'
-[master 4c93b0a] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-Preparing worktree (checking out 'wt-3')
-HEAD is now at 4c93b0a 3
-Switched to a new branch 'conflict-4'
-[conflict-4 11365f4] will conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-Switched to branch 'master'
-[master 3fbd4b0] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-Preparing worktree (checking out 'wt-4')
-HEAD is now at 3fbd4b0 4
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/server/.git/
-[master (root-commit) 31243c6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'wt-1'
-[wt-1 4e3ca6d] A-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A-1.t
-Switched to a new branch 'wt-2'
-[wt-2 3582f45] A-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A-2.t
-Switched to a new branch 'wt-3'
-[wt-3 b62f76d] A-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A-3.t
-Switched to a new branch 'wt-4'
-[wt-4 5e1557d] A-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A-4.t
-Switched to a new branch 'fake-1'
-[fake-1 ae0524d] f-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f-1.t
-Switched to a new branch 'fake-2'
-[fake-2 8b85f46] f-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f-2.t
-ok 1 - setup
-
-expecting success of 2407.2 'refuse to overwrite: checked out in worktree': 
-	for i in 1 2 3 4
-	do
-		test_must_fail git branch -f wt-$i HEAD 2>err &&
-		grep "cannot force update the branch" err &&
-
-		test_must_fail git branch -D wt-$i 2>err &&
-		grep "cannot delete branch" err || return 1
-	done
-
-fatal: cannot force update the branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/wt-1'
-error: cannot delete branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2407-worktree-heads/wt-2'
-error: cannot delete branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2407-worktree-heads/wt-3'
-error: cannot delete branch 'wt-3' used by worktree at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2407-worktree-heads/wt-4'
-error: cannot delete branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/wt-4'
-ok 2 - refuse to overwrite: checked out in worktree
-
-expecting success of 2407.3 'refuse to overwrite: worktree in bisect': 
-	test_when_finished git -C wt-4 bisect reset &&
-
-	# Set up a bisect so HEAD no longer points to wt-4.
-	git -C wt-4 bisect start &&
-	git -C wt-4 bisect bad wt-4 &&
-	git -C wt-4 bisect good wt-1 &&
-
-	test_must_fail git branch -f wt-4 HEAD 2>err &&
-	grep "cannot force update the branch 'wt-4' used by worktree at.*wt-4" err
-
-status: waiting for both good and bad commits
-status: waiting for good commit(s), bad commit known
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[4c93b0a8594e03729f8d4346495db54cf8d767e9] 3
-fatal: cannot force update the branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/wt-4'
-Previous HEAD position was 4c93b0a 3
-Switched to branch 'wt-4'
-ok 3 - refuse to overwrite: worktree in bisect
-
-expecting success of 2407.4 'refuse to overwrite: worktree in rebase (apply)': 
-	test_when_finished git -C wt-2 rebase --abort &&
-
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-2 rebase --apply conflict-2 &&
-
-	test_must_fail git branch -f wt-2 HEAD 2>err &&
-	grep "cannot force update the branch 'wt-2' used by worktree at.*wt-2" err
-
-First, rewinding head to replay your work on top of it...
-Applying: 2
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-881ff7f will conflict
-virtual 2
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in 2.t
-Auto-merging 2.t
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config 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.47.2/t/trash directory.t2407-worktree-heads/wt-2'
-ok 4 - refuse to overwrite: worktree in rebase (apply)
-
-expecting success of 2407.5 'refuse to overwrite: worktree in rebase (merge)': 
-	test_when_finished git -C wt-2 rebase --abort &&
-
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-2 rebase conflict-2 &&
-
-	test_must_fail git branch -f wt-2 HEAD 2>err &&
-	grep "cannot force update the branch 'wt-2' used by worktree at.*wt-2" err
-
-Rebasing (1/1)
Auto-merging 2.t
-CONFLICT (add/add): Merge conflict in 2.t
-error: could not apply 8f55bc3... 2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config 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.47.2/t/trash directory.t2407-worktree-heads/wt-2'
-ok 5 - refuse to overwrite: worktree in rebase (merge)
-
-expecting success of 2407.6 'refuse to overwrite: worktree in rebase with --update-refs': 
-	test_when_finished git -C wt-3 rebase --abort &&
-
-	git branch -f can-be-updated wt-3 &&
-	test_must_fail git -C wt-3 rebase --update-refs conflict-3 &&
-
-	for i in 3 4
-	do
-		test_must_fail git branch -f can-be-updated HEAD 2>err &&
-		grep "cannot force update the branch 'can-be-updated' used by worktree at.*wt-3" err ||
-			return 1
-	done
-
-Rebasing (1/3)
Auto-merging 3.t
-CONFLICT (add/add): Merge conflict in 3.t
-error: could not apply 4c93b0a... 3
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config 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.47.2/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.47.2/t/trash directory.t2407-worktree-heads/wt-3'
-ok 6 - refuse to overwrite: worktree in rebase with --update-refs
-
-expecting success of 2407.7 'refuse to fetch over ref: checked out': 
-	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
-	grep "refusing to fetch into branch 'refs/heads/wt-3'" err &&
-
-	# General fetch into refs/heads/ will fail on first ref,
-	# so use a generic error message check.
-	test_must_fail git fetch server +refs/heads/*:refs/heads/* 2>err &&
-	grep "refusing to fetch into branch" err
-
-fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2407-worktree-heads'
-ok 7 - refuse to fetch over ref: checked out
-
-expecting success of 2407.8 'refuse to fetch over ref: worktree in bisect': 
-	test_when_finished git -C wt-4 bisect reset &&
-
-	# Set up a bisect so HEAD no longer points to wt-4.
-	git -C wt-4 bisect start &&
-	git -C wt-4 bisect bad wt-4 &&
-	git -C wt-4 bisect good wt-1 &&
-
-	test_must_fail git fetch server +refs/heads/wt-4:refs/heads/wt-4 2>err &&
-	grep "refusing to fetch into branch" err
-
-status: waiting for both good and bad commits
-status: waiting for good commit(s), bad commit known
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[4c93b0a8594e03729f8d4346495db54cf8d767e9] 3
-fatal: refusing to fetch into branch 'refs/heads/wt-4' checked out at '/build/reproducible-path/git-2.47.2/t/trash directory.t2407-worktree-heads/wt-4'
-Previous HEAD position was 4c93b0a 3
-Switched to branch 'wt-4'
-ok 8 - refuse to fetch over ref: worktree in bisect
-
-expecting success of 2407.9 'refuse to fetch over ref: worktree in rebase': 
-	test_when_finished git -C wt-3 rebase --abort &&
-
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-3 rebase conflict-3 &&
-
-	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
-	grep "refusing to fetch into branch" err
-
-Rebasing (1/1)
Auto-merging 3.t
-CONFLICT (add/add): Merge conflict in 3.t
-error: could not apply 4c93b0a... 3
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config 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.47.2/t/trash directory.t2407-worktree-heads/wt-3'
-ok 9 - refuse to fetch over ref: worktree in rebase
-
-expecting success of 2407.10 'refuse to overwrite when in error states': 
-	test_when_finished rm -rf .git/worktrees/wt-*/rebase-merge &&
-	test_when_finished rm -rf .git/worktrees/wt-*/BISECT_* &&
-
-	# Both branches are currently under rebase.
-	mkdir -p .git/worktrees/wt-3/rebase-merge &&
-	touch .git/worktrees/wt-3/rebase-merge/interactive &&
-	echo refs/heads/fake-1 >.git/worktrees/wt-3/rebase-merge/head-name &&
-	echo refs/heads/fake-2 >.git/worktrees/wt-3/rebase-merge/onto &&
-	mkdir -p .git/worktrees/wt-4/rebase-merge &&
-	touch .git/worktrees/wt-4/rebase-merge/interactive &&
-	echo refs/heads/fake-2 >.git/worktrees/wt-4/rebase-merge/head-name &&
-	echo refs/heads/fake-1 >.git/worktrees/wt-4/rebase-merge/onto &&
-
-	# Both branches are currently under bisect.
-	touch .git/worktrees/wt-4/BISECT_LOG &&
-	echo refs/heads/fake-2 >.git/worktrees/wt-4/BISECT_START &&
-	touch .git/worktrees/wt-1/BISECT_LOG &&
-	echo refs/heads/fake-1 >.git/worktrees/wt-1/BISECT_START &&
-
-	for i in 1 2
-	do
-		test_must_fail git branch -f fake-$i HEAD 2>err &&
-		grep "cannot force update the branch 'fake-$i' used by worktree at" err ||
-			return 1
-	done
-
-fatal: cannot force update the branch 'fake-1' used by worktree at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t2407-worktree-heads/wt-4'
-ok 10 - refuse to overwrite when in error states
-
-expecting success of 2407.11 'refuse to overwrite during rebase with --update-refs': 
-	git commit --fixup HEAD~2 --allow-empty &&
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i --update-refs HEAD~3 >todo &&
-		! grep "update-refs" todo
-	) &&
-	git branch -f allow-update HEAD~2 &&
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i --update-refs HEAD~3 >todo &&
-		grep "update-ref refs/heads/allow-update" todo
-	)
-
-[master 3e1ca9c] fixup! 2
- Author: A U Thor <author@example.com>
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-update-ref refs/heads/allow-update
-ok 11 - refuse to overwrite during rebase with --update-refs
-
-expecting success of 2407.12 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
-
-ok 12 - $EDITOR and friends are unchanged
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3001-ls-files-others-exclude.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3001-ls-files-others-exclude/.git/
 expecting success of 3001.1 'git ls-files --others with various exclude options.': 
@@ -103583,197 +103586,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3005-ls-files-relative.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3004-ls-files-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t3004-ls-files-basic/broken/.git/
-usage: git ls-files [<options>] [<file>...]
-ok 4 - ls-files -h in corrupt repository
-
-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.5 '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 5 - ls-files with absolute paths to symlinks
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3006-ls-files-long.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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
-
-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
-
-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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3008-ls-files-lazy-init-name-hash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.000938 0.029896 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t1510-repo-setup.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1510-repo-setup/.git/
 expecting success of 1510.1 '#0: nonbare repo, no explicit configuration': 
@@ -105664,6 +105476,197 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3006-ls-files-long.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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
+
+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
+
+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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3005-ls-files-relative.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3004-ls-files-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t3004-ls-files-basic/broken/.git/
+usage: git ls-files [<options>] [<file>...]
+ok 4 - ls-files -h in corrupt repository
+
+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.5 '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 5 - ls-files with absolute paths to symlinks
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3008-ls-files-lazy-init-name-hash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.000828 0.040585 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3009-ls-files-others-nonsubmodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3009-ls-files-others-nonsubmodule/.git/
 expecting success of 3009.1 'setup: directories': 
@@ -105709,6 +105712,94 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3012-ls-files-dedup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3010-ls-files-killed-modified.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3010-ls-files-killed-modified/.git/
 expecting success of 3010.1 'git update-index --add to add various paths.': 
@@ -105819,94 +105910,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3012-ls-files-dedup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3020-ls-files-error-unmatch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3020-ls-files-error-unmatch/.git/
 expecting success of 3020.1 'setup': 
@@ -105940,259 +105943,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3011-common-prefixes-and-directory-traversal.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3011-common-prefixes-and-directory-traversal/.git/
-expecting success of 3011.1 'setup': 
-	test_commit hello &&
-
-	>empty &&
-	mkdir untracked_dir &&
-	>untracked_dir/empty &&
-	git init untracked_repo &&
-	>untracked_repo/empty &&
-
-	cat <<-EOF >.gitignore &&
-	ignored
-	an_ignored_dir/
-	EOF
-	mkdir an_ignored_dir &&
-	mkdir an_untracked_dir &&
-	>an_ignored_dir/ignored &&
-	>an_ignored_dir/untracked &&
-	>an_untracked_dir/ignored &&
-	>an_untracked_dir/untracked
-
-[master (root-commit) 7dd16e1] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.t
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3011-common-prefixes-and-directory-traversal/untracked_repo/.git/
-ok 1 - setup
-
-expecting success of 3011.2 'git ls-files -o shows the right entries': 
-	cat <<-EOF >expect &&
-	.gitignore
-	actual
-	an_ignored_dir/ignored
-	an_ignored_dir/untracked
-	an_untracked_dir/ignored
-	an_untracked_dir/untracked
-	empty
-	expect
-	untracked_dir/empty
-	untracked_repo/
-	EOF
-	git ls-files -o >actual &&
-	test_cmp expect actual
-
-ok 2 - git ls-files -o shows the right entries
-
-expecting success of 3011.3 'git ls-files -o --exclude-standard shows the right entries': 
-	cat <<-EOF >expect &&
-	.gitignore
-	actual
-	an_untracked_dir/untracked
-	empty
-	expect
-	untracked_dir/empty
-	untracked_repo/
-	EOF
-	git ls-files -o --exclude-standard >actual &&
-	test_cmp expect actual
-
-ok 3 - git ls-files -o --exclude-standard shows the right entries
-
-expecting success of 3011.4 'git ls-files -o untracked_dir recurses': 
-	echo untracked_dir/empty >expect &&
-	git ls-files -o untracked_dir >actual &&
-	test_cmp expect actual
-
-ok 4 - git ls-files -o untracked_dir recurses
-
-expecting success of 3011.5 'git ls-files -o untracked_dir/ recurses': 
-	echo untracked_dir/empty >expect &&
-	git ls-files -o untracked_dir/ >actual &&
-	test_cmp expect actual
-
-ok 5 - git ls-files -o untracked_dir/ recurses
-
-expecting success of 3011.6 'git ls-files -o --directory untracked_dir does not recurse': 
-	echo untracked_dir/ >expect &&
-	git ls-files -o --directory untracked_dir >actual &&
-	test_cmp expect actual
-
-ok 6 - git ls-files -o --directory untracked_dir does not recurse
-
-expecting success of 3011.7 'git ls-files -o --directory untracked_dir/ does not recurse': 
-	echo untracked_dir/ >expect &&
-	git ls-files -o --directory untracked_dir/ >actual &&
-	test_cmp expect actual
-
-ok 7 - git ls-files -o --directory untracked_dir/ does not recurse
-
-expecting success of 3011.8 'git ls-files -o untracked_repo does not recurse': 
-	echo untracked_repo/ >expect &&
-	git ls-files -o untracked_repo >actual &&
-	test_cmp expect actual
-
-ok 8 - git ls-files -o untracked_repo does not recurse
-
-expecting success of 3011.9 'git ls-files -o untracked_repo/ does not recurse': 
-	echo untracked_repo/ >expect &&
-	git ls-files -o untracked_repo/ >actual &&
-	test_cmp expect actual
-
-ok 9 - git ls-files -o untracked_repo/ does not recurse
-
-expecting success of 3011.10 'git ls-files -o untracked_dir untracked_repo recurses into untracked_dir only': 
-	cat <<-EOF >expect &&
-	untracked_dir/empty
-	untracked_repo/
-	EOF
-	git ls-files -o untracked_dir untracked_repo >actual &&
-	test_cmp expect actual
-
-ok 10 - git ls-files -o untracked_dir untracked_repo recurses into untracked_dir only
-
-expecting success of 3011.11 'git ls-files -o untracked_dir/ untracked_repo/ recurses into untracked_dir only': 
-	cat <<-EOF >expect &&
-	untracked_dir/empty
-	untracked_repo/
-	EOF
-	git ls-files -o untracked_dir/ untracked_repo/ >actual &&
-	test_cmp expect actual
-
-ok 11 - git ls-files -o untracked_dir/ untracked_repo/ recurses into untracked_dir only
-
-expecting success of 3011.12 'git ls-files -o --directory untracked_dir untracked_repo does not recurse': 
-	cat <<-EOF >expect &&
-	untracked_dir/
-	untracked_repo/
-	EOF
-	git ls-files -o --directory untracked_dir untracked_repo >actual &&
-	test_cmp expect actual
-
-ok 12 - git ls-files -o --directory untracked_dir untracked_repo does not recurse
-
-expecting success of 3011.13 'git ls-files -o --directory untracked_dir/ untracked_repo/ does not recurse': 
-	cat <<-EOF >expect &&
-	untracked_dir/
-	untracked_repo/
-	EOF
-	git ls-files -o --directory untracked_dir/ untracked_repo/ >actual &&
-	test_cmp expect actual
-
-ok 13 - git ls-files -o --directory untracked_dir/ untracked_repo/ does not recurse
-
-expecting success of 3011.14 'git ls-files -o .git shows nothing': 
-	git ls-files -o .git >actual &&
-	test_must_be_empty actual
-
-ok 14 - git ls-files -o .git shows nothing
-
-expecting success of 3011.15 'git ls-files -o .git/ shows nothing': 
-	git ls-files -o .git/ >actual &&
-	test_must_be_empty actual
-
-ok 15 - git ls-files -o .git/ shows nothing
-
-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
-expecting success of 3011.16 'git ls-files -o untracked_* recurses appropriately': 
-	mkdir "untracked_*" &&
-	>"untracked_*/empty" &&
-
-	cat <<-EOF >expect &&
-	untracked_*/empty
-	untracked_dir/empty
-	untracked_repo/
-	EOF
-	git ls-files -o "untracked_*" >actual &&
-	test_cmp expect actual
-
-ok 16 - git ls-files -o untracked_* recurses appropriately
-
-checking known breakage of 3011.17 'git ls-files -o untracked_*/ recurses appropriately': 
-	cat <<-EOF >expect &&
-	untracked_*/empty
-	untracked_dir/empty
-	untracked_repo/
-	EOF
-	git ls-files -o "untracked_*/" >actual &&
-	test_cmp expect actual
-
---- expect	2026-03-04 07:56:34.139352315 +0000
-+++ actual	2026-03-04 07:56:34.143352315 +0000
-@@ -1,3 +1,2 @@
- untracked_*/empty
--untracked_dir/empty
- untracked_repo/
-not ok 17 - git ls-files -o untracked_*/ recurses appropriately # TODO known breakage
-
-expecting success of 3011.18 'git ls-files -o --directory untracked_* does not recurse': 
-	cat <<-EOF >expect &&
-	untracked_*/
-	untracked_dir/
-	untracked_repo/
-	EOF
-	git ls-files -o --directory "untracked_*" >actual &&
-	test_cmp expect actual
-
-ok 18 - git ls-files -o --directory untracked_* does not recurse
-
-expecting success of 3011.19 'git ls-files -o --directory untracked_*/ does not recurse': 
-	cat <<-EOF >expect &&
-	untracked_*/
-	untracked_dir/
-	untracked_repo/
-	EOF
-	git ls-files -o --directory "untracked_*/" >actual &&
-	test_cmp expect actual
-
-ok 19 - git ls-files -o --directory untracked_*/ does not recurse
-
-expecting success of 3011.20 'git ls-files -o consistent between one or two dirs': 
-	git ls-files -o --exclude-standard an_ignored_dir/ an_untracked_dir/ >tmp &&
-	! grep ^an_ignored_dir/ tmp >expect &&
-	git ls-files -o --exclude-standard an_ignored_dir/ >actual &&
-	test_cmp expect actual
-
-ok 20 - git ls-files -o consistent between one or two dirs
-
-expecting success of 3011.21 'git status --ignored shows same files under dir with or without pathspec': 
-	cat <<-EOF >expect &&
-	?? an_untracked_dir/
-	!! an_untracked_dir/ignored
-	EOF
-	git status --porcelain --ignored >output &&
-	grep an_untracked_dir output >expect &&
-	git status --porcelain --ignored an_untracked_dir/ >actual &&
-	test_cmp expect actual
-
-ok 21 - git status --ignored shows same files under dir with or without pathspec
-
-# still have 1 known breakage(s)
-# passed all remaining 20 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3013-ls-files-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3013-ls-files-format/.git/
 expecting success of 3013.1 'usage: --format is incompatible with -s': 
@@ -106667,6 +106417,403 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3011-common-prefixes-and-directory-traversal.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3011-common-prefixes-and-directory-traversal/.git/
+expecting success of 3011.1 'setup': 
+	test_commit hello &&
+
+	>empty &&
+	mkdir untracked_dir &&
+	>untracked_dir/empty &&
+	git init untracked_repo &&
+	>untracked_repo/empty &&
+
+	cat <<-EOF >.gitignore &&
+	ignored
+	an_ignored_dir/
+	EOF
+	mkdir an_ignored_dir &&
+	mkdir an_untracked_dir &&
+	>an_ignored_dir/ignored &&
+	>an_ignored_dir/untracked &&
+	>an_untracked_dir/ignored &&
+	>an_untracked_dir/untracked
+
+[master (root-commit) 7dd16e1] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.t
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3011-common-prefixes-and-directory-traversal/untracked_repo/.git/
+ok 1 - setup
+
+expecting success of 3011.2 'git ls-files -o shows the right entries': 
+	cat <<-EOF >expect &&
+	.gitignore
+	actual
+	an_ignored_dir/ignored
+	an_ignored_dir/untracked
+	an_untracked_dir/ignored
+	an_untracked_dir/untracked
+	empty
+	expect
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o >actual &&
+	test_cmp expect actual
+
+ok 2 - git ls-files -o shows the right entries
+
+expecting success of 3011.3 'git ls-files -o --exclude-standard shows the right entries': 
+	cat <<-EOF >expect &&
+	.gitignore
+	actual
+	an_untracked_dir/untracked
+	empty
+	expect
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o --exclude-standard >actual &&
+	test_cmp expect actual
+
+ok 3 - git ls-files -o --exclude-standard shows the right entries
+
+expecting success of 3011.4 'git ls-files -o untracked_dir recurses': 
+	echo untracked_dir/empty >expect &&
+	git ls-files -o untracked_dir >actual &&
+	test_cmp expect actual
+
+ok 4 - git ls-files -o untracked_dir recurses
+
+expecting success of 3011.5 'git ls-files -o untracked_dir/ recurses': 
+	echo untracked_dir/empty >expect &&
+	git ls-files -o untracked_dir/ >actual &&
+	test_cmp expect actual
+
+ok 5 - git ls-files -o untracked_dir/ recurses
+
+expecting success of 3011.6 'git ls-files -o --directory untracked_dir does not recurse': 
+	echo untracked_dir/ >expect &&
+	git ls-files -o --directory untracked_dir >actual &&
+	test_cmp expect actual
+
+ok 6 - git ls-files -o --directory untracked_dir does not recurse
+
+expecting success of 3011.7 'git ls-files -o --directory untracked_dir/ does not recurse': 
+	echo untracked_dir/ >expect &&
+	git ls-files -o --directory untracked_dir/ >actual &&
+	test_cmp expect actual
+
+ok 7 - git ls-files -o --directory untracked_dir/ does not recurse
+
+expecting success of 3011.8 'git ls-files -o untracked_repo does not recurse': 
+	echo untracked_repo/ >expect &&
+	git ls-files -o untracked_repo >actual &&
+	test_cmp expect actual
+
+ok 8 - git ls-files -o untracked_repo does not recurse
+
+expecting success of 3011.9 'git ls-files -o untracked_repo/ does not recurse': 
+	echo untracked_repo/ >expect &&
+	git ls-files -o untracked_repo/ >actual &&
+	test_cmp expect actual
+
+ok 9 - git ls-files -o untracked_repo/ does not recurse
+
+expecting success of 3011.10 'git ls-files -o untracked_dir untracked_repo recurses into untracked_dir only': 
+	cat <<-EOF >expect &&
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o untracked_dir untracked_repo >actual &&
+	test_cmp expect actual
+
+ok 10 - git ls-files -o untracked_dir untracked_repo recurses into untracked_dir only
+
+expecting success of 3011.11 'git ls-files -o untracked_dir/ untracked_repo/ recurses into untracked_dir only': 
+	cat <<-EOF >expect &&
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o untracked_dir/ untracked_repo/ >actual &&
+	test_cmp expect actual
+
+ok 11 - git ls-files -o untracked_dir/ untracked_repo/ recurses into untracked_dir only
+
+expecting success of 3011.12 'git ls-files -o --directory untracked_dir untracked_repo does not recurse': 
+	cat <<-EOF >expect &&
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory untracked_dir untracked_repo >actual &&
+	test_cmp expect actual
+
+ok 12 - git ls-files -o --directory untracked_dir untracked_repo does not recurse
+
+expecting success of 3011.13 'git ls-files -o --directory untracked_dir/ untracked_repo/ does not recurse': 
+	cat <<-EOF >expect &&
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory untracked_dir/ untracked_repo/ >actual &&
+	test_cmp expect actual
+
+ok 13 - git ls-files -o --directory untracked_dir/ untracked_repo/ does not recurse
+
+expecting success of 3011.14 'git ls-files -o .git shows nothing': 
+	git ls-files -o .git >actual &&
+	test_must_be_empty actual
+
+ok 14 - git ls-files -o .git shows nothing
+
+expecting success of 3011.15 'git ls-files -o .git/ shows nothing': 
+	git ls-files -o .git/ >actual &&
+	test_must_be_empty actual
+
+ok 15 - git ls-files -o .git/ shows nothing
+
+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
+expecting success of 3011.16 'git ls-files -o untracked_* recurses appropriately': 
+	mkdir "untracked_*" &&
+	>"untracked_*/empty" &&
+
+	cat <<-EOF >expect &&
+	untracked_*/empty
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o "untracked_*" >actual &&
+	test_cmp expect actual
+
+ok 16 - git ls-files -o untracked_* recurses appropriately
+
+checking known breakage of 3011.17 'git ls-files -o untracked_*/ recurses appropriately': 
+	cat <<-EOF >expect &&
+	untracked_*/empty
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o "untracked_*/" >actual &&
+	test_cmp expect actual
+
+--- expect	2025-01-30 02:09:10.879176456 +0000
++++ actual	2025-01-30 02:09:10.887176504 +0000
+@@ -1,3 +1,2 @@
+ untracked_*/empty
+-untracked_dir/empty
+ untracked_repo/
+not ok 17 - git ls-files -o untracked_*/ recurses appropriately # TODO known breakage
+
+expecting success of 3011.18 'git ls-files -o --directory untracked_* does not recurse': 
+	cat <<-EOF >expect &&
+	untracked_*/
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory "untracked_*" >actual &&
+	test_cmp expect actual
+
+ok 18 - git ls-files -o --directory untracked_* does not recurse
+
+expecting success of 3011.19 'git ls-files -o --directory untracked_*/ does not recurse': 
+	cat <<-EOF >expect &&
+	untracked_*/
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory "untracked_*/" >actual &&
+	test_cmp expect actual
+
+ok 19 - git ls-files -o --directory untracked_*/ does not recurse
+
+expecting success of 3011.20 'git ls-files -o consistent between one or two dirs': 
+	git ls-files -o --exclude-standard an_ignored_dir/ an_untracked_dir/ >tmp &&
+	! grep ^an_ignored_dir/ tmp >expect &&
+	git ls-files -o --exclude-standard an_ignored_dir/ >actual &&
+	test_cmp expect actual
+
+ok 20 - git ls-files -o consistent between one or two dirs
+
+expecting success of 3011.21 'git status --ignored shows same files under dir with or without pathspec': 
+	cat <<-EOF >expect &&
+	?? an_untracked_dir/
+	!! an_untracked_dir/ignored
+	EOF
+	git status --porcelain --ignored >output &&
+	grep an_untracked_dir output >expect &&
+	git status --porcelain --ignored an_untracked_dir/ >actual &&
+	test_cmp expect actual
+
+ok 21 - git status --ignored shows same files under dir with or without pathspec
+
+# still have 1 known breakage(s)
+# passed all remaining 20 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3040-subprojects-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3040-subprojects-basic/.git/
+expecting success of 3040.1 'setup: create superproject': 
+	: >Makefile &&
+	git add Makefile &&
+	git commit -m "Superproject created"
+
+[master (root-commit) 0075abc] Superproject created
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 Makefile
+ok 1 - setup: create superproject
+
+expecting success of 3040.2 'setup: create subprojects': 
+	mkdir sub1 &&
+	( cd sub1 && git init && : >Makefile && git add * &&
+	git commit -q -m "subproject 1" ) &&
+	mkdir sub2 &&
+	( cd sub2 && git init && : >Makefile && git add * &&
+	git commit -q -m "subproject 2" ) &&
+	git update-index --add sub1 &&
+	git add sub2 &&
+	git commit -q -m "subprojects added" &&
+	GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev=5 HEAD^ HEAD |cut -d" " -f-3,5- >current &&
+	git branch save HEAD &&
+	cat >expected <<-\EOF &&
+	:000000 160000 00000... A	sub1
+	:000000 160000 00000... A	sub2
+	EOF
+	test_cmp expected current
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3040-subprojects-basic/sub1/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3040-subprojects-basic/sub2/.git/
+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 advice.addEmbeddedRepo false"
+ok 2 - setup: create subprojects
+
+expecting success of 3040.3 'check if fsck ignores the subprojects': 
+	git fsck --full
+
+ok 3 - check if fsck ignores the subprojects
+
+expecting success of 3040.4 'check if commit in a subproject detected': 
+	( cd sub1 &&
+	echo "all:" >>Makefile &&
+	echo "	true" >>Makefile &&
+	git commit -q -a -m "make all" ) &&
+	test_expect_code 1 git diff-files --exit-code
+
+:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 0000000000000000000000000000000000000000 M	sub1
+ok 4 - check if commit in a subproject detected
+
+expecting success of 3040.5 'check if a changed subproject HEAD can be committed': 
+	git commit -q -a -m "sub1 changed" &&
+	test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD
+
+:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
+ok 5 - check if a changed subproject HEAD can be committed
+
+expecting success of 3040.6 'check if diff-index works for subproject elements': 
+	test_expect_code 1 git diff-index --exit-code --cached save -- sub1
+
+:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
+ok 6 - check if diff-index works for subproject elements
+
+expecting success of 3040.7 'check if diff-tree works for subproject elements': 
+	test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD -- sub1
+
+:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
+ok 7 - check if diff-tree works for subproject elements
+
+expecting success of 3040.8 'check if git diff works for subproject elements': 
+	test_expect_code 1 git diff --exit-code HEAD^ HEAD
+
+diff --git a/sub1 b/sub1
+index 1220b9f..487e230 160000
+--- a/sub1
++++ b/sub1
+@@ -1 +1 @@
+-Subproject commit 1220b9f3ace6404f5c782bba5e262aaaf38310fb
++Subproject commit 487e23047a2a8ed2c84b1478b3e52375e3ae3334
+ok 8 - check if git diff works for subproject elements
+
+expecting success of 3040.9 'check if clone works': 
+	git ls-files -s >expected &&
+	git clone -l -s . cloned &&
+	( cd cloned && git ls-files -s ) >current &&
+	test_cmp expected current
+
+Cloning into 'cloned'...
+done.
+ok 9 - check if clone works
+
+expecting success of 3040.10 'removing and adding subproject': 
+	git update-index --force-remove -- sub2 &&
+	mv sub2 sub3 &&
+	git add sub3 &&
+	git commit -q -m "renaming a subproject" &&
+	test_expect_code 1 git diff -M --name-status --exit-code HEAD^ HEAD
+
+warning: adding embedded git repository: sub3
+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> sub3
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub3
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+R100	sub2	sub3
+ok 10 - removing and adding subproject
+
+expecting success of 3040.11 'checkout in superproject': 
+	git checkout save &&
+	git diff-index --exit-code --raw --cached save -- sub1
+
+warning: unable to rmdir 'sub3': Directory not empty
+Switched to branch 'save'
+M	sub1
+ok 11 - checkout in superproject
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2501-cwd-empty.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2501-cwd-empty/.git/
 expecting success of 2501.1 'setup': 
@@ -107022,7 +107169,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.47.2
 ok 21 - git version continues working from a deleted dir
 
@@ -107100,150 +107247,6 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3040-subprojects-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3040-subprojects-basic/.git/
-expecting success of 3040.1 'setup: create superproject': 
-	: >Makefile &&
-	git add Makefile &&
-	git commit -m "Superproject created"
-
-[master (root-commit) 0075abc] Superproject created
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 Makefile
-ok 1 - setup: create superproject
-
-expecting success of 3040.2 'setup: create subprojects': 
-	mkdir sub1 &&
-	( cd sub1 && git init && : >Makefile && git add * &&
-	git commit -q -m "subproject 1" ) &&
-	mkdir sub2 &&
-	( cd sub2 && git init && : >Makefile && git add * &&
-	git commit -q -m "subproject 2" ) &&
-	git update-index --add sub1 &&
-	git add sub2 &&
-	git commit -q -m "subprojects added" &&
-	GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev=5 HEAD^ HEAD |cut -d" " -f-3,5- >current &&
-	git branch save HEAD &&
-	cat >expected <<-\EOF &&
-	:000000 160000 00000... A	sub1
-	:000000 160000 00000... A	sub2
-	EOF
-	test_cmp expected current
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3040-subprojects-basic/sub1/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3040-subprojects-basic/sub2/.git/
-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 advice.addEmbeddedRepo false"
-ok 2 - setup: create subprojects
-
-expecting success of 3040.3 'check if fsck ignores the subprojects': 
-	git fsck --full
-
-ok 3 - check if fsck ignores the subprojects
-
-expecting success of 3040.4 'check if commit in a subproject detected': 
-	( cd sub1 &&
-	echo "all:" >>Makefile &&
-	echo "	true" >>Makefile &&
-	git commit -q -a -m "make all" ) &&
-	test_expect_code 1 git diff-files --exit-code
-
-:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 0000000000000000000000000000000000000000 M	sub1
-ok 4 - check if commit in a subproject detected
-
-expecting success of 3040.5 'check if a changed subproject HEAD can be committed': 
-	git commit -q -a -m "sub1 changed" &&
-	test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD
-
-:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
-ok 5 - check if a changed subproject HEAD can be committed
-
-expecting success of 3040.6 'check if diff-index works for subproject elements': 
-	test_expect_code 1 git diff-index --exit-code --cached save -- sub1
-
-:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
-ok 6 - check if diff-index works for subproject elements
-
-expecting success of 3040.7 'check if diff-tree works for subproject elements': 
-	test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD -- sub1
-
-:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
-ok 7 - check if diff-tree works for subproject elements
-
-expecting success of 3040.8 'check if git diff works for subproject elements': 
-	test_expect_code 1 git diff --exit-code HEAD^ HEAD
-
-diff --git a/sub1 b/sub1
-index 1220b9f..487e230 160000
---- a/sub1
-+++ b/sub1
-@@ -1 +1 @@
--Subproject commit 1220b9f3ace6404f5c782bba5e262aaaf38310fb
-+Subproject commit 487e23047a2a8ed2c84b1478b3e52375e3ae3334
-ok 8 - check if git diff works for subproject elements
-
-expecting success of 3040.9 'check if clone works': 
-	git ls-files -s >expected &&
-	git clone -l -s . cloned &&
-	( cd cloned && git ls-files -s ) >current &&
-	test_cmp expected current
-
-Cloning into 'cloned'...
-done.
-ok 9 - check if clone works
-
-expecting success of 3040.10 'removing and adding subproject': 
-	git update-index --force-remove -- sub2 &&
-	mv sub2 sub3 &&
-	git add sub3 &&
-	git commit -q -m "renaming a subproject" &&
-	test_expect_code 1 git diff -M --name-status --exit-code HEAD^ HEAD
-
-warning: adding embedded git repository: sub3
-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> sub3
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub3
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-R100	sub2	sub3
-ok 10 - removing and adding subproject
-
-expecting success of 3040.11 'checkout in superproject': 
-	git checkout save &&
-	git diff-index --exit-code --raw --cached save -- sub1
-
-warning: unable to rmdir 'sub3': Directory not empty
-Switched to branch 'save'
-M	sub1
-ok 11 - checkout in superproject
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3050-subprojects-fetch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3050-subprojects-fetch/.git/
 expecting success of 3050.1 'setup': 
@@ -108105,201 +108108,63 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3103-ls-tree-misc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3103-ls-tree-misc/.git/
-expecting success of 3103.1 'setup': 
-	mkdir a &&
-	touch a/one &&
-	git add a/one &&
-	git commit -m test
-
-[master (root-commit) 687a3e0] test
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/one
-ok 1 - setup
+*** t3100-ls-tree-restrict.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-expecting success of 3103.2 'ls-tree fails with non-zero exit code on broken tree': 
-	tree=$(git rev-parse HEAD:a) &&
-	rm -f .git/objects/$(echo $tree | sed -e "s,^\(..\),\1/,") &&
-	test_must_fail git ls-tree -r HEAD
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-error: Could not read 5fcffbd6e4c5c5b8d81f5e9314b20e338e3ffff5
-ok 2 - ls-tree fails with non-zero exit code on broken tree
+)
+prerequisite SYMLINKS ok
+a384d4f8dd786f29d6da4705dee4c2c0bc6b5049
+ok 1 - setup
 
-expecting success of 3103.3 'usage: incompatible options: --long --name-only': 
-		test_expect_code 129 git ls-tree $opts $tree
-	
-error: options '--name-only' and '--long' cannot be used together
-ok 3 - usage: incompatible options: --long --name-only
+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 3103.4 'usage: incompatible options: --long and --format': 
-		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
-	
-fatal: --format can't be combined with other format-altering options
+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
 
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
-
-    -d                    only show trees
-    -r                    recurse into subtrees
-    -t                    show trees when recursing
-    -z                    terminate entries with NUL byte
-    -l, --long            include object size
-    --name-only           list only filenames
-    --name-status         list only filenames
-    --object-only         list only objects
-    --[no-]full-name      use full path names
-    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
-    --format <format>     format to use for the output
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-
-ok 4 - usage: incompatible options: --long and --format
-
-expecting success of 3103.5 'usage: incompatible options: --name-only --name-status': 
-		test_expect_code 129 git ls-tree $opts $tree
-	
-error: options '--name-status' and '--name-only' cannot be used together
-ok 5 - usage: incompatible options: --name-only --name-status
-
-expecting success of 3103.6 'usage: incompatible options: --name-only and --format': 
-		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
-	
-fatal: --format can't be combined with other format-altering options
-
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
-
-    -d                    only show trees
-    -r                    recurse into subtrees
-    -t                    show trees when recursing
-    -z                    terminate entries with NUL byte
-    -l, --long            include object size
-    --name-only           list only filenames
-    --name-status         list only filenames
-    --object-only         list only objects
-    --[no-]full-name      use full path names
-    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
-    --format <format>     format to use for the output
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-
-ok 6 - usage: incompatible options: --name-only and --format
-
-expecting success of 3103.7 'usage: incompatible options: --name-status --object-only': 
-		test_expect_code 129 git ls-tree $opts $tree
-	
-error: options '--object-only' and '--name-status' cannot be used together
-ok 7 - usage: incompatible options: --name-status --object-only
-
-expecting success of 3103.8 'usage: incompatible options: --name-status and --format': 
-		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
-	
-fatal: --format can't be combined with other format-altering options
-
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
-
-    -d                    only show trees
-    -r                    recurse into subtrees
-    -t                    show trees when recursing
-    -z                    terminate entries with NUL byte
-    -l, --long            include object size
-    --name-only           list only filenames
-    --name-status         list only filenames
-    --object-only         list only objects
-    --[no-]full-name      use full path names
-    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
-    --format <format>     format to use for the output
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-
-ok 8 - usage: incompatible options: --name-status and --format
-
-expecting success of 3103.9 'usage: incompatible options: --object-only --long': 
-		test_expect_code 129 git ls-tree $opts $tree
-	
-error: options '--long' and '--object-only' cannot be used together
-ok 9 - usage: incompatible options: --object-only --long
-
-expecting success of 3103.10 'usage: incompatible options: --object-only and --format': 
-		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
-	
-fatal: --format can't be combined with other format-altering options
-
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
-
-    -d                    only show trees
-    -r                    recurse into subtrees
-    -t                    show trees when recursing
-    -z                    terminate entries with NUL byte
-    -l, --long            include object size
-    --name-only           list only filenames
-    --name-status         list only filenames
-    --object-only         list only objects
-    --[no-]full-name      use full path names
-    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
-    --format <format>     format to use for the output
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-
-ok 10 - usage: incompatible options: --object-only and --format
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3100-ls-tree-restrict.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.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 &&
@@ -108632,6 +108497,144 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3103-ls-tree-misc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3103-ls-tree-misc/.git/
+expecting success of 3103.1 'setup': 
+	mkdir a &&
+	touch a/one &&
+	git add a/one &&
+	git commit -m test
+
+[master (root-commit) 687a3e0] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/one
+ok 1 - setup
+
+expecting success of 3103.2 'ls-tree fails with non-zero exit code on broken tree': 
+	tree=$(git rev-parse HEAD:a) &&
+	rm -f .git/objects/$(echo $tree | sed -e "s,^\(..\),\1/,") &&
+	test_must_fail git ls-tree -r HEAD
+
+error: Could not read 5fcffbd6e4c5c5b8d81f5e9314b20e338e3ffff5
+ok 2 - ls-tree fails with non-zero exit code on broken tree
+
+expecting success of 3103.3 'usage: incompatible options: --long --name-only': 
+		test_expect_code 129 git ls-tree $opts $tree
+	
+error: options '--name-only' and '--long' cannot be used together
+ok 3 - usage: incompatible options: --long --name-only
+
+expecting success of 3103.4 'usage: incompatible options: --long and --format': 
+		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+	
+fatal: --format can't be combined with other format-altering options
+
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
+
+    -d                    only show trees
+    -r                    recurse into subtrees
+    -t                    show trees when recursing
+    -z                    terminate entries with NUL byte
+    -l, --long            include object size
+    --name-only           list only filenames
+    --name-status         list only filenames
+    --object-only         list only objects
+    --[no-]full-name      use full path names
+    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
+    --format <format>     format to use for the output
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 4 - usage: incompatible options: --long and --format
+
+expecting success of 3103.5 'usage: incompatible options: --name-only --name-status': 
+		test_expect_code 129 git ls-tree $opts $tree
+	
+error: options '--name-status' and '--name-only' cannot be used together
+ok 5 - usage: incompatible options: --name-only --name-status
+
+expecting success of 3103.6 'usage: incompatible options: --name-only and --format': 
+		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+	
+fatal: --format can't be combined with other format-altering options
+
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
+
+    -d                    only show trees
+    -r                    recurse into subtrees
+    -t                    show trees when recursing
+    -z                    terminate entries with NUL byte
+    -l, --long            include object size
+    --name-only           list only filenames
+    --name-status         list only filenames
+    --object-only         list only objects
+    --[no-]full-name      use full path names
+    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
+    --format <format>     format to use for the output
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 6 - usage: incompatible options: --name-only and --format
+
+expecting success of 3103.7 'usage: incompatible options: --name-status --object-only': 
+		test_expect_code 129 git ls-tree $opts $tree
+	
+error: options '--object-only' and '--name-status' cannot be used together
+ok 7 - usage: incompatible options: --name-status --object-only
+
+expecting success of 3103.8 'usage: incompatible options: --name-status and --format': 
+		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+	
+fatal: --format can't be combined with other format-altering options
+
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
+
+    -d                    only show trees
+    -r                    recurse into subtrees
+    -t                    show trees when recursing
+    -z                    terminate entries with NUL byte
+    -l, --long            include object size
+    --name-only           list only filenames
+    --name-status         list only filenames
+    --object-only         list only objects
+    --[no-]full-name      use full path names
+    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
+    --format <format>     format to use for the output
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 8 - usage: incompatible options: --name-status and --format
+
+expecting success of 3103.9 'usage: incompatible options: --object-only --long': 
+		test_expect_code 129 git ls-tree $opts $tree
+	
+error: options '--long' and '--object-only' cannot be used together
+ok 9 - usage: incompatible options: --object-only --long
+
+expecting success of 3103.10 'usage: incompatible options: --object-only and --format': 
+		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+	
+fatal: --format can't be combined with other format-altering options
+
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
+
+    -d                    only show trees
+    -r                    recurse into subtrees
+    -t                    show trees when recursing
+    -z                    terminate entries with NUL byte
+    -l, --long            include object size
+    --name-only           list only filenames
+    --name-status         list only filenames
+    --object-only         list only objects
+    --[no-]full-name      use full path names
+    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
+    --format <format>     format to use for the output
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 10 - usage: incompatible options: --object-only and --format
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3104-ls-tree-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3104-ls-tree-format/.git/
 expecting success of 3104.1 'ls-tree --format usage': 
@@ -113427,8 +113430,8 @@
 submodule 'sub': creating branch 'branch-a'
 submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
 5d29dd06c1ca37a38b36ad34082d33c63d600a68
---- expected	2026-03-04 07:56:43.527352315 +0000
-+++ actual-old-branch-a	2026-03-04 07:56:43.627352315 +0000
+--- expected	2025-01-30 02:09:23.051249450 +0000
++++ actual-old-branch-a	2025-01-30 02:09:23.211250409 +0000
 @@ -1 +1 @@
 -e0bfe529e912b5a75b1de3a7ff69e39e307976dd
 +5b597cba49d0cf0c6869259a23d7c44ed48e4c3e
@@ -118958,105 +118961,6 @@
 1..166
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3320-notes-merge-worktrees.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3320-notes-merge-worktrees/.git/
-expecting success of 3320.1 'setup commit': 
-	test_commit tantrum
-
-[main (root-commit) 02f8a63] tantrum
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tantrum.t
-ok 1 - setup commit
-
-expecting success of 3320.2 'setup notes ref (x)': 
-	git config core.notesRef refs/notes/x &&
-	git notes add -m "x notes on tantrum" tantrum
-
-ok 2 - setup notes ref (x)
-
-expecting success of 3320.3 'setup local branch (y)': 
-	git update-ref refs/notes/y refs/notes/x &&
-	git config core.notesRef refs/notes/y &&
-	git notes remove tantrum
-
-Removing note for object tantrum
-ok 3 - setup local branch (y)
-
-expecting success of 3320.4 'setup remote branch (z)': 
-	git update-ref refs/notes/z refs/notes/x &&
-	git config core.notesRef refs/notes/z &&
-	git notes add -f -m "conflicting notes on tantrum" tantrum
-
-Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 4 - setup remote branch (z)
-
-expecting success of 3320.5 'modify notes ref ourselves (x)': 
-	git config core.notesRef refs/notes/x &&
-	git notes add -f -m "more conflicting notes on tantrum" tantrum
-
-Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 5 - modify notes ref ourselves (x)
-
-expecting success of 3320.6 'create some new worktrees': 
-	git worktree add -b newbranch worktree main &&
-	git worktree add -b newbranch2 worktree2 main
-
-Preparing worktree (new branch 'newbranch')
-HEAD is now at 02f8a63 tantrum
-Preparing worktree (new branch 'newbranch2')
-HEAD is now at 02f8a63 tantrum
-ok 6 - create some new worktrees
-
-expecting success of 3320.7 'merge z into y fails and sets NOTES_MERGE_REF': 
-	git config core.notesRef refs/notes/y &&
-	test_must_fail git notes merge z &&
-	echo "refs/notes/y" >expect &&
-	git symbolic-ref NOTES_MERGE_REF >actual &&
-	test_cmp expect actual
-
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
-ok 7 - merge z into y fails and sets NOTES_MERGE_REF
-
-expecting success of 3320.8 'merge z into y while mid-merge in another workdir fails': 
-	(
-		cd worktree &&
-		git config core.notesRef refs/notes/y &&
-		test_must_fail git notes merge z 2>err &&
-		test_grep "a notes merge into refs/notes/y is already in-progress at" err
-	) &&
-	test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF
-
-Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
-fatal: a notes merge into refs/notes/y is already in-progress at /build/reproducible-path/git-2.47.2/t/trash directory.t3320-notes-merge-worktrees
-fatal: ref NOTES_MERGE_REF is not a symbolic ref
-ok 8 - merge z into y while mid-merge in another workdir fails
-
-expecting success of 3320.9 'merge z into x while mid-merge on y succeeds': 
-	(
-		cd worktree2 &&
-		git config core.notesRef refs/notes/x &&
-		test_must_fail git notes merge z >out 2>&1 &&
-		test_grep "Automatic notes merge failed" out &&
-		grep -v "A notes merge into refs/notes/x is already in-progress in" out
-	) &&
-	echo "refs/notes/x" >expect &&
-	git -C worktree2 symbolic-ref NOTES_MERGE_REF >actual &&
-	test_cmp expect actual
-
-Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.47.2/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.47.2/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-CONFLICT (content): Merge conflict in notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 9 - merge z into x while mid-merge on y succeeds
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3310-notes-merge-manual-resolve.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3310-notes-merge-manual-resolve/.git/
 expecting success of 3310.1 'setup commits': 
@@ -119502,6 +119406,105 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3320-notes-merge-worktrees.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3320-notes-merge-worktrees/.git/
+expecting success of 3320.1 'setup commit': 
+	test_commit tantrum
+
+[main (root-commit) 02f8a63] tantrum
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tantrum.t
+ok 1 - setup commit
+
+expecting success of 3320.2 'setup notes ref (x)': 
+	git config core.notesRef refs/notes/x &&
+	git notes add -m "x notes on tantrum" tantrum
+
+ok 2 - setup notes ref (x)
+
+expecting success of 3320.3 'setup local branch (y)': 
+	git update-ref refs/notes/y refs/notes/x &&
+	git config core.notesRef refs/notes/y &&
+	git notes remove tantrum
+
+Removing note for object tantrum
+ok 3 - setup local branch (y)
+
+expecting success of 3320.4 'setup remote branch (z)': 
+	git update-ref refs/notes/z refs/notes/x &&
+	git config core.notesRef refs/notes/z &&
+	git notes add -f -m "conflicting notes on tantrum" tantrum
+
+Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 4 - setup remote branch (z)
+
+expecting success of 3320.5 'modify notes ref ourselves (x)': 
+	git config core.notesRef refs/notes/x &&
+	git notes add -f -m "more conflicting notes on tantrum" tantrum
+
+Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 5 - modify notes ref ourselves (x)
+
+expecting success of 3320.6 'create some new worktrees': 
+	git worktree add -b newbranch worktree main &&
+	git worktree add -b newbranch2 worktree2 main
+
+Preparing worktree (new branch 'newbranch')
+HEAD is now at 02f8a63 tantrum
+Preparing worktree (new branch 'newbranch2')
+HEAD is now at 02f8a63 tantrum
+ok 6 - create some new worktrees
+
+expecting success of 3320.7 'merge z into y fails and sets NOTES_MERGE_REF': 
+	git config core.notesRef refs/notes/y &&
+	test_must_fail git notes merge z &&
+	echo "refs/notes/y" >expect &&
+	git symbolic-ref NOTES_MERGE_REF >actual &&
+	test_cmp expect actual
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
+ok 7 - merge z into y fails and sets NOTES_MERGE_REF
+
+expecting success of 3320.8 'merge z into y while mid-merge in another workdir fails': 
+	(
+		cd worktree &&
+		git config core.notesRef refs/notes/y &&
+		test_must_fail git notes merge z 2>err &&
+		test_grep "a notes merge into refs/notes/y is already in-progress at" err
+	) &&
+	test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF
+
+Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
+fatal: a notes merge into refs/notes/y is already in-progress at /build/reproducible-path/git-2.47.2/t/trash directory.t3320-notes-merge-worktrees
+fatal: ref NOTES_MERGE_REF is not a symbolic ref
+ok 8 - merge z into y while mid-merge in another workdir fails
+
+expecting success of 3320.9 'merge z into x while mid-merge on y succeeds': 
+	(
+		cd worktree2 &&
+		git config core.notesRef refs/notes/x &&
+		test_must_fail git notes merge z >out 2>&1 &&
+		test_grep "Automatic notes merge failed" out &&
+		grep -v "A notes merge into refs/notes/x is already in-progress in" out
+	) &&
+	echo "refs/notes/x" >expect &&
+	git -C worktree2 symbolic-ref NOTES_MERGE_REF >actual &&
+	test_cmp expect actual
+
+Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.47.2/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.47.2/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+CONFLICT (content): Merge conflict in notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 9 - merge z into x while mid-merge on y succeeds
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3401-rebase-and-am-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3401-rebase-and-am-rename/.git/
 expecting success of 3401.1 'setup testcase where directory rename should be detected': 
@@ -125341,214 +125344,6 @@
 1..32
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3413-rebase-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3413-rebase-hook/.git/
-expecting success of 3413.1 'setup': 
-	echo hello >file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	echo goodbye >file &&
-	git add file &&
-	test_tick &&
-	git commit -m second &&
-	git checkout -b side HEAD^ &&
-	echo world >git &&
-	git add git &&
-	test_tick &&
-	git commit -m side &&
-	git checkout main &&
-	git log --pretty=oneline --abbrev-commit --graph --all &&
-	git branch test side
-
-[main (root-commit) 6637599] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 20a11a4] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-[side c847452] side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 git
-Switched to branch 'main'
-* c847452 side
-| * 20a11a4 second
-|/  
-* 6637599 initial
-ok 1 - setup
-
-expecting success of 3413.2 'rebase': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase main &&
-	test "z$(cat git)" = zworld
-
-Switched to branch 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 2 - rebase
-
-expecting success of 3413.3 'rebase -i': 
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase -i main &&
-	test "z$(cat git)" = zworld
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 3 - rebase -i
-
-expecting success of 3413.4 'setup pre-rebase hook': 
-	test_hook --setup pre-rebase <<-\EOF
-	echo "$1,$2" >.git/PRE-REBASE-INPUT
-	EOF
-
-ok 4 - setup pre-rebase hook
-
-expecting success of 3413.5 'pre-rebase hook gets correct input (1)': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase main &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
-
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 5 - pre-rebase hook gets correct input (1)
-
-expecting success of 3413.6 'pre-rebase hook gets correct input (2)': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase main test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 6 - pre-rebase hook gets correct input (2)
-
-expecting success of 3413.7 'pre-rebase hook gets correct input (3)': 
-	git checkout test &&
-	git reset --hard side &&
-	git checkout main &&
-	git rebase main test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
-
-Already on 'test'
-HEAD is now at c847452 side
-Switched to branch 'main'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 7 - pre-rebase hook gets correct input (3)
-
-expecting success of 3413.8 'pre-rebase hook gets correct input (4)': 
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase -i main &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
-
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 8 - pre-rebase hook gets correct input (4)
-
-expecting success of 3413.9 'pre-rebase hook gets correct input (5)': 
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase -i main test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 9 - pre-rebase hook gets correct input (5)
-
-expecting success of 3413.10 'pre-rebase hook gets correct input (6)': 
-	git checkout test &&
-	git reset --hard side &&
-	git checkout main &&
-	EDITOR=true git rebase -i main test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
-
-Already on 'test'
-HEAD is now at c847452 side
-Switched to branch 'main'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 10 - pre-rebase hook gets correct input (6)
-
-expecting success of 3413.11 'setup pre-rebase hook that fails': 
-	test_hook --setup --clobber pre-rebase <<-\EOF
-	false
-	EOF
-
-ok 11 - setup pre-rebase hook that fails
-
-expecting success of 3413.12 'pre-rebase hook stops rebase (1)': 
-	git checkout test &&
-	git reset --hard side &&
-	test_must_fail git rebase main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test 0 = $(git rev-list HEAD...side | wc -l) &&
-	test_must_fail git rebase --quit 2>err &&
-	test_grep "no rebase in progress" err
-
-Already on 'test'
-HEAD is now at c847452 side
-error: The pre-rebase hook refused to rebase.
-fatal: no rebase in progress
-ok 12 - pre-rebase hook stops rebase (1)
-
-expecting success of 3413.13 'pre-rebase hook stops rebase (2)': 
-	git checkout test &&
-	git reset --hard side &&
-	test_must_fail env EDITOR=: git rebase -i main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test 0 = $(git rev-list HEAD...side | wc -l)
-
-Already on 'test'
-HEAD is now at c847452 side
-error: The pre-rebase hook refused to rebase.
-ok 13 - pre-rebase hook stops rebase (2)
-
-expecting success of 3413.14 'rebase --no-verify overrides pre-rebase (1)': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase --no-verify main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test "z$(cat git)" = zworld
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 14 - rebase --no-verify overrides pre-rebase (1)
-
-expecting success of 3413.15 'rebase --no-verify overrides pre-rebase (2)': 
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase --no-verify -i main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test "z$(cat git)" = zworld
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 15 - rebase --no-verify overrides pre-rebase (2)
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t2013-checkout-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t2013-checkout-submodule/.git/
 expecting success of 2013.1 'setup': 
@@ -127550,6 +127345,214 @@
 1..74
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3413-rebase-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3413-rebase-hook/.git/
+expecting success of 3413.1 'setup': 
+	echo hello >file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	echo goodbye >file &&
+	git add file &&
+	test_tick &&
+	git commit -m second &&
+	git checkout -b side HEAD^ &&
+	echo world >git &&
+	git add git &&
+	test_tick &&
+	git commit -m side &&
+	git checkout main &&
+	git log --pretty=oneline --abbrev-commit --graph --all &&
+	git branch test side
+
+[main (root-commit) 6637599] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 20a11a4] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side'
+[side c847452] side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git
+Switched to branch 'main'
+* c847452 side
+| * 20a11a4 second
+|/  
+* 6637599 initial
+ok 1 - setup
+
+expecting success of 3413.2 'rebase': 
+	git checkout test &&
+	git reset --hard side &&
+	git rebase main &&
+	test "z$(cat git)" = zworld
+
+Switched to branch 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 2 - rebase
+
+expecting success of 3413.3 'rebase -i': 
+	git checkout test &&
+	git reset --hard side &&
+	EDITOR=true git rebase -i main &&
+	test "z$(cat git)" = zworld
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 3 - rebase -i
+
+expecting success of 3413.4 'setup pre-rebase hook': 
+	test_hook --setup pre-rebase <<-\EOF
+	echo "$1,$2" >.git/PRE-REBASE-INPUT
+	EOF
+
+ok 4 - setup pre-rebase hook
+
+expecting success of 3413.5 'pre-rebase hook gets correct input (1)': 
+	git checkout test &&
+	git reset --hard side &&
+	git rebase main &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
+
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 5 - pre-rebase hook gets correct input (1)
+
+expecting success of 3413.6 'pre-rebase hook gets correct input (2)': 
+	git checkout test &&
+	git reset --hard side &&
+	git rebase main test &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 6 - pre-rebase hook gets correct input (2)
+
+expecting success of 3413.7 'pre-rebase hook gets correct input (3)': 
+	git checkout test &&
+	git reset --hard side &&
+	git checkout main &&
+	git rebase main test &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
+
+Already on 'test'
+HEAD is now at c847452 side
+Switched to branch 'main'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 7 - pre-rebase hook gets correct input (3)
+
+expecting success of 3413.8 'pre-rebase hook gets correct input (4)': 
+	git checkout test &&
+	git reset --hard side &&
+	EDITOR=true git rebase -i main &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
+
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 8 - pre-rebase hook gets correct input (4)
+
+expecting success of 3413.9 'pre-rebase hook gets correct input (5)': 
+	git checkout test &&
+	git reset --hard side &&
+	EDITOR=true git rebase -i main test &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 9 - pre-rebase hook gets correct input (5)
+
+expecting success of 3413.10 'pre-rebase hook gets correct input (6)': 
+	git checkout test &&
+	git reset --hard side &&
+	git checkout main &&
+	EDITOR=true git rebase -i main test &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
+
+Already on 'test'
+HEAD is now at c847452 side
+Switched to branch 'main'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 10 - pre-rebase hook gets correct input (6)
+
+expecting success of 3413.11 'setup pre-rebase hook that fails': 
+	test_hook --setup --clobber pre-rebase <<-\EOF
+	false
+	EOF
+
+ok 11 - setup pre-rebase hook that fails
+
+expecting success of 3413.12 'pre-rebase hook stops rebase (1)': 
+	git checkout test &&
+	git reset --hard side &&
+	test_must_fail git rebase main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
+	test 0 = $(git rev-list HEAD...side | wc -l) &&
+	test_must_fail git rebase --quit 2>err &&
+	test_grep "no rebase in progress" err
+
+Already on 'test'
+HEAD is now at c847452 side
+error: The pre-rebase hook refused to rebase.
+fatal: no rebase in progress
+ok 12 - pre-rebase hook stops rebase (1)
+
+expecting success of 3413.13 'pre-rebase hook stops rebase (2)': 
+	git checkout test &&
+	git reset --hard side &&
+	test_must_fail env EDITOR=: git rebase -i main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
+	test 0 = $(git rev-list HEAD...side | wc -l)
+
+Already on 'test'
+HEAD is now at c847452 side
+error: The pre-rebase hook refused to rebase.
+ok 13 - pre-rebase hook stops rebase (2)
+
+expecting success of 3413.14 'rebase --no-verify overrides pre-rebase (1)': 
+	git checkout test &&
+	git reset --hard side &&
+	git rebase --no-verify main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
+	test "z$(cat git)" = zworld
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 14 - rebase --no-verify overrides pre-rebase (1)
+
+expecting success of 3413.15 'rebase --no-verify overrides pre-rebase (2)': 
+	git checkout test &&
+	git reset --hard side &&
+	EDITOR=true git rebase --no-verify -i main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
+	test "z$(cat git)" = zworld
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 15 - rebase --no-verify overrides pre-rebase (2)
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3417-rebase-whitespace-fix.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3417-rebase-whitespace-fix/.git/
 expecting success of 3417.1 'blank line at end of file; extend at end of file': 
@@ -145750,855 +145753,6 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3423-rebase-reword.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3415-rebase-autosquash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 44e366a] empty
- Author: A U Thor <author@example.com>
-[main 26ba9f6] empty2
- Author: A U Thor <author@example.com>
-[main 0d4e65d] fixup! empty-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 26ba9f6 [A U Thor @ 21 years ago] empty2 # empty
-ok 22 - autosquash with multiple empty patches
-
-expecting success of 3415.23 '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 cf5183f] to-fixup
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-fixup.t
-[main ff397ff] fixup!  to-fixup
- Author: A U Thor <author@example.com>
-Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
-ok 23 - extra spaces after fixup!
-
-expecting success of 3415.24 '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 f9ef1ba] To fixup
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wrapped
-[main fe90bc7] fixup! To fixup
- Author: A U Thor <author@example.com>
-Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
-ok 24 - wrapped original subject
-
-expecting success of 3415.25 '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 bd9420f] first
- Author: A U Thor <author@example.com>
-[some-squashes 6d29458] squash! first
- Author: A U Thor <author@example.com>
-[some-squashes 85370c6] second
- Author: A U Thor <author@example.com>
-[some-squashes c93cccf] 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 6d29458... [A U Thor @ 21 years ago] squash! first # empty
-[detached HEAD 96a770e] edited-first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:33:13 2005 -0700
-Rebasing (3/4)
Rebasing (4/4)
[detached HEAD c28af0d] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:33:13 2005 -0700
-Successfully rebased and updated refs/heads/some-squashes.
-Switched to branch 'main'
-fatal: no rebase in progress
-ok 25 - abort last squash
-
-expecting success of 3415.26 '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 6a9033f] to-fixup
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 63f0af4] squash! to-fixup
- Author: A U Thor <author@example.com>
-[main c9ec1dd] squash! to-fixup
- Author: A U Thor <author@example.com>
-[main 0d1074f] squash! 63f0af4ca8c3d16bdada48a5a263684c0037ec5d
- Author: A U Thor <author@example.com>
-[main b6ab4f6] squash! 63f0af4ca8c3d16bdada48a5a263684c0037ec5d
- Author: A U Thor <author@example.com>
-Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
[detached HEAD e9faffd] to-fixup
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:34:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/main.
-ok 26 - fixup a fixup
-
-expecting success of 3415.27 '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 e03d551] #818
- Author: A U Thor <author@example.com>
-[main b98ddcc] fixup! #818
- Author: A U Thor <author@example.com>
-Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
-ok 27 - fixup does not clean up commit message
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3418-rebase-continue.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3418-rebase-continue/.git/
 expecting success of 3418.1 'setup': 
@@ -147649,10 +146803,11 @@
 hint: Disable this message with "git config advice.mergeConflict false"
 Resolved 'F2' using previous resolution.
 Could not apply 24c5d85... 
-[detached HEAD cf7125b] commit-new-file-F2-on-topic-branch
+
+[detached HEAD da61d7a] commit-new-file-F2-on-topic-branch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Stopped at cf7125b (commit-new-file-F2-on-topic-branch)
+ 1 file changed, 1 deletion(-)
+Rebasing (2/2)
Stopped at da61d7a (commit-new-file-F2-on-topic-branch)
 ok 20 - patch file is removed before break command
 
 expecting success of 3418.21 '--reschedule-failed-exec': 
@@ -147984,6 +147139,855 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3423-rebase-reword.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3415-rebase-autosquash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 44e366a] empty
+ Author: A U Thor <author@example.com>
+[main 26ba9f6] empty2
+ Author: A U Thor <author@example.com>
+[main 0d4e65d] fixup! empty-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 26ba9f6 [A U Thor @ 20 years ago] empty2 # empty
+ok 22 - autosquash with multiple empty patches
+
+expecting success of 3415.23 'extra spaces after fixup!': 
+	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 cf5183f] to-fixup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to-fixup.t
+[main ff397ff] fixup!  to-fixup
+ Author: A U Thor <author@example.com>
+Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
+ok 23 - extra spaces after fixup!
+
+expecting success of 3415.24 '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 f9ef1ba] To fixup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wrapped
+[main fe90bc7] fixup! To fixup
+ Author: A U Thor <author@example.com>
+Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
+ok 24 - wrapped original subject
+
+expecting success of 3415.25 '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 bd9420f] first
+ Author: A U Thor <author@example.com>
+[some-squashes 6d29458] squash! first
+ Author: A U Thor <author@example.com>
+[some-squashes 85370c6] second
+ Author: A U Thor <author@example.com>
+[some-squashes c93cccf] 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 6d29458... [A U Thor @ 20 years ago] squash! first # empty
+[detached HEAD 96a770e] edited-first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 16:33:13 2005 -0700
+Rebasing (3/4)
Rebasing (4/4)
[detached HEAD c28af0d] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 16:33:13 2005 -0700
+Successfully rebased and updated refs/heads/some-squashes.
+Switched to branch 'main'
+fatal: no rebase in progress
+ok 25 - abort last squash
+
+expecting success of 3415.26 '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 6a9033f] to-fixup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 63f0af4] squash! to-fixup
+ Author: A U Thor <author@example.com>
+[main c9ec1dd] squash! to-fixup
+ Author: A U Thor <author@example.com>
+[main 0d1074f] squash! 63f0af4ca8c3d16bdada48a5a263684c0037ec5d
+ Author: A U Thor <author@example.com>
+[main b6ab4f6] squash! 63f0af4ca8c3d16bdada48a5a263684c0037ec5d
+ Author: A U Thor <author@example.com>
+Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
[detached HEAD e9faffd] to-fixup
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 16:34:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/main.
+ok 26 - fixup a fixup
+
+expecting success of 3415.27 '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 e03d551] #818
+ Author: A U Thor <author@example.com>
+[main b98ddcc] fixup! #818
+ Author: A U Thor <author@example.com>
+Rebasing (2/2)
Successfully rebased and updated refs/heads/main.
+ok 27 - fixup does not clean up commit message
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3424-rebase-empty.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3424-rebase-empty/.git/
 expecting success of 3424.1 'setup test repository': 
@@ -148744,3135 +148748,1572 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t1092-sparse-checkout-compatibility.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
-
-		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" &&
-
-		git checkout -b rename-out-to-out rename-base &&
-		mv folder1/a folder2/b &&
-		mv folder1/larger-content folder2/edited-content &&
-		echo >>folder2/edited-content &&
-		echo >>folder2/0/1 &&
-		echo stuff >>deep/deeper1/a &&
-		git add . &&
-		git commit -m "rename folder1/... to folder2/..." &&
-
-		git checkout -b 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/..." &&
-
-		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/..." &&
-
-		git checkout -b df-conflict-1 base &&
-		rm -rf folder1 &&
-		echo content >folder1 &&
-		git add . &&
-		git commit -m "dir to file" &&
-
-		git checkout -b df-conflict-2 base &&
-		rm -rf folder2 &&
-		echo content >folder2 &&
-		git add . &&
-		git commit -m "dir to file" &&
+*** t3427-rebase-subtree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3427-rebase-subtree/.git/
+expecting success of 3427.1 'setup': 
+	test_commit README &&
 
-		git checkout -b fd-conflict base &&
-		rm a &&
-		mkdir a &&
-		echo content >a/a &&
-		git add . &&
-		git commit -m "file to dir" &&
+	git init files &&
+	test_commit -C files topic_1 &&
+	test_commit -C files topic_2 &&
+	test_commit -C files topic_3 &&
 
-		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 &&
+	: perform subtree merge into files_subtree/ &&
+	git fetch files refs/heads/main:refs/heads/files-main &&
+	git merge -s ours --no-commit --allow-unrelated-histories \
+		files-main &&
+	git read-tree --prefix=files_subtree -u files-main &&
+	git commit -m "Add subproject main" &&
 
-		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" &&
+	: add two extra commits to rebase &&
+	test_commit -C files_subtree topic_4 &&
+	test_commit files_subtree/topic_5 &&
 
-		git checkout -f base &&
-		git reset --hard
-	)
+	git checkout -b to-rebase &&
+	git fast-export --no-data HEAD -- files_subtree/ |
+		sed -e "s%\([0-9a-f]\{40\} \)files_subtree/%\1%" |
+		git fast-import --force --quiet &&
+	git reset --hard &&
+	git commit -m "Empty commit" --allow-empty
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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/...
+[main (root-commit) 9b47b78] README
  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/...
+ 1 file changed, 1 insertion(+)
+ create mode 100644 README.t
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3427-rebase-subtree/files/.git/
+[main (root-commit) 8d5ac37] topic_1
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 topic_1.t
+[main e30c5d3] topic_2
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 topic_2.t
+[main 152af92] topic_3
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 topic_3.t
+From files
+ * [new branch]      main       -> files-main
+ * [new tag]         topic_3    -> topic_3
+ * [new tag]         topic_1    -> topic_1
+ * [new tag]         topic_2    -> topic_2
+Automatic merge went well; stopped before committing as requested
+[main 90609d1] Add subproject main
  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
+[main 9e13d1d] topic_4
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-Switched to a new branch 'merge-right'
-[merge-right 4f73b62] right
+ 1 file changed, 1 insertion(+)
+ create mode 100644 files_subtree/topic_4.t
+[main 76d9147] files_subtree/topic_5
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-Switched to a new branch 'deepest'
-[deepest cb037bf] update deepest
+ 1 file changed, 1 insertion(+)
+ create mode 100644 files_subtree/topic_5.t
+Switched to a new branch 'to-rebase'
+HEAD is now at e6c9414 files_subtree/topic_5
+[to-rebase f09580c] Empty commit
  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 1092.2 'sparse-index contents': 
-	init_repos &&
-
-	# Remove deep, add three other directories.
-	test_sparse_checkout_set \
-		"folder1 folder2 x" \
-		"before deep" &&
-
-	# Remove folder1, add deep
-	test_sparse_checkout_set \
-		"deep folder2 x" \
-		"before folder1" &&
-
-	# 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 3427.2 'Rebase -Xsubtree --empty=ask --onto commit': 
+	reset_rebase &&
+	git checkout -b rebase-onto to-rebase &&
+	test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-main main &&
+	: first pick results in no changes &&
+	git rebase --skip &&
+	test "$(commit_message HEAD~2)" = "topic_4" &&
+	test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
+	test "$(commit_message HEAD)" = "Empty commit"
 
-	# 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" &&
+fatal: no rebase in progress
+HEAD is now at f09580c Empty commit
+Switched to a new branch 'rebase-onto'
+warning: --empty=ask is deprecated; use '--empty=stop' instead.
+Rebasing (1/4)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-	# Drop down to only files at root
-	test_sparse_checkout_set \
-		"" \
-		"before deep folder1 folder2 x" &&
+    git commit --allow-empty
 
-	# 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
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 152af92
+Last command done (1 command done):
+   pick 4b9884c Add subproject main
+Next commands to do (3 remaining commands):
+   pick a622443 topic_4
+   pick e6c9414 files_subtree/topic_5
+  (use "git rebase --edit-todo" to view and edit)
+You are currently rebasing branch 'rebase-onto' on '152af92'.
+  (all conflicts fixed: run "git rebase --continue")
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	files/
 
-expecting success of 1092.3 'expanded in-memory index matches full index': 
-	init_repos &&
-	test_sparse_match git ls-files --stage
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 4b9884c... Add subproject main
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/rebase-onto.
+ok 2 - Rebase -Xsubtree --empty=ask --onto commit
 
-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 3427.3 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit': 
+	reset_rebase &&
+	git checkout -b rebase-merges-onto to-rebase &&
+	test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-main --root &&
+	: first pick results in no changes &&
+	git rebase --skip &&
+	test "$(commit_message HEAD~2)" = "topic_4" &&
+	test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
+	test "$(commit_message HEAD)" = "Empty commit"
 
-expecting success of 1092.4 'root directory cannot be sparse': 
-	init_repos &&
+fatal: no rebase in progress
+HEAD is now at d6e246a Empty commit
+Switched to a new branch 'rebase-merges-onto'
+warning: --empty=ask is deprecated; use '--empty=stop' instead.
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-	# 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 &&
+    git commit --allow-empty
 
-	# 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
+Otherwise, please use 'git rebase --skip'
+interactive rebase in progress; onto 152af92
+Last commands done (3 commands done):
+   reset onto
+   pick 4b9884c Add subproject main
+  (see more in file .git/rebase-merge/done)
+Next commands to do (3 remaining commands):
+   pick a622443 topic_4
+   pick e6c9414 files_subtree/topic_5
+  (use "git rebase --edit-todo" to view and edit)
+You are currently rebasing branch 'rebase-merges-onto' on '152af92'.
+  (all conflicts fixed: run "git rebase --continue")
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	files/
 
-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
+nothing added to commit but untracked files present (use "git add" to track)
+Could not apply 4b9884c... Add subproject main
+Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/rebase-merges-onto.
+ok 3 - Rebase -Xsubtree --empty=ask --rebase-merges --onto commit
 
-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
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3420-rebase-autostash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3420-rebase-autostash/.git/
+expecting success of 3420.1 'setup': 
+	echo hello-world >file0 &&
+	git add . &&
+	test_tick &&
+	git commit -m "initial commit" &&
+	git checkout -b feature-branch &&
+	echo another-hello >file1 &&
+	echo goodbye >file2 &&
+	git add . &&
+	test_tick &&
+	git commit -m "second commit" &&
+	echo final-goodbye >file3 &&
+	git add . &&
+	test_tick &&
+	git commit -m "third commit" &&
+	git checkout -b unrelated-onto-branch main &&
+	echo unrelated >file4 &&
+	git add . &&
+	test_tick &&
+	git commit -m "unrelated commit" &&
+	git checkout -b related-onto-branch main &&
+	echo conflicting-change >file2 &&
+	git add . &&
+	test_tick &&
+	git commit -m "related commit" &&
+	remove_progress_re="$(printf "s/.*\\r//")"
 
-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
+[main (root-commit) bfa4f02] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file0
+Switched to a new branch 'feature-branch'
+[feature-branch 6fe95e2] second commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[feature-branch 0c4d2f1] third commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Switched to a new branch 'unrelated-onto-branch'
+[unrelated-onto-branch 4aede2f] unrelated commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+Switched to a new branch 'related-onto-branch'
+[related-onto-branch c57d250] related commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 1 - setup
 
-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 3420.2 'rebase: fast-forward rebase': 
+	test_config rebase.autostash true &&
+	git reset --hard &&
+	git checkout -b behind-feature-branch feature-branch~1 &&
+	test_when_finished git branch -D behind-feature-branch &&
+	echo dirty >>file1 &&
+	git rebase feature-branch &&
+	grep dirty file1 &&
+	git checkout feature-branch
 
-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
+HEAD is now at c57d250 related commit
+Switched to a new branch 'behind-feature-branch'
+Created autostash: b346341
+Applied autostash.
+Successfully rebased and updated refs/heads/behind-feature-branch.
+dirty
+Switched to branch 'feature-branch'
+M	file1
+Deleted branch behind-feature-branch (was 0c4d2f1).
+ok 2 - rebase: fast-forward rebase
 
-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 3420.3 'rebase: noop rebase': 
+	test_config rebase.autostash true &&
+	git reset --hard &&
+	git checkout -b same-feature-branch feature-branch &&
+	test_when_finished git branch -D same-feature-branch &&
+	echo dirty >>file1 &&
+	git rebase feature-branch &&
+	grep dirty file1 &&
+	git checkout feature-branch
 
-expecting success of 1092.8 'add, commit, checkout': 
-	init_repos &&
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'same-feature-branch'
+Created autostash: 925afbd
+Current branch same-feature-branch is up to date.
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file1
+Deleted branch same-feature-branch (was 0c4d2f1).
+ok 3 - rebase: noop rebase
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-	run_on_all ../edit-contents README.md &&
+expecting success of 3420.4 'rebase --apply: restore autostash when pre-rebase hook fails': 
+		git checkout -f feature-branch &&
+		test_hook pre-rebase <<-\EOF &&
+		exit 1
+		EOF
 
-	test_all_match git add README.md &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git commit -m "Add README.md" &&
+		echo changed >file0 &&
+		test_must_fail git rebase $type --autostash -f HEAD^ &&
+		test_must_fail git rebase --quit 2>err &&
+		test_grep "no rebase in progress" err &&
+		echo changed >expect &&
+		test_cmp expect file0
+	
+Already on 'feature-branch'
+Created autostash: 87bce87
+Current branch feature-branch is up to date, rebase forced.
+error: The pre-rebase hook refused to rebase.
+Applied autostash.
+fatal: no rebase in progress
+ok 4 - rebase --apply: restore autostash when pre-rebase hook fails
 
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout - &&
+expecting success of 3420.5 'rebase --apply: restore autostash when checkout onto fails': 
+		git checkout -f --detach feature-branch &&
+		echo uncommitted-content >file0 &&
+		echo untracked >file4 &&
+		test_when_finished "rm file4" &&
+		test_must_fail git rebase $type --autostash \
+							unrelated-onto-branch &&
+		test_must_fail git rebase --quit 2>err &&
+		test_grep "no rebase in progress" err &&
+		echo uncommitted-content >expect &&
+		test_cmp expect file0
+	
+HEAD is now at 0c4d2f1 third commit
+Created autostash: b8f272c
+error: The following untracked working tree files would be overwritten by checkout:
+	file4
+Please move or remove them before you switch branches.
+Aborting
+error: Could not detach HEAD
+First, rewinding head to replay your work on top of it...
+Applied autostash.
+fatal: no rebase in progress
+ok 5 - rebase --apply: restore autostash when checkout onto fails
 
-	run_on_all ../edit-contents README.md &&
+expecting success of 3420.6 'rebase --apply: restore autostash when branch checkout fails': 
+		git checkout -f unrelated-onto-branch^ &&
+		echo uncommitted-content >file0 &&
+		echo untracked >file4 &&
+		test_when_finished "rm file4" &&
+		test_must_fail git rebase $type --autostash HEAD \
+							unrelated-onto-branch &&
+		test_must_fail git rebase --quit 2>err &&
+		test_grep "no rebase in progress" err &&
+		echo uncommitted-content >expect &&
+		test_cmp expect file0
+	
+Previous HEAD position was 0c4d2f1 third commit
+HEAD is now at bfa4f02 initial commit
+Created autostash: 2fa90c3
+error: The following untracked working tree files would be overwritten by checkout:
+	file4
+Please move or remove them before you switch branches.
+Aborting
+error: could not switch to unrelated-onto-branch
+Applied autostash.
+fatal: no rebase in progress
+ok 6 - rebase --apply: restore autostash when branch checkout fails
 
-	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 3420.7 'rebase --apply: dirty worktree, --no-autostash': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		test_when_finished git checkout feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type --no-autostash unrelated-onto-branch
+	
+HEAD is now at bfa4f02 initial commit
+Previous HEAD position was bfa4f02 initial commit
+Switched to a new branch 'rebased-feature-branch'
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 7 - rebase --apply: dirty worktree, --no-autostash
 
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout - &&
+expecting success of 3420.8 'rebase --apply: dirty worktree, non-conflicting rebase': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		echo dirty >>file3 &&
+		git rebase$type unrelated-onto-branch >actual 2>&1 &&
+		grep unrelated file4 &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+unrelated
+dirty
+Switched to branch 'feature-branch'
+M	file3
+ok 8 - rebase --apply: dirty worktree, non-conflicting rebase
 
-	run_on_all ../edit-contents deep/newfile &&
+expecting success of 3420.9 'rebase --apply --autostash: check output': 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-apply} &&
+		if test ${suffix} = "interactive"; then
+			suffix=merge
+		fi &&
+		create_expected_success_$suffix &&
+		sed "$remove_progress_re" <actual >actual2 &&
+		test_cmp expected actual2
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 9 - rebase --apply --autostash: check output
 
-	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 3420.10 'rebase --apply: dirty index, non-conflicting rebase': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		git add file3 &&
+		git rebase$type unrelated-onto-branch &&
+		grep unrelated file4 &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: 7305f55
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Applying: third commit
+Applied autostash.
+unrelated
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was b607b14).
+ok 10 - rebase --apply: dirty index, non-conflicting rebase
 
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout -
+expecting success of 3420.11 'rebase --apply: conflicting rebase': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		rm -rf $dotest &&
+		git reset --hard &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+c57d250 related commit
+virtual second commit
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging file2
+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 advice.mergeConflict false"
+Patch failed at 0001 second commit
+HEAD is now at c57d250 related commit
+Previous HEAD position was c57d250 related commit
+Switched to branch 'feature-branch'
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 11 - rebase --apply: conflicting rebase
 
-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 3420.12 'rebase --apply: --continue': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		echo "conflicting-plus-goodbye" >file2 &&
+		git add file2 &&
+		git rebase --continue &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+c57d250 related commit
+virtual second commit
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging file2
+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 advice.mergeConflict false"
+Patch failed at 0001 second commit
+Applying: second commit
+Applying: third commit
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 51f2c81).
+ok 12 - rebase --apply: --continue
 
-expecting success of 1092.9 'deep changes during checkout': 
-	init_repos &&
+expecting success of 3420.13 'rebase --apply: --skip': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --skip &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+c57d250 related commit
+virtual second commit
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging file2
+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 advice.mergeConflict false"
+Patch failed at 0001 second commit
+Applying: third commit
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was fa02356).
+ok 13 - rebase --apply: --skip
 
-	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 3420.14 'rebase --apply: --abort': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --abort &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+c57d250 related commit
+virtual second commit
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging file2
+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 advice.mergeConflict false"
+Patch failed at 0001 second commit
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 14 - rebase --apply: --abort
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 9 - deep changes during checkout
+expecting success of 3420.15 'rebase --apply: --quit': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		git diff >expect &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --quit &&
+		test_when_finished git stash drop &&
+		test_path_is_missing $dotest/autostash &&
+		! grep dirty file3 &&
+		git stash show -p >actual &&
+		test_cmp expect actual &&
+		git reset --hard &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+c57d250 related commit
+virtual second commit
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in file2
+Auto-merging file2
+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 advice.mergeConflict false"
+Patch failed at 0001 second commit
+Autostash exists; creating a new stash entry.
+Your changes are safe in the stash.
+You can run "git stash pop" or "git stash drop" at any time.
+grep: file3: No such file or directory
+HEAD is now at c57d250 related commit
+Previous HEAD position was c57d250 related commit
+Switched to branch 'feature-branch'
+Dropped refs/stash@{0} (ce96636712fc38300c1f0f777cc2fac6dee041c0)
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 15 - rebase --apply: --quit
 
-expecting success of 1092.10 'checkout with modified sparse directory': 
-	init_repos &&
+expecting success of 3420.16 'rebase --apply: non-conflicting rebase, conflicting stash': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		echo dirty >file4 &&
+		git add file4 &&
+		git rebase$type unrelated-onto-branch >actual 2>&1 &&
+		test_path_is_missing $dotest &&
+		git reset --hard &&
+		grep unrelated file4 &&
+		! grep dirty file4 &&
+		git checkout feature-branch &&
+		git stash pop &&
+		grep dirty file4
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+HEAD is now at b607b14 third commit
+unrelated
+Switched to branch 'feature-branch'
+Merging Version stash was based on with Stashed changes
+On branch feature-branch
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   file4
 
-	test_all_match git checkout rename-in-to-out -- . &&
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git checkout base
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual2
+	err
+	expect
+	expected
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 10 - checkout with modified sparse directory
+Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
+dirty
+ok 16 - rebase --apply: non-conflicting rebase, conflicting stash
 
-expecting success of 1092.11 'checkout orphan then non-orphan': 
-	init_repos &&
+expecting success of 3420.17 'rebase --apply: check output with conflicting stash': 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-apply} &&
+		if test ${suffix} = "interactive"; then
+			suffix=merge
+		fi &&
+		create_expected_failure_$suffix &&
+		sed "$remove_progress_re" <actual >actual2 &&
+		test_cmp expected actual2
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 17 - rebase --apply: check output with conflicting stash
 
-	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 3420.18 'rebase --merge: restore autostash when pre-rebase hook fails': 
+		git checkout -f feature-branch &&
+		test_hook pre-rebase <<-\EOF &&
+		exit 1
+		EOF
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 11 - checkout orphan then non-orphan
+		echo changed >file0 &&
+		test_must_fail git rebase $type --autostash -f HEAD^ &&
+		test_must_fail git rebase --quit 2>err &&
+		test_grep "no rebase in progress" err &&
+		echo changed >expect &&
+		test_cmp expect file0
+	
+Already on 'feature-branch'
+Created autostash: 87bce87
+Current branch feature-branch is up to date, rebase forced.
+error: The pre-rebase hook refused to rebase.
+Applied autostash.
+fatal: no rebase in progress
+ok 18 - rebase --merge: restore autostash when pre-rebase hook fails
 
-expecting success of 1092.12 'add outside sparse cone': 
-	init_repos &&
+expecting success of 3420.19 'rebase --merge: restore autostash when checkout onto fails': 
+		git checkout -f --detach feature-branch &&
+		echo uncommitted-content >file0 &&
+		echo untracked >file4 &&
+		test_when_finished "rm file4" &&
+		test_must_fail git rebase $type --autostash \
+							unrelated-onto-branch &&
+		test_must_fail git rebase --quit 2>err &&
+		test_grep "no rebase in progress" err &&
+		echo uncommitted-content >expect &&
+		test_cmp expect file0
+	
+HEAD is now at 0c4d2f1 third commit
+Created autostash: b8f272c
+error: The following untracked working tree files would be overwritten by checkout:
+	file4
+Please move or remove them before you switch branches.
+Aborting
+Applied autostash.
+error: could not detach HEAD
+fatal: no rebase in progress
+ok 19 - rebase --merge: restore autostash when checkout onto fails
 
-	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 3420.20 'rebase --merge: restore autostash when branch checkout fails': 
+		git checkout -f unrelated-onto-branch^ &&
+		echo uncommitted-content >file0 &&
+		echo untracked >file4 &&
+		test_when_finished "rm file4" &&
+		test_must_fail git rebase $type --autostash HEAD \
+							unrelated-onto-branch &&
+		test_must_fail git rebase --quit 2>err &&
+		test_grep "no rebase in progress" err &&
+		echo uncommitted-content >expect &&
+		test_cmp expect file0
+	
+Previous HEAD position was 0c4d2f1 third commit
+HEAD is now at bfa4f02 initial commit
+Created autostash: 2fa90c3
+error: The following untracked working tree files would be overwritten by checkout:
+	file4
+Please move or remove them before you switch branches.
+Aborting
+error: could not switch to unrelated-onto-branch
+Applied autostash.
+fatal: no rebase in progress
+ok 20 - rebase --merge: restore autostash when branch checkout fails
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-ok 12 - add outside sparse cone
+expecting success of 3420.21 'rebase --merge: dirty worktree, --no-autostash': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		test_when_finished git checkout feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type --no-autostash unrelated-onto-branch
+	
+HEAD is now at bfa4f02 initial commit
+Previous HEAD position was bfa4f02 initial commit
+Switched to a new branch 'rebased-feature-branch'
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 21 - rebase --merge: dirty worktree, --no-autostash
 
-expecting success of 1092.13 'commit including unstaged changes': 
-	init_repos &&
+expecting success of 3420.22 'rebase --merge: dirty worktree, non-conflicting rebase': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		echo dirty >>file3 &&
+		git rebase$type unrelated-onto-branch >actual 2>&1 &&
+		grep unrelated file4 &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+unrelated
+dirty
+Switched to branch 'feature-branch'
+M	file3
+ok 22 - rebase --merge: dirty worktree, non-conflicting rebase
 
-	write_script edit-file <<-\EOF &&
-	echo $1 >$2
-	EOF
+expecting success of 3420.23 'rebase --merge --autostash: check output': 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-apply} &&
+		if test ${suffix} = "interactive"; then
+			suffix=merge
+		fi &&
+		create_expected_success_$suffix &&
+		sed "$remove_progress_re" <actual >actual2 &&
+		test_cmp expected actual2
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 23 - rebase --merge --autostash: check output
 
-	run_on_all ../edit-file 1 a &&
-	run_on_all ../edit-file 1 deep/a &&
+expecting success of 3420.24 'rebase --merge: dirty index, non-conflicting rebase': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		git add file3 &&
+		git rebase$type unrelated-onto-branch &&
+		grep unrelated file4 &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: 7305f55
+Rebasing (1/2)
Rebasing (2/2)
Applied autostash.
+Successfully rebased and updated refs/heads/rebased-feature-branch.
+unrelated
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was b607b14).
+ok 24 - rebase --merge: dirty index, non-conflicting rebase
 
-	test_all_match git commit -m "-a" -a &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3420.25 'rebase --merge: conflicting rebase': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		rm -rf $dotest &&
+		git reset --hard &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+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 advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+HEAD is now at c57d250 related commit
+Previous HEAD position was c57d250 related commit
+Switched to branch 'feature-branch'
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 25 - rebase --merge: conflicting rebase
 
-	run_on_all ../edit-file 2 a &&
-	run_on_all ../edit-file 2 deep/a &&
+expecting success of 3420.26 'rebase --merge: --continue': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		echo "conflicting-plus-goodbye" >file2 &&
+		git add file2 &&
+		git rebase --continue &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+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 advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+[detached HEAD 62edf38] second commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file1
+Rebasing (2/2)
Applied autostash.
+Successfully rebased and updated refs/heads/rebased-feature-branch.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 51f2c81).
+ok 26 - rebase --merge: --continue
 
-	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 3420.27 'rebase --merge: --skip': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --skip &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+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 advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+Rebasing (2/2)
Applied autostash.
+Successfully rebased and updated refs/heads/rebased-feature-branch.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was fa02356).
+ok 27 - rebase --merge: --skip
 
-	run_on_all ../edit-file 3 a &&
-	run_on_all ../edit-file 3 deep/a &&
+expecting success of 3420.28 'rebase --merge: --abort': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --abort &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+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 advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 28 - rebase --merge: --abort
 
-	test_all_match git commit -m "--amend" -a --amend &&
-	test_all_match git status --porcelain=v2
+expecting success of 3420.29 'rebase --merge: --quit': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		git diff >expect &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --quit &&
+		test_when_finished git stash drop &&
+		test_path_is_missing $dotest/autostash &&
+		! grep dirty file3 &&
+		git stash show -p >actual &&
+		test_cmp expect actual &&
+		git reset --hard &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+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 advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+Autostash exists; creating a new stash entry.
+Your changes are safe in the stash.
+You can run "git stash pop" or "git stash drop" at any time.
+grep: file3: No such file or directory
+HEAD is now at c57d250 related commit
+Previous HEAD position was c57d250 related commit
+Switched to branch 'feature-branch'
+Dropped refs/stash@{0} (ce96636712fc38300c1f0f777cc2fac6dee041c0)
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 29 - rebase --merge: --quit
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 13 - commit including unstaged changes
+expecting success of 3420.30 'rebase --merge: non-conflicting rebase, conflicting stash': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		echo dirty >file4 &&
+		git add file4 &&
+		git rebase$type unrelated-onto-branch >actual 2>&1 &&
+		test_path_is_missing $dotest &&
+		git reset --hard &&
+		grep unrelated file4 &&
+		! grep dirty file4 &&
+		git checkout feature-branch &&
+		git stash pop &&
+		grep dirty file4
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+HEAD is now at b607b14 third commit
+unrelated
+Switched to branch 'feature-branch'
+Merging Version stash was based on with Stashed changes
+On branch feature-branch
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   file4
 
-expecting success of 1092.14 'status/add: outside sparse cone': 
-	init_repos &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual2
+	err
+	expect
+	expected
 
-	# 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 &&
+Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
+dirty
+ok 30 - rebase --merge: non-conflicting rebase, conflicting stash
 
-	test_sparse_match git status &&
+expecting success of 3420.31 'rebase --merge: check output with conflicting stash': 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-apply} &&
+		if test ${suffix} = "interactive"; then
+			suffix=merge
+		fi &&
+		create_expected_failure_$suffix &&
+		sed "$remove_progress_re" <actual >actual2 &&
+		test_cmp expected actual2
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 31 - rebase --merge: check output with conflicting stash
 
-	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 3420.32 'rebase --interactive: restore autostash when pre-rebase hook fails': 
+		git checkout -f feature-branch &&
+		test_hook pre-rebase <<-\EOF &&
+		exit 1
+		EOF
 
-	test_sparse_match git status --porcelain=v2 &&
-
-	# 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 &&
-
-	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} &&
-
-	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}
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-ok 14 - status/add: outside sparse cone
-
-expecting success of 1092.15 'checkout and reset --hard': 
-	init_repos &&
-
-	test_all_match git checkout update-folder1 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git checkout update-deep &&
-	test_all_match git status --porcelain=v2 &&
-
-	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
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 15 - checkout and reset --hard
-
-expecting success of 1092.16 'diff --cached': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>README.md
-	EOF
-	run_on_all ../edit-contents &&
-
-	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
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 16 - diff --cached
-
-expecting success of 1092.17 'diff with renames and conflicts': 
-	init_repos &&
-
-	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
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 17 - diff with renames and conflicts
-
-expecting success of 1092.18 'diff with directory/file conflicts': 
-	init_repos &&
-
-	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
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 4a04e79 rename folder1/... to folder2/...
-HEAD is now at d11c5fe rename folder1/... to deep/deeper1/...
-HEAD is now at e5d0f8e rename deep/deeper1/... to folder1/...
-HEAD is now at 974b58d dir to file
-HEAD is now at bef3412 dir to file
-ok 18 - diff with directory/file conflicts
-
-expecting success of 1092.19 'log with pathspec outside sparse definition': 
-	init_repos &&
-
-	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 &&
-
-	test_all_match git checkout update-folder1 &&
-	test_all_match git log -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 19 - log with pathspec outside sparse definition
-
-expecting success of 1092.20 'blame with pathspec inside sparse definition': 
-	init_repos &&
-
-	for file in a \
-			deep/a \
-			deep/deeper1/a \
-			deep/deeper1/deepest/a
-	do
-		test_all_match git 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 20 - blame with pathspec inside sparse definition
-
-expecting success of 1092.21 'blame with pathspec outside sparse definition': 
-	init_repos &&
-	test_sparse_match git sparse-checkout set &&
-
-	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
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 21 - blame with pathspec outside sparse definition
-
-expecting success of 1092.22 'checkout and reset (mixed)': 
-	init_repos &&
-
-	test_all_match git checkout -b reset-test update-deep &&
-	test_all_match git reset deepest &&
-
-	# 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
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-M	folder1/a
-ok 22 - checkout and reset (mixed)
-
-expecting success of 1092.23 'checkout and reset (merge)': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	test_all_match git checkout -b reset-test update-deep &&
-	run_on_all ../edit-contents a &&
-	test_all_match git reset --merge deepest &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset --hard update-deep &&
-	run_on_all ../edit-contents deep/a &&
-	test_all_match test_must_fail git reset --merge deepest
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 23 - checkout and reset (merge)
-
-expecting success of 1092.24 'checkout and reset (keep)': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	test_all_match git checkout -b reset-test update-deep &&
-	run_on_all ../edit-contents a &&
-	test_all_match git reset --keep deepest &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset --hard update-deep &&
-	run_on_all ../edit-contents deep/a &&
-	test_all_match test_must_fail git reset --keep deepest
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 24 - checkout and reset (keep)
-
-expecting success of 1092.25 'reset with pathspecs inside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	test_all_match git checkout -b reset-test update-deep &&
-	run_on_all ../edit-contents deep/a &&
-
-	test_all_match git reset base -- deep/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset base -- nonexistent-file &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset deepest -- deep &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 25 - reset with pathspecs inside sparse definition
-
-expecting success of 1092.26 'reset with pathspecs outside sparse definition': 
-	init_repos &&
-	test_all_match git checkout -b reset-test base &&
-
-	test_sparse_match git reset update-folder1 -- folder1 &&
-	git -C full-checkout reset update-folder1 -- folder1 &&
-	test_all_match git ls-files -s -- folder1 &&
-
-	test_sparse_match git reset update-folder2 -- folder2/a &&
-	git -C full-checkout reset update-folder2 -- folder2/a &&
-	test_all_match git ls-files -s -- folder2/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Unstaged changes after reset:
-M	folder1/a
-Unstaged changes after reset:
-M	folder1/a
-M	folder2/a
-ok 26 - reset with pathspecs outside sparse definition
-
-expecting success of 1092.27 'reset with wildcard pathspec': 
-	init_repos &&
-
-	test_all_match git reset update-deep -- deep\* &&
-	test_all_match git ls-files -s -- deep &&
-
-	test_all_match git reset deepest -- deep\*\*\* &&
-	test_all_match git ls-files -s -- deep &&
-
-	# The following `git reset`s result in updating the index on files with
-	# `skip-worktree` enabled. To avoid failing due to discrepencies in reported
-	# "modified" files, `test_sparse_match` reset is performed separately from
-	# "full-checkout" reset, then the index contents of all repos are verified.
-
-	test_sparse_match git reset update-folder1 -- \*/a &&
-	git -C full-checkout reset update-folder1 -- \*/a &&
-	test_all_match git ls-files -s -- deep/a folder1/a &&
-
-	test_sparse_match git reset update-folder2 -- folder\* &&
-	git -C full-checkout reset update-folder2 -- folder\* &&
-	test_all_match git ls-files -s -- folder10 folder1 folder2 &&
-
-	test_sparse_match git reset base -- folder1/\* &&
-	git -C full-checkout reset base -- folder1/\* &&
-	test_all_match git ls-files -s -- folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Unstaged changes after reset:
-M	folder1/a
-Unstaged changes after reset:
-M	folder2/a
-Unstaged changes after reset:
-M	folder2/a
-ok 27 - reset with wildcard pathspec
-
-expecting success of 1092.28 'reset hard with removed sparse dir': 
-	init_repos &&
-
-	run_on_all git rm -r --sparse folder1 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset --hard &&
-	test_all_match git status --porcelain=v2 &&
-
-	cat >expect <<-\EOF &&
-	folder1/
-	EOF
-
-	git -C sparse-index ls-files --sparse folder1 >out &&
-	test_cmp expect out
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 28 - reset hard with removed sparse dir
-
-expecting success of 1092.29 'update-index modify outside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Create & modify folder1/a
-	# Note that this setup is a manual way of reaching the erroneous
-	# condition in which a `skip-worktree` enabled, outside-of-cone file
-	# exists on disk. It is used here to ensure `update-index` is stable
-	# and behaves predictably if such a condition occurs.
-	run_on_sparse mkdir -p folder1 &&
-	run_on_sparse cp ../initial-repo/folder1/a folder1/a &&
-	run_on_all ../edit-contents folder1/a &&
-
-	# If file has skip-worktree enabled, but the file is present, it is
-	# treated the same as if skip-worktree is disabled
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# When skip-worktree is disabled (even on files outside sparse cone), file
-	# is updated in the index
-	test_sparse_match git update-index --no-skip-worktree folder1/a &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 29 - update-index modify outside sparse definition
-
-expecting success of 1092.30 'update-index --add outside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Create folder1, add new file
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all ../edit-contents folder1/b &&
-
-	# The *untracked* out-of-cone file is added to the index because it does
-	# not have a `skip-worktree` bit to signal that it should be ignored
-	# (unlike in `git add`, which will fail due to the file being outside
-	# the sparse checkout definition).
-	test_all_match git update-index --add folder1/b &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 30 - update-index --add outside sparse definition
-
-expecting success of 1092.31 'update-index --remove outside sparse definition': 
-	init_repos &&
-
-	# When --ignore-skip-worktree-entries is _not_ specified:
-	# out-of-cone, not-on-disk files are removed from the index
-	test_sparse_match git update-index --remove folder1/a &&
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --cached --name-status &&
-	test_cmp expect sparse-checkout-out &&
-
-	test_sparse_match git diff-index --cached HEAD &&
-
-	# Reset the state
-	test_all_match git reset --hard &&
-
-	# When --ignore-skip-worktree-entries is specified, out-of-cone
-	# (skip-worktree) files are ignored
-	test_sparse_match git update-index --remove --ignore-skip-worktree-entries folder1/a &&
-	test_sparse_match git diff --cached --name-status &&
-	test_must_be_empty sparse-checkout-out &&
-
-	test_sparse_match git diff-index --cached HEAD &&
-
-	# Reset the state
-	test_all_match git reset --hard &&
-
-	# --force-remove supercedes --ignore-skip-worktree-entries, removing
-	# a skip-worktree file from the index (and disk) when both are specified
-	# with --remove
-	test_sparse_match git update-index --force-remove --ignore-skip-worktree-entries folder1/a &&
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --cached --name-status &&
-	test_cmp expect sparse-checkout-out &&
-
-	test_sparse_match git diff-index --cached HEAD
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 31 - update-index --remove outside sparse definition
-
-expecting success of 1092.32 'update-index with directories': 
-	init_repos &&
-
-	# update-index will exit silently when provided with a directory name
-	# containing a trailing slash
-	test_all_match git update-index deep/ folder1/ &&
-	grep "Ignoring path deep/" sparse-checkout-err &&
-	grep "Ignoring path folder1/" sparse-checkout-err &&
-
-	# When update-index is given a directory name WITHOUT a trailing slash, it will
-	# behave in different ways depending on the status of the directory on disk:
-	# * if it exists, the command exits with an error ("add individual files instead")
-	# * if it does NOT exist (e.g., in a sparse-checkout), it is assumed to be a
-	#   file and either triggers an error ("does not exist  and --remove not passed")
-	#   or is ignored completely (when using --remove)
-	test_all_match test_must_fail git update-index deep &&
-	run_on_all test_must_fail git update-index folder1 &&
-	test_must_fail git -C full-checkout update-index --remove folder1 &&
-	test_sparse_match git update-index --remove folder1 &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Ignoring path deep/
-Ignoring path folder1/
-error: folder1: is a directory - add individual files instead
-fatal: Unable to process path folder1
-ok 32 - update-index with directories
-
-expecting success of 1092.33 'update-index --again file outside sparse definition': 
-	init_repos &&
-
-	test_all_match git checkout -b test-reupdate &&
-
-	# Update HEAD without modifying the index to introduce a difference in
-	# folder1/a
-	test_sparse_match git reset --soft update-folder1 &&
-
-	# Because folder1/a differs in the index vs HEAD,
-	# `git update-index --no-skip-worktree --again` will effectively perform
-	# `git update-index --no-skip-worktree folder1/a` and remove the skip-worktree
-	# flag from folder1/a
-	test_sparse_match git update-index --no-skip-worktree --again &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --name-status &&
-	test_cmp expect sparse-checkout-out
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 33 - update-index --again file outside sparse definition
-
-expecting success of 1092.34 'update-index --cacheinfo': 
-	init_repos &&
-
-	deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
-	folder2_oid=$(git -C full-checkout rev-parse update-folder2:folder2) &&
-	folder1_a_oid=$(git -C full-checkout rev-parse update-folder1:folder1/a) &&
-
-	test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Cannot add sparse directory, even in sparse index case
-	test_all_match test_must_fail git update-index --add --cacheinfo 040000 $folder2_oid folder2/ &&
-
-	# Sparse match only: the new outside-of-cone entry is added *without* skip-worktree,
-	# so `git status` reports it as "deleted" in the worktree
-	test_sparse_match git update-index --add --cacheinfo 100644 $folder1_a_oid folder1/a &&
-	test_sparse_match git status --porcelain=v2 &&
-	cat >expect <<-EOF &&
-	MD folder1/a
-	EOF
-	test_sparse_match git status --short -- folder1/a &&
-	test_cmp expect sparse-checkout-out &&
-
-	# To return folder1/a to "normal" for a sparse checkout (ignored &
-	# outside-of-cone), add the skip-worktree flag.
-	test_sparse_match git update-index --skip-worktree folder1/a &&
-	cat >expect <<-EOF &&
-	S folder1/a
-	EOF
-	test_sparse_match git ls-files -t -- folder1/a &&
-	test_cmp expect sparse-checkout-out
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 34 - update-index --cacheinfo
-
-expecting success of 1092.35 ''read-tree -mu base HEAD update-folder2' with files outside sparse definition': 
-		init_repos &&
-
-		# Although the index matches, without --no-sparse-checkout, outside-of-
-		# definition files will not exist on disk for sparse checkouts
-		test_all_match git read-tree -mu $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_path_is_missing sparse-checkout/folder2 &&
-		test_path_is_missing sparse-index/folder2 &&
-
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
-
-		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
-		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
+		echo changed >file0 &&
+		test_must_fail git rebase $type --autostash -f HEAD^ &&
+		test_must_fail git rebase --quit 2>err &&
+		test_grep "no rebase in progress" err &&
+		echo changed >expect &&
+		test_cmp expect file0
+	
+Already on 'feature-branch'
+Created autostash: 87bce87
+error: The pre-rebase hook refused to rebase.
+Applied autostash.
+fatal: no rebase in progress
+ok 32 - rebase --interactive: restore autostash when pre-rebase hook fails
 
+expecting success of 3420.33 'rebase --interactive: restore autostash when checkout onto fails': 
+		git checkout -f --detach feature-branch &&
+		echo uncommitted-content >file0 &&
+		echo untracked >file4 &&
+		test_when_finished "rm file4" &&
+		test_must_fail git rebase $type --autostash \
+							unrelated-onto-branch &&
+		test_must_fail git rebase --quit 2>err &&
+		test_grep "no rebase in progress" err &&
+		echo uncommitted-content >expect &&
+		test_cmp expect file0
 	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 35 - 'read-tree -mu base HEAD update-folder2' with files outside sparse definition
-
-expecting success of 1092.36 ''read-tree -mu update-folder1 update-folder2' with files outside sparse definition': 
-		init_repos &&
-
-		# Although the index matches, without --no-sparse-checkout, outside-of-
-		# definition files will not exist on disk for sparse checkouts
-		test_all_match git read-tree -mu $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_path_is_missing sparse-checkout/folder2 &&
-		test_path_is_missing sparse-index/folder2 &&
-
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
-
-		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
-		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
+HEAD is now at 0c4d2f1 third commit
+Created autostash: b8f272c
+error: The following untracked working tree files would be overwritten by checkout:
+	file4
+Please move or remove them before you switch branches.
+Aborting
+Applied autostash.
+error: could not detach HEAD
+fatal: no rebase in progress
+ok 33 - rebase --interactive: restore autostash when checkout onto fails
 
+expecting success of 3420.34 'rebase --interactive: restore autostash when branch checkout fails': 
+		git checkout -f unrelated-onto-branch^ &&
+		echo uncommitted-content >file0 &&
+		echo untracked >file4 &&
+		test_when_finished "rm file4" &&
+		test_must_fail git rebase $type --autostash HEAD \
+							unrelated-onto-branch &&
+		test_must_fail git rebase --quit 2>err &&
+		test_grep "no rebase in progress" err &&
+		echo uncommitted-content >expect &&
+		test_cmp expect file0
 	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 36 - 'read-tree -mu update-folder1 update-folder2' with files outside sparse definition
-
-expecting success of 1092.37 ''read-tree -mu update-folder2' with files outside sparse definition': 
-		init_repos &&
-
-		# Although the index matches, without --no-sparse-checkout, outside-of-
-		# definition files will not exist on disk for sparse checkouts
-		test_all_match git read-tree -mu $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_path_is_missing sparse-checkout/folder2 &&
-		test_path_is_missing sparse-index/folder2 &&
-
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
-
-		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
-		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
+Previous HEAD position was 0c4d2f1 third commit
+HEAD is now at bfa4f02 initial commit
+Created autostash: 2fa90c3
+error: The following untracked working tree files would be overwritten by checkout:
+	file4
+Please move or remove them before you switch branches.
+Aborting
+Applied autostash.
+error: could not detach HEAD
+fatal: no rebase in progress
+ok 34 - rebase --interactive: restore autostash when branch checkout fails
 
+expecting success of 3420.35 'rebase --interactive: dirty worktree, --no-autostash': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		test_when_finished git checkout feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type --no-autostash unrelated-onto-branch
 	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 37 - 'read-tree -mu update-folder2' with files outside sparse definition
-
-expecting success of 1092.38 'read-tree --merge with edit/edit conflicts in sparse directories': 
-	init_repos &&
-
-	# Merge of multiple changes to same directory (but not same files) should
-	# succeed
-	test_all_match git read-tree -mu base rename-base update-folder1 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset --hard &&
-
-	test_all_match git read-tree -mu rename-base update-folder2 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset --hard &&
-
-	test_all_match test_must_fail git read-tree -mu base update-folder1 rename-out-to-in &&
-	test_all_match test_must_fail git read-tree -mu rename-out-to-in update-folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 38 - read-tree --merge with edit/edit conflicts in sparse directories
-
-expecting success of 1092.39 'read-tree --prefix': 
-	init_repos &&
-
-	# If files differing between the index and target <commit-ish> exist
-	# inside the prefix, `read-tree --prefix` should fail
-	test_all_match test_must_fail git read-tree --prefix=deep/ deepest &&
-	test_all_match test_must_fail git read-tree --prefix=folder1/ update-folder1 &&
-
-	# If no differing index entries exist matching the prefix,
-	# `read-tree --prefix` updates the index successfully
-	test_all_match git rm -rf deep/deeper1/deepest/ &&
-	test_all_match git read-tree --prefix=deep/deeper1/deepest -u deepest &&
-	test_all_match git status --porcelain=v2 &&
-
-	run_on_all git rm -rf --sparse folder1/ &&
-	test_all_match git read-tree --prefix=folder1/ -u update-folder1 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git rm -rf --sparse folder2/0 &&
-	test_all_match git read-tree --prefix=folder2/0/ -u rename-out-to-out &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 39 - read-tree --prefix
-
-expecting success of 1092.40 'read-tree --merge with directory-file conflicts': 
-	init_repos &&
-
-	test_all_match git checkout -b test-branch rename-base &&
-
-	# Although the index matches, without --no-sparse-checkout, outside-of-
-	# definition files will not exist on disk for sparse checkouts
-	test_sparse_match git read-tree -mu rename-out-to-out &&
-	test_sparse_match git status --porcelain=v2 &&
-	test_path_is_missing sparse-checkout/folder2 &&
-	test_path_is_missing sparse-index/folder2 &&
-
-	test_sparse_match git read-tree --reset -u HEAD &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	test_sparse_match git read-tree -mu --no-sparse-checkout rename-out-to-out &&
-	test_sparse_match git status --porcelain=v2 &&
-	test_cmp sparse-checkout/folder2/0/1 sparse-index/folder2/0/1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 40 - read-tree --merge with directory-file conflicts
-
-expecting success of 1092.41 'merge, cherry-pick, and rebase': 
-	init_repos &&
-
-	for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
-	do
-		test_all_match git checkout -B temp update-deep &&
-		test_all_match git $OPERATION update-folder1 &&
-		test_all_match git rev-parse HEAD^{tree} &&
-		test_all_match git $OPERATION update-folder2 &&
-		test_all_match git rev-parse HEAD^{tree} || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 41 - merge, cherry-pick, and rebase
-
-expecting success of 1092.42 'merge with conflict outside cone': 
-	init_repos &&
-
-	test_all_match git checkout -b merge-tip merge-left &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match test_must_fail git merge -m merge merge-right &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Resolve the conflict in different ways:
-	# 1. Revert to the base
-	test_all_match git checkout base -- deep/deeper2/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# 2. Add the file with conflict markers
-	test_sparse_match test_must_fail git add folder1/a &&
-	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-	test_sparse_unstaged folder1/a &&
-	test_all_match git add --sparse folder1/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# 3. Rename the file to another sparse filename and
-	#    accept conflict markers as resolved content.
-	run_on_all mv folder2/a folder2/z &&
-	test_sparse_match test_must_fail git add folder2 &&
-	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-	test_sparse_unstaged folder2/z &&
-	test_all_match git add --sparse folder2 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git merge --continue &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git rev-parse HEAD^{tree}
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-ok 42 - merge with conflict outside cone
-
-expecting success of 1092.43 'cherry-pick/rebase with conflict outside cone': 
-	init_repos &&
-
-	for OPERATION in cherry-pick rebase
-	do
-		test_all_match git checkout -B tip &&
-		test_all_match git reset --hard merge-left &&
-		test_all_match git status --porcelain=v2 &&
-		test_all_match test_must_fail git $OPERATION merge-right &&
-		test_all_match git status --porcelain=v2 &&
-
-		# Resolve the conflict in different ways:
-		# 1. Revert to the base
-		test_all_match git checkout base -- deep/deeper2/a &&
-		test_all_match git status --porcelain=v2 &&
-
-		# 2. Add the file with conflict markers
-		# NEEDSWORK: Even though the merge conflict removed the
-		# SKIP_WORKTREE bit from the index entry for folder1/a, we should
-		# warn that this is a problematic add.
-		test_sparse_match test_must_fail git add folder1/a &&
-		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-		test_sparse_unstaged folder1/a &&
-		test_all_match git add --sparse folder1/a &&
-		test_all_match git status --porcelain=v2 &&
-
-		# 3. Rename the file to another sparse filename and
-		#    accept conflict markers as resolved content.
-		# NEEDSWORK: This mode now fails, because folder2/z is
-		# outside of the sparse-checkout cone and does not match an
-		# existing index entry with the SKIP_WORKTREE bit cleared.
-		run_on_all mv folder2/a folder2/z &&
-		test_sparse_match test_must_fail git add folder2 &&
-		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-		test_sparse_unstaged folder2/z &&
-		test_all_match git add --sparse folder2 &&
-		test_all_match git status --porcelain=v2 &&
-
-		test_all_match git $OPERATION --continue &&
-		test_all_match git status --porcelain=v2 &&
-		test_all_match git rev-parse HEAD^{tree} || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-ok 43 - cherry-pick/rebase with conflict outside cone
-
-expecting success of 1092.44 'merge with outside renames': 
-	init_repos &&
-
-	for type in out-to-out out-to-in in-to-out
-	do
-		test_all_match git reset --hard &&
-		test_all_match git checkout -f -b merge-$type update-deep &&
-		test_all_match git merge -m "$type" rename-$type &&
-		test_all_match git rev-parse HEAD^{tree} || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 44 - merge with outside renames
-
-expecting success of 1092.45 'cherry-pick with conflicts': 
-	init_repos &&
-
-	write_script edit-conflict <<-\EOF &&
-	echo $1 >conflict
-	EOF
-
-	test_all_match git checkout -b to-cherry-pick &&
-	run_on_all ../edit-conflict ABC &&
-	test_all_match git add conflict &&
-	test_all_match git commit -m "conflict to pick" &&
-
-	test_all_match git checkout -B base HEAD~1 &&
-	run_on_all ../edit-conflict DEF &&
-	test_all_match git add conflict &&
-	test_all_match git commit -m "conflict in base" &&
-
-	test_all_match test_must_fail git cherry-pick to-cherry-pick
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 45 - cherry-pick with conflicts
-
-expecting success of 1092.46 'stash': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Stash a sparse directory (folder1)
-	test_all_match git checkout -b test-branch rename-base &&
-	test_all_match git reset --soft rename-out-to-out &&
-	test_all_match git stash &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Apply the sparse directory stash without reinstating the index
-	test_all_match git stash apply -q &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Reset to state where stash can be applied
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git reset --hard rename-out-to-out &&
-
-	# Apply the sparse directory stash *with* reinstating the index
-	test_all_match git stash apply --index -q &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Reset to state where we will get a conflict applying the stash
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git reset --hard update-folder1 &&
-
-	# Apply the sparse directory stash with conflicts
-	test_all_match test_must_fail git stash apply --index -q &&
-	test_all_match test_must_fail git stash apply -q &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Reset to base branch
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git reset --hard base &&
-
-	# Stash & unstash an untracked file outside of the sparse checkout
-	# definition.
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all ../edit-contents folder1/new &&
-	test_all_match git stash -u &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git stash pop -q &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 46 - stash
-
-expecting success of 1092.47 'checkout-index inside sparse definition': 
-	init_repos &&
-
-	run_on_all rm -f deep/a &&
-	test_all_match git checkout-index -- deep/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	echo test >>new-a &&
-	run_on_all cp ../new-a a &&
-	test_all_match test_must_fail git checkout-index -- a &&
-	test_all_match git checkout-index -f -- a &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 47 - checkout-index inside sparse definition
-
-expecting success of 1092.48 'checkout-index outside sparse definition': 
-	init_repos &&
-
-	# Without --ignore-skip-worktree-bits, outside-of-cone files will trigger
-	# an error
-	test_sparse_match test_must_fail git checkout-index -- folder1/a &&
-	test_grep "folder1/a has skip-worktree enabled" sparse-checkout-err &&
-	test_path_is_missing folder1/a &&
-
-	# With --ignore-skip-worktree-bits, outside-of-cone files are checked out
-	test_sparse_match git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
-	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
-	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a &&
-
-	run_on_sparse rm -rf folder1 &&
-	echo test >new-a &&
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all cp ../new-a folder1/a &&
-
-	test_all_match test_must_fail git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
-	test_all_match git checkout-index -f --ignore-skip-worktree-bits -- folder1/a &&
-	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
-	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-git checkout-index: folder1/a has skip-worktree enabled; use '--ignore-skip-worktree-bits' to checkout
-ok 48 - checkout-index outside sparse definition
-
-expecting success of 1092.49 'checkout-index with folders': 
-	init_repos &&
-
-	# Inside checkout definition
-	test_all_match test_must_fail git checkout-index -f -- deep/ &&
-
-	# Outside checkout definition
-	# Note: although all tests fail (as expected), the messaging differs. For
-	# non-sparse index checkouts, the error is that the "file" does not appear
-	# in the index; for sparse checkouts, the error is explicitly that the
-	# entry is a sparse directory.
-	run_on_all test_must_fail git checkout-index -f -- folder1/ &&
-	test_cmp full-checkout-err sparse-checkout-err &&
-	! test_cmp full-checkout-err sparse-index-err &&
-	grep "is a sparse directory" sparse-index-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
---- full-checkout-err	2026-03-04 07:56:36.627352315 +0000
-+++ sparse-index-err	2026-03-04 07:56:36.675352315 +0000
-@@ -1 +1 @@
--git checkout-index: folder1/ is not in the cache
-+git checkout-index: folder1/ is a sparse directory
-git checkout-index: folder1/ is a sparse directory
-ok 49 - checkout-index with folders
-
-expecting success of 1092.50 'checkout-index --all': 
-	init_repos &&
-
-	test_all_match git checkout-index --all &&
-	test_sparse_match test_path_is_missing folder1 &&
-
-	# --ignore-skip-worktree-bits will cause `skip-worktree` files to be
-	# checked out, causing the outside-of-cone `folder1` to exist on-disk
-	test_all_match git checkout-index --ignore-skip-worktree-bits --all &&
-	test_all_match test_path_exists folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 50 - checkout-index --all
-
-expecting success of 1092.51 'clean': 
-	init_repos &&
-
-	echo bogus >>.gitignore &&
-	run_on_all cp ../.gitignore . &&
-	test_all_match git add .gitignore &&
-	test_all_match git commit -m "ignore bogus files" &&
-
-	run_on_sparse mkdir folder1 &&
-	run_on_all mkdir -p deep/untracked-deep &&
-	run_on_all touch folder1/bogus &&
-	run_on_all touch folder1/untracked &&
-	run_on_all touch deep/untracked-deep/bogus &&
-	run_on_all touch deep/untracked-deep/untracked &&
-
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git clean -f &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_exists folder1/bogus &&
-	run_on_all test_path_is_missing folder1/untracked &&
-	run_on_all test_path_exists deep/untracked-deep/bogus &&
-	run_on_all test_path_exists deep/untracked-deep/untracked &&
-
-	test_all_match git clean -fd &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_exists folder1/bogus &&
-	run_on_all test_path_exists deep/untracked-deep/bogus &&
-	run_on_all test_path_is_missing deep/untracked-deep/untracked &&
-
-	test_all_match git clean -xf &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_is_missing folder1/bogus &&
-	run_on_all test_path_exists deep/untracked-deep/bogus &&
-
-	test_all_match git clean -xdf &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_is_missing deep/untracked-deep/bogus &&
-
-	test_sparse_match test_path_is_dir folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 51 - clean
-
-expecting success of 1092.52 'show (cached blobs/trees)': 
-		init_repos &&
-
-		test_all_match git show :a &&
-		test_all_match git show :deep/a &&
-		test_sparse_match git show :folder1/a &&
-
-		# The error message differs depending on whether
-		# the directory exists in the worktree.
-		test_all_match test_must_fail git show :deep/ &&
-		test_must_fail git -C full-checkout show :folder1/ &&
-		test_sparse_match test_must_fail git show :folder1/ &&
-
-		# Change the sparse cone for an extra case:
-		run_on_sparse git sparse-checkout set deep/deeper1 &&
-
-		# deep/deeper2 is a sparse directory in the sparse index.
-		test_sparse_match test_must_fail git show :deep/deeper2/ &&
+HEAD is now at bfa4f02 initial commit
+Previous HEAD position was bfa4f02 initial commit
+Switched to a new branch 'rebased-feature-branch'
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 35 - rebase --interactive: dirty worktree, --no-autostash
 
-		# 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 3420.36 'rebase --interactive: dirty worktree, non-conflicting rebase': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		echo dirty >>file3 &&
+		git rebase$type unrelated-onto-branch >actual 2>&1 &&
+		grep unrelated file4 &&
+		grep dirty file3 &&
+		git checkout feature-branch
 	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-fatal: path 'folder1/' exists on disk, but not in the index
-ok 52 - show (cached blobs/trees)
-
-expecting success of 1092.53 'rev-parse (cached blobs/trees)': 
-		init_repos &&
-
-		test_all_match git rev-parse :a &&
-		test_all_match git rev-parse :deep/a &&
-		test_sparse_match git rev-parse :folder1/a &&
-
-		# The error message differs depending on whether
-		# the directory exists in the worktree.
-		test_all_match test_must_fail git rev-parse :deep/ &&
-		test_must_fail git -C full-checkout rev-parse :folder1/ &&
-		test_sparse_match test_must_fail git rev-parse :folder1/ &&
-
-		# Change the sparse cone for an extra case:
-		run_on_sparse git sparse-checkout set deep/deeper1 &&
-
-		# deep/deeper2 is a sparse directory in the sparse index.
-		test_sparse_match test_must_fail git rev-parse :deep/deeper2/ &&
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+unrelated
+dirty
+Switched to branch 'feature-branch'
+M	file3
+ok 36 - rebase --interactive: dirty worktree, non-conflicting rebase
 
-		# 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/
+expecting success of 3420.37 'rebase --interactive --autostash: check output': 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-apply} &&
+		if test ${suffix} = "interactive"; then
+			suffix=merge
+		fi &&
+		create_expected_success_$suffix &&
+		sed "$remove_progress_re" <actual >actual2 &&
+		test_cmp expected actual2
 	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-fatal: path 'folder1/' exists on disk, but not in the index
-:folder1/
-ok 53 - rev-parse (cached blobs/trees)
-
-expecting success of 1092.54 'submodule handling': 
-	init_repos &&
-
-	test_sparse_match git sparse-checkout add modules &&
-	test_all_match mkdir modules &&
-	test_all_match touch modules/a &&
-	test_all_match git add modules &&
-	test_all_match git commit -m "add modules directory" &&
-
-	test_config_global protocol.file.allow always &&
-
-	run_on_all git submodule add "$(pwd)/initial-repo" modules/sub &&
-	test_all_match git commit -m "add submodule" &&
-
-	# having a submodule prevents "modules" from collapse
-	test_sparse_match git sparse-checkout set deep/deeper1 &&
-	git -C sparse-index ls-files --sparse --stage >cache &&
-	grep "100644 .*	modules/a" cache &&
-	grep "160000 $(git -C initial-repo rev-parse HEAD) 0	modules/sub" cache
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	modules/a
-160000 703fd3e56687611d5c0264e6f007e18e96f794bf 0	modules/sub
-ok 54 - submodule handling
-
-expecting success of 1092.55 'sparse-index is expanded and converted back': 
-	init_repos &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C sparse-index reset -- folder1/a &&
-	test_region index convert_to_sparse trace2.txt &&
-	test_region index ensure_full_index trace2.txt &&
-
-	# ls-files expands on read, but does not write.
-	rm trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
-		git -C sparse-index ls-files &&
-	test_region index ensure_full_index trace2.txt
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20260304T075645.042983Z-H8d819085-P0006c0b0","thread":"main","time":"2026-03-04T07:56:45.045888Z","file":"sparse-index.c","line":235,"repo":1,"nesting":1,"category":"index","label":"convert_to_sparse"}
-{"event":"region_leave","sid":"20260304T075645.042983Z-H8d819085-P0006c0b0","thread":"main","time":"2026-03-04T07:56:45.046042Z","file":"sparse-index.c","line":249,"repo":1,"t_rel":0.000154,"nesting":1,"category":"index","label":"convert_to_sparse"}
-{"event":"region_enter","sid":"20260304T075645.042983Z-H8d819085-P0006c0b0","thread":"main","time":"2026-03-04T07:56:45.044607Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260304T075645.042983Z-H8d819085-P0006c0b0","thread":"main","time":"2026-03-04T07:56:45.046391Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260304T075645.042983Z-H8d819085-P0006c0b0","thread":"main","time":"2026-03-04T07:56:45.045457Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000849,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260304T075645.042983Z-H8d819085-P0006c0b0","thread":"main","time":"2026-03-04T07:56:45.046585Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000194,"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":"20260304T075645.147090Z-H8d819085-P0006c10c","thread":"main","time":"2026-03-04T07:56:45.148121Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260304T075645.147090Z-H8d819085-P0006c10c","thread":"main","time":"2026-03-04T07:56:45.154682Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.006561,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 55 - sparse-index is expanded and converted back
-
-expecting success of 1092.56 'index.sparse disabled inline uses full index': 
-	init_repos &&
-
-	# When index.sparse is disabled inline with `git status`, the
-	# index is expanded at the beginning of the execution then never
-	# converted back to sparse. It is then written to disk as a full index.
-	rm -f trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
-		git -C sparse-index -c index.sparse=false status &&
-	! test_region index convert_to_sparse trace2.txt &&
-	test_region index ensure_full_index trace2.txt &&
-
-	# Since index.sparse is set to true at a repo level, the index
-	# is converted from full to sparse when read, then never expanded
-	# over the course of `git status`. It is written to disk as a sparse
-	# index.
-	rm -f trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
-		git -C sparse-index status &&
-	test_region index convert_to_sparse trace2.txt &&
-	! test_region index ensure_full_index trace2.txt &&
-
-	# Now that the index has been written to disk as sparse, it is not
-	# converted to sparse (or expanded to full) when read by `git status`.
-	rm -f trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
-		git -C sparse-index status &&
-	! test_region index convert_to_sparse trace2.txt &&
-	! test_region index ensure_full_index trace2.txt
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-On branch base
-You are in a sparse checkout with 73% of tracked files present.
-
-nothing to commit, working tree clean
-{"event":"region_enter","sid":"20260304T075645.423281Z-H8d819085-P0006c28a","thread":"main","time":"2026-03-04T07:56:45.424197Z","file":"sparse-index.c","line":369,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260304T075645.423281Z-H8d819085-P0006c28a","thread":"main","time":"2026-03-04T07:56:45.429343Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.005146,"nesting":2,"category":"index","label":"ensure_full_index"}
-On branch base
-You are in a sparse checkout.
-
-nothing to commit, working tree clean
-{"event":"region_enter","sid":"20260304T075645.511562Z-H8d819085-P0006c2e4","thread":"main","time":"2026-03-04T07:56:45.512364Z","file":"sparse-index.c","line":235,"repo":1,"nesting":2,"category":"index","label":"convert_to_sparse"}
-{"event":"region_leave","sid":"20260304T075645.511562Z-H8d819085-P0006c2e4","thread":"main","time":"2026-03-04T07:56:45.512526Z","file":"sparse-index.c","line":249,"repo":1,"t_rel":0.000163,"nesting":2,"category":"index","label":"convert_to_sparse"}
-On branch base
-You are in a sparse checkout.
-
-nothing to commit, working tree clean
-ok 56 - index.sparse disabled inline uses full index
+Deleted branch rebased-feature-branch (was b607b14).
+ok 37 - rebase --interactive --autostash: check output
 
-expecting success of 1092.57 'sparse-index is not expanded': 
-	init_repos &&
+expecting success of 3420.38 'rebase --interactive: dirty index, non-conflicting rebase': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		git add file3 &&
+		git rebase$type unrelated-onto-branch &&
+		grep unrelated file4 &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: 7305f55
+Rebasing (1/2)
Rebasing (2/2)
Applied autostash.
+Successfully rebased and updated refs/heads/rebased-feature-branch.
+unrelated
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was b607b14).
+ok 38 - rebase --interactive: dirty index, non-conflicting rebase
 
-	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 3420.39 'rebase --interactive: conflicting rebase': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		rm -rf $dotest &&
+		git reset --hard &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+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 advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+HEAD is now at c57d250 related commit
+Previous HEAD position was c57d250 related commit
+Switched to branch 'feature-branch'
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 39 - rebase --interactive: conflicting rebase
 
-	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 3420.40 'rebase --interactive: --continue': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		echo "conflicting-plus-goodbye" >file2 &&
+		git add file2 &&
+		git rebase --continue &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+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 advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+[detached HEAD 62edf38] second commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file1
+Rebasing (2/2)
Applied autostash.
+Successfully rebased and updated refs/heads/rebased-feature-branch.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 51f2c81).
+ok 40 - rebase --interactive: --continue
 
-	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 3420.41 'rebase --interactive: --skip': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --skip &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+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 advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+Rebasing (2/2)
Applied autostash.
+Successfully rebased and updated refs/heads/rebased-feature-branch.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was fa02356).
+ok 41 - rebase --interactive: --skip
 
-	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 3420.42 'rebase --interactive: --abort': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --abort &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+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 advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 42 - rebase --interactive: --abort
 
-	ensure_not_expanded reset base -- deep/a &&
-	ensure_not_expanded reset base -- nonexistent-file &&
-	ensure_not_expanded reset deepest -- deep &&
+expecting success of 3420.43 'rebase --interactive: --quit': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		git diff >expect &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --quit &&
+		test_when_finished git stash drop &&
+		test_path_is_missing $dotest/autostash &&
+		! grep dirty file3 &&
+		git stash show -p >actual &&
+		test_cmp expect actual &&
+		git reset --hard &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+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 advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+Autostash exists; creating a new stash entry.
+Your changes are safe in the stash.
+You can run "git stash pop" or "git stash drop" at any time.
+grep: file3: No such file or directory
+HEAD is now at c57d250 related commit
+Previous HEAD position was c57d250 related commit
+Switched to branch 'feature-branch'
+Dropped refs/stash@{0} (ce96636712fc38300c1f0f777cc2fac6dee041c0)
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 43 - rebase --interactive: --quit
 
-	# 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 3420.44 'rebase --interactive: non-conflicting rebase, conflicting stash': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		echo dirty >file4 &&
+		git add file4 &&
+		git rebase$type unrelated-onto-branch >actual 2>&1 &&
+		test_path_is_missing $dotest &&
+		git reset --hard &&
+		grep unrelated file4 &&
+		! grep dirty file4 &&
+		git checkout feature-branch &&
+		git stash pop &&
+		grep dirty file4
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+HEAD is now at b607b14 third commit
+unrelated
+Switched to branch 'feature-branch'
+Merging Version stash was based on with Stashed changes
+On branch feature-branch
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   file4
 
-	# Wildcard identifies only in-cone files, no index expansion
-	ensure_not_expanded reset deepest -- deep/\* &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual2
+	err
+	expect
+	expected
 
-	# Wildcard identifies only full sparse directories, no index expansion
-	ensure_not_expanded reset deepest -- folder\* &&
+Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
+dirty
+ok 44 - rebase --interactive: non-conflicting rebase, conflicting stash
 
-	ensure_not_expanded clean -fd &&
+expecting success of 3420.45 'rebase --interactive: check output with conflicting stash': 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-apply} &&
+		if test ${suffix} = "interactive"; then
+			suffix=merge
+		fi &&
+		create_expected_failure_$suffix &&
+		sed "$remove_progress_re" <actual >actual2 &&
+		test_cmp expected actual2
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 45 - rebase --interactive: check output with conflicting stash
 
-	ensure_not_expanded checkout -f update-deep &&
-	test_config -C sparse-index pull.twohead ort &&
+expecting success of 3420.46 'abort rebase -i with --autostash': 
+	test_when_finished "git reset --hard" &&
+	echo uncommitted-content >file0 &&
 	(
-		sane_unset GIT_TEST_MERGE_ALGORITHM &&
-		for OPERATION in "merge -m merge" cherry-pick rebase
-		do
-			ensure_not_expanded merge -m merge update-folder1 &&
-			ensure_not_expanded merge -m merge update-folder2 || return 1
-		done
-	)
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 57 - sparse-index is not expanded
-
-expecting success of 1092.58 'sparse-index is not expanded: merge conflict in cone': 
-	init_repos &&
+		write_script abort-editor.sh <<-\EOF &&
+			echo >"$1"
+		EOF
+		test_set_editor "$(pwd)/abort-editor.sh" &&
+		test_must_fail git rebase -i --autostash HEAD^ &&
+		rm -f abort-editor.sh
+	) &&
+	echo uncommitted-content >expected &&
+	test_cmp expected file0
 
-	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 &&
+Created autostash: d9b9f3e
+Applied autostash.
+error: nothing to do
+HEAD is now at 0c4d2f1 third commit
+ok 46 - abort rebase -i with --autostash
 
+expecting success of 3420.47 'restore autostash on editor failure': 
+	test_when_finished "git reset --hard" &&
+	echo uncommitted-content >file0 &&
 	(
-		sane_unset GIT_TEST_MERGE_ALGORITHM &&
-		git -C sparse-index config pull.twohead ort &&
-		ensure_not_expanded ! merge -m merged expand-right
-	)
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Switched to a new branch 'expand-right'
-[expand-right 5ebbff9] right
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'expand-left'
-[expand-left 9bcd6b8] left
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 58 - sparse-index is not expanded: merge conflict in cone
-
-expecting success of 1092.59 'sparse-index is not expanded: stash': 
-	init_repos &&
+		test_set_editor "false" &&
+		test_must_fail git rebase -i --autostash HEAD^
+	) &&
+	echo uncommitted-content >expected &&
+	test_cmp expected file0
 
-	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} &&
+Created autostash: 083685b
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+Applied autostash.
+HEAD is now at 0c4d2f1 third commit
+ok 47 - restore autostash on editor failure
 
-	echo >>sparse-index/deep/new &&
-	ensure_not_expanded stash -u &&
+expecting success of 3420.48 'autostash is saved on editor failure with conflict': 
+	test_when_finished "git reset --hard" &&
+	echo uncommitted-content >file0 &&
 	(
-		WITHOUT_UNTRACKED_TXT=1 &&
-		ensure_not_expanded stash pop
+		write_script abort-editor.sh <<-\EOF &&
+			echo conflicting-content >file0
+			exit 1
+		EOF
+		test_set_editor "$(pwd)/abort-editor.sh" &&
+		test_must_fail git rebase -i --autostash HEAD^ &&
+		rm -f abort-editor.sh
 	) &&
+	echo conflicting-content >expected &&
+	test_cmp expected file0 &&
+	git checkout file0 &&
+	git stash pop &&
+	echo uncommitted-content >expected &&
+	test_cmp expected file0
 
-	ensure_not_expanded stash create &&
-	oid=$(git -C sparse-index stash create) &&
-	ensure_not_expanded stash store -m "test" $oid &&
-	ensure_not_expanded reset --hard &&
-	ensure_not_expanded stash pop
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 59 - sparse-index is not expanded: stash
-
-expecting success of 1092.60 'describe tested on all': 
-	init_repos &&
-
-	# Add tag to be read by describe
-
-	run_on_all git tag -a v1.0 -m "Version 1" &&
-	test_all_match git describe --dirty &&
-	run_on_all rm g &&
-	test_all_match git describe --dirty
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 60 - describe tested on all
-
-expecting success of 1092.61 'sparse-index is not expanded: describe': 
-	init_repos &&
-
-	# Add tag to be read by describe
-
-	git -C sparse-index tag -a v1.0 -m "Version 1" &&
-
-	ensure_not_expanded describe --dirty &&
-	echo "test" >>sparse-index/g &&
-	ensure_not_expanded describe --dirty &&
-	ensure_not_expanded describe
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 61 - sparse-index is not expanded: describe
-
-expecting success of 1092.62 'sparse index is not expanded: diff and diff-index': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Add file within cone
-	test_sparse_match git sparse-checkout set deep &&
-	run_on_all ../edit-contents deep/testfile &&
-	test_all_match git add deep/testfile &&
-	run_on_all ../edit-contents deep/testfile &&
-
-	test_all_match git diff &&
-	test_all_match git diff --cached &&
-	ensure_not_expanded diff &&
-	ensure_not_expanded diff --cached &&
-	ensure_not_expanded diff-index --cached HEAD &&
-
-	# Add file outside cone
-	test_all_match git reset --hard &&
-	run_on_all mkdir newdirectory &&
-	run_on_all ../edit-contents newdirectory/testfile &&
-	test_sparse_match git sparse-checkout set newdirectory &&
-	test_all_match git add newdirectory/testfile &&
-	run_on_all ../edit-contents newdirectory/testfile &&
-	test_sparse_match git sparse-checkout set &&
-
-	test_all_match git diff &&
-	test_all_match git diff --cached &&
-	ensure_not_expanded diff &&
-	ensure_not_expanded diff --cached &&
-	ensure_not_expanded diff-index --cached HEAD &&
-
-	# Merge conflict outside cone
-	# The sparse checkout will report a warning that is not in the
-	# full checkout, so we use `run_on_all` instead of
-	# `test_all_match`
-	run_on_all git reset --hard &&
-	test_all_match git checkout merge-left &&
-	test_all_match test_must_fail git merge merge-right &&
-
-	test_all_match git diff &&
-	test_all_match git diff --cached &&
-	ensure_not_expanded diff &&
-	ensure_not_expanded diff --cached &&
-	ensure_not_expanded diff-index --cached HEAD
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 62 - sparse index is not expanded: diff and diff-index
-
-expecting success of 1092.63 'sparse index is not expanded: show and rev-parse': 
-	init_repos &&
-
-	ensure_not_expanded show :a &&
-	ensure_not_expanded show :deep/a &&
-	ensure_not_expanded rev-parse :a &&
-	ensure_not_expanded rev-parse :deep/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 63 - sparse index is not expanded: show and rev-parse
-
-expecting success of 1092.64 'sparse index is not expanded: update-index': 
-	init_repos &&
-
-	deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
-	ensure_not_expanded update-index --cacheinfo 100644 $deep_a_oid deep/a &&
-
-	echo "test" >sparse-index/README.md &&
-	echo "test2" >sparse-index/a &&
-	rm -f sparse-index/deep/a &&
-
-	ensure_not_expanded update-index --add README.md &&
-	ensure_not_expanded update-index a &&
-	ensure_not_expanded update-index --remove deep/a &&
-
-	ensure_not_expanded reset --soft update-deep &&
-	ensure_not_expanded update-index --add --remove --again
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 64 - sparse index is not expanded: update-index
-
-expecting success of 1092.65 'sparse index is not expanded: blame': 
-	init_repos &&
-
-	for file in a \
-			deep/a \
-			deep/deeper1/a \
-			deep/deeper1/deepest/a
-	do
-		ensure_not_expanded blame $file || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 65 - sparse index is not expanded: blame
-
-expecting success of 1092.66 'sparse index is not expanded: fetch/pull': 
-	init_repos &&
-
-	git -C sparse-index remote add full "file://$(pwd)/full-checkout" &&
-	ensure_not_expanded fetch full &&
-	git -C full-checkout commit --allow-empty -m "for pull merge" &&
-	git -C sparse-index commit --allow-empty -m "for pull merge" &&
-	ensure_not_expanded pull full base
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-[base f236285] for pull merge
- Author: A U Thor <author@example.com>
-[base f236285] for pull merge
- Author: A U Thor <author@example.com>
-ok 66 - sparse index is not expanded: fetch/pull
-
-expecting success of 1092.67 'sparse index is not expanded: read-tree': 
-	init_repos &&
-
-	ensure_not_expanded checkout -b test-branch update-folder1 &&
-	for MERGE_TREES in "base HEAD update-folder2" \
-			   "base HEAD rename-base" \
-			   "base update-folder2" \
-			   "base rename-base" \
-			   "update-folder2"
-	do
-		ensure_not_expanded read-tree -mu $MERGE_TREES &&
-		ensure_not_expanded reset --hard || return 1
-	done &&
-
-	rm -rf sparse-index/deep/deeper2 &&
-	ensure_not_expanded add . &&
-	ensure_not_expanded commit -m "test" &&
-
-	ensure_not_expanded read-tree --prefix=deep/deeper2 -u deepest
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 67 - sparse index is not expanded: read-tree
-
-expecting success of 1092.68 'ls-files': 
-	init_repos &&
-
-	# Use a smaller sparse-checkout for reduced output
-	test_sparse_match git sparse-checkout set &&
-
-	# Behavior agrees by default. Sparse index is expanded.
-	test_all_match git ls-files &&
-
-	# With --sparse, the sparse index data changes behavior.
-	git -C sparse-index ls-files --sparse >actual &&
-
-	cat >expect <<-\EOF &&
-	a
-	before/
-	deep/
-	e
-	folder1-
-	folder1.x
-	folder1/
-	folder10
-	folder2/
-	g
-	x/
-	z
-	EOF
-
-	test_cmp expect actual &&
-
-	# With --sparse and no sparse index, nothing changes.
-	git -C sparse-checkout ls-files >dense &&
-	git -C sparse-checkout ls-files --sparse >sparse &&
-	test_cmp dense sparse &&
-
-	# Set up a strange condition of having a file edit
-	# outside of the sparse-checkout cone. We want to verify
-	# that all modes handle this the same, and detect the
-	# modification.
-	write_script edit-content <<-\EOF &&
-	mkdir -p folder1 &&
-	echo content >>folder1/a
-	EOF
-	run_on_all ../edit-content &&
-
-	test_all_match git ls-files --modified &&
-
-	git -C sparse-index ls-files --sparse --modified >sparse-index-out &&
-	cat >expect <<-\EOF &&
-	folder1/a
-	EOF
-	test_cmp expect sparse-index-out &&
-
-	# Add folder1 to the sparse-checkout cone and
-	# check that ls-files shows the expanded files.
-	test_sparse_match git sparse-checkout add folder1 &&
-	test_all_match git ls-files --modified &&
-
-	test_all_match git ls-files &&
-	git -C sparse-index ls-files --sparse >actual &&
-
-	cat >expect <<-\EOF &&
-	a
-	before/
-	deep/
-	e
-	folder1-
-	folder1.x
-	folder1/0/0/0
-	folder1/0/1
-	folder1/a
-	folder10
-	folder2/
-	g
-	x/
-	z
-	EOF
-
-	test_cmp expect actual &&
-
-	# Double-check index expansion is avoided
-	ensure_not_expanded ls-files --sparse
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 68 - ls-files
-
-expecting success of 1092.69 'sparse index is not expanded: sparse-checkout': 
-	init_repos &&
-
-	ensure_not_expanded sparse-checkout set deep/deeper2 &&
-	ensure_not_expanded sparse-checkout set deep/deeper1 &&
-	ensure_not_expanded sparse-checkout set deep &&
-	ensure_not_expanded sparse-checkout add folder1 &&
-	ensure_not_expanded sparse-checkout set deep/deeper1 &&
-	ensure_not_expanded sparse-checkout set folder2 &&
-
-	# Demonstrate that the checks that "folder1/a" is a file
-	# do not cause a sparse-index expansion (since it is in the
-	# sparse-checkout cone).
-	echo >>sparse-index/folder2/a &&
-	git -C sparse-index add folder2/a &&
-
-	ensure_not_expanded sparse-checkout add folder1 &&
-
-	# Skip checks here, since deep/deeper1 is inside a sparse directory
-	# that must be expanded to check whether `deep/deeper1` is a file
-	# or not.
-	ensure_not_expanded sparse-checkout set --skip-checks deep/deeper1 &&
-	ensure_not_expanded sparse-checkout set
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 69 - sparse index is not expanded: sparse-checkout
-
-expecting success of 1092.70 'reset mixed and checkout orphan': 
-	init_repos &&
-
-	test_all_match git checkout rename-out-to-in &&
-
-	# Sparse checkouts do not agree with full checkouts about
-	# how to report a directory/file conflict during a reset.
-	# This command would fail with test_all_match because the
-	# full checkout reports "T folder1/0/1" while a sparse
-	# checkout reports "D folder1/0/1". This matches because
-	# the sparse checkouts skip "adding" the other side of
-	# the conflict.
-	test_sparse_match git reset --mixed HEAD~1 &&
-	test_sparse_match git ls-files --stage &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	# At this point, sparse-checkouts behave differently
-	# from the full-checkout.
-	test_sparse_match git checkout --orphan new-branch &&
-	test_sparse_match git ls-files --stage &&
-	test_sparse_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 70 - reset mixed and checkout orphan
-
-expecting success of 1092.71 'add everything with deep new file': 
-	init_repos &&
-
-	run_on_sparse git sparse-checkout set deep/deeper1/deepest &&
-
-	run_on_all touch deep/deeper1/x &&
-	test_all_match git add . &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 71 - add everything with deep new file
-
-expecting success of 1092.72 'checkout behaves oddly with df-conflict-1': 
-	init_repos &&
-
-	test_sparse_match git sparse-checkout disable &&
-
-	write_script edit-content <<-\EOF &&
-	echo content >>folder1/larger-content
-	git add folder1
-	EOF
-
-	run_on_all ../edit-content &&
-	test_all_match git status --porcelain=v2 &&
-
-	git -C sparse-checkout sparse-checkout init --cone &&
-	git -C sparse-index sparse-checkout init --cone --sparse-index &&
-
-	test_all_match git status --porcelain=v2 &&
-
-	# This checkout command should fail, because we have a staged
-	# change to folder1/larger-content, but the destination changes
-	# folder1 to a file.
-	git -C full-checkout checkout df-conflict-1 \
-		1>full-checkout-out \
-		2>full-checkout-err &&
-	git -C sparse-checkout checkout df-conflict-1 \
-		1>sparse-checkout-out \
-		2>sparse-checkout-err &&
-	git -C sparse-index checkout df-conflict-1 \
-		1>sparse-index-out \
-		2>sparse-index-err &&
-
-	# Instead, the checkout deletes the folder1 file and adds the
-	# folder1/larger-content file, leaving all other paths that were
-	# in folder1/ as deleted (without any warning).
-	cat >expect <<-EOF &&
-	D	folder1
-	A	folder1/larger-content
-	EOF
-	test_cmp expect full-checkout-out &&
-	test_cmp expect sparse-checkout-out &&
-
-	# The sparse-index reports no output
-	test_must_be_empty sparse-index-out &&
-
-	# stderr: Switched to branch df-conflict-1
-	test_cmp full-checkout-err sparse-checkout-err &&
-	test_cmp full-checkout-err sparse-checkout-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 72 - checkout behaves oddly with df-conflict-1
-
-expecting success of 1092.73 'checkout behaves oddly with df-conflict-2': 
-	init_repos &&
-
-	test_sparse_match git sparse-checkout disable &&
-
-	write_script edit-content <<-\EOF &&
-	echo content >>folder2/larger-content
-	git add folder2
-	EOF
-
-	run_on_all ../edit-content &&
-	test_all_match git status --porcelain=v2 &&
-
-	git -C sparse-checkout sparse-checkout init --cone &&
-	git -C sparse-index sparse-checkout init --cone --sparse-index &&
-
-	test_all_match git status --porcelain=v2 &&
-
-	# This checkout command should fail, because we have a staged
-	# change to folder1/larger-content, but the destination changes
-	# folder1 to a file.
-	git -C full-checkout checkout df-conflict-2 \
-		1>full-checkout-out \
-		2>full-checkout-err &&
-	git -C sparse-checkout checkout df-conflict-2 \
-		1>sparse-checkout-out \
-		2>sparse-checkout-err &&
-	git -C sparse-index checkout df-conflict-2 \
-		1>sparse-index-out \
-		2>sparse-index-err &&
-
-	# The full checkout deviates from the df-conflict-1 case here!
-	# It drops the change to folder1/larger-content and leaves the
-	# folder1 path as-is on disk. The sparse-index behaves the same.
-	test_must_be_empty full-checkout-out &&
-	test_must_be_empty sparse-index-out &&
-
-	# In the sparse-checkout case, the checkout deletes the folder1
-	# file and adds the folder1/larger-content file, leaving all other
-	# paths that were in folder1/ as deleted (without any warning).
-	cat >expect <<-EOF &&
-	D	folder2
-	A	folder2/larger-content
-	EOF
-	test_cmp expect sparse-checkout-out &&
-
-	# Switched to branch df-conflict-1
-	test_cmp full-checkout-err sparse-checkout-err &&
-	test_cmp full-checkout-err sparse-index-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 73 - checkout behaves oddly with df-conflict-2
-
-expecting success of 1092.74 'mv directory from out-of-cone to in-cone': 
-	init_repos &&
-
-	# <source> as a sparse directory (or SKIP_WORKTREE_DIR without enabling
-	# sparse index).
-	test_all_match git mv --sparse folder1 deep &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match git ls-files -t &&
-	git -C sparse-checkout ls-files -t >actual &&
-	grep -e "H deep/folder1/0/0/0" actual &&
-	grep -e "H deep/folder1/0/1" actual &&
-	grep -e "H deep/folder1/a" actual &&
-
-	test_all_match git reset --hard &&
-
-	# <source> as a directory deeper than sparse index boundary (where
-	# sparse index will expand).
-	test_sparse_match git mv --sparse folder1/0 deep &&
-	test_sparse_match git status --porcelain=v2 &&
-	test_sparse_match git ls-files -t &&
-	git -C sparse-checkout ls-files -t >actual &&
-	grep -e "H deep/0/0/0" actual &&
-	grep -e "H deep/0/1" actual
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-H deep/folder1/0/0/0
-H deep/folder1/0/1
-H deep/folder1/a
-H deep/0/0/0
-H deep/0/1
-ok 74 - mv directory from out-of-cone to in-cone
-
-expecting success of 1092.75 'rm pathspec inside sparse definition': 
-	init_repos &&
-
-	test_all_match git rm deep/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# test wildcard
-	run_on_all git reset --hard &&
-	test_all_match git rm deep/* &&
-	test_all_match git status --porcelain=v2 &&
-
-	# test recursive rm
-	run_on_all git reset --hard &&
-	test_all_match git rm -r deep &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 75 - rm pathspec inside sparse definition
-
-expecting success of 1092.76 'rm pathspec outside sparse definition': 
-	init_repos &&
-
-	for file in folder1/a folder1/0/1
-	do
-		test_sparse_match test_must_fail git rm $file &&
-		test_sparse_match test_must_fail git rm --cached $file &&
-		test_sparse_match git rm --sparse $file &&
-		test_sparse_match git status --porcelain=v2 || return 1
-	done &&
-
-	cat >folder1-full <<-EOF &&
-	rm ${SQ}folder1/0/0/0${SQ}
-	rm ${SQ}folder1/0/1${SQ}
-	rm ${SQ}folder1/a${SQ}
-	EOF
-
-	cat >folder1-sparse <<-EOF &&
-	rm ${SQ}folder1/${SQ}
-	EOF
-
-	# test wildcard
-	run_on_sparse git reset --hard &&
-	run_on_sparse git sparse-checkout reapply &&
-	test_sparse_match test_must_fail git rm folder1/* &&
-	run_on_sparse git rm --sparse folder1/* &&
-	test_cmp folder1-full sparse-checkout-out &&
-	test_cmp folder1-sparse sparse-index-out &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	# test recursive rm
-	run_on_sparse git reset --hard &&
-	run_on_sparse git sparse-checkout reapply &&
-	test_sparse_match test_must_fail git rm --sparse folder1 &&
-	run_on_sparse git rm --sparse -r folder1 &&
-	test_cmp folder1-full sparse-checkout-out &&
-	test_cmp folder1-sparse sparse-index-out &&
-	test_sparse_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 76 - rm pathspec outside sparse definition
-
-expecting success of 1092.77 'rm pathspec expands index when necessary': 
-	init_repos &&
-
-	# in-cone pathspec (do not expand)
-	ensure_not_expanded rm "deep/deep*" &&
-	test_must_be_empty sparse-index-err &&
-
-	# out-of-cone pathspec (expand)
-	! ensure_not_expanded rm --sparse "folder1/a*" &&
-	test_must_be_empty sparse-index-err &&
-
-	# pathspec that should expand index
-	! ensure_not_expanded rm "*/a" &&
-	test_must_be_empty sparse-index-err &&
-
-	! ensure_not_expanded rm "**a" &&
-	test_must_be_empty sparse-index-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20260304T075705.570970Z-H8d819085-P00072894","thread":"main","time":"2026-03-04T07:57:05.572239Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260304T075705.570970Z-H8d819085-P00072894","thread":"main","time":"2026-03-04T07:57:05.573669Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260304T075705.626575Z-H8d819085-P000728e5","thread":"main","time":"2026-03-04T07:57:05.627562Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260304T075705.626575Z-H8d819085-P000728e5","thread":"main","time":"2026-03-04T07:57:05.637533Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260304T075705.684555Z-H8d819085-P0007293a","thread":"main","time":"2026-03-04T07:57:05.685480Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260304T075705.684555Z-H8d819085-P0007293a","thread":"main","time":"2026-03-04T07:57:05.686909Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 77 - rm pathspec expands index when necessary
-
-expecting success of 1092.78 'sparse index is not expanded: rm': 
-	init_repos &&
-
-	ensure_not_expanded rm deep/a &&
-
-	# test in-cone wildcard
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded rm deep/* &&
-
-	# test recursive rm
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded rm -r deep
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 78 - sparse index is not expanded: rm
-
-expecting success of 1092.79 'grep with and --cached': 
-	init_repos &&
-
-	test_all_match git grep --cached a &&
-	test_all_match git grep --cached a -- "folder1/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 79 - grep with and --cached
-
-expecting success of 1092.80 'grep is not expanded': 
-	init_repos &&
-
-	ensure_not_expanded grep a &&
-	ensure_not_expanded grep a -- deep/* &&
-
-	# All files within the folder1/* pathspec are sparse,
-	# so this command does not find any matches
-	ensure_not_expanded ! grep a -- folder1/* &&
-
-	# test out-of-cone pathspec with or without wildcard
-	ensure_not_expanded grep --cached a -- "folder1/a" &&
-	ensure_not_expanded grep --cached a -- "folder1/*" &&
-
-	# test in-cone pathspec with or without wildcard
-	ensure_not_expanded grep --cached a -- "deep/a" &&
-	ensure_not_expanded grep --cached a -- "deep/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 80 - grep is not expanded
-
-checking known breakage of 1092.81 'grep within submodules is not expanded': 
-	init_repos_as_submodules &&
-
-	# do not use ensure_not_expanded() here, becasue `grep` should be
-	# run in the superproject, not in "./sparse-index"
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-	git grep --cached --recurse-submodules a -- "*/folder1/*" &&
-	test_region ! index ensure_full_index trace2.txt
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Adding existing repo at 'full-checkout' to the index
-Adding existing repo at 'sparse-checkout' to the index
-Adding existing repo at 'sparse-index' to the index
- 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
-hint: The sparse index is expanding to a full index, a slow operation.
-hint: Your working directory likely has contents that are outside of
-hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
-hint: see your sparse-checkout definition and compare it to your working
-hint: directory contents. Running 'git clean' may assist in this cleanup.
-hint: Disable this message with "git config advice.sparseIndexExpanded false"
-full-checkout/folder1/a:a
-sparse-checkout/folder1/a:a
-sparse-index/folder1/a:a
-{"event":"region_enter","sid":"20260304T075709.842429Z-H8d819085-P00073c92","thread":"main","time":"2026-03-04T07:57:09.849354Z","file":"sparse-index.c","line":369,"repo":4,"nesting":2,"category":"index","label":"ensure_full_index"}
-not ok 81 - grep within submodules is not expanded # TODO known breakage
-
-expecting success of 1092.82 'grep sparse directory within submodules': 
-	init_repos_as_submodules &&
-
-	cat >expect <<-\EOF &&
-	full-checkout/folder1/a:a
-	sparse-checkout/folder1/a:a
-	sparse-index/folder1/a:a
-	EOF
-	git grep --cached --recurse-submodules a -- "*/folder1/*" >actual &&
-	test_cmp actual expect
-
-warning: unable to rmdir 'full-checkout': Directory not empty
-warning: unable to rmdir 'sparse-checkout': Directory not empty
-warning: unable to rmdir 'sparse-index': Directory not empty
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Adding existing repo at 'full-checkout' to the index
-Adding existing repo at 'sparse-checkout' to the index
-Adding existing repo at 'sparse-index' to the index
- 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
-hint: The sparse index is expanding to a full index, a slow operation.
-hint: Your working directory likely has contents that are outside of
-hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
-hint: see your sparse-checkout definition and compare it to your working
-hint: directory contents. Running 'git clean' may assist in this cleanup.
-hint: Disable this message with "git config advice.sparseIndexExpanded false"
-ok 82 - grep sparse directory within submodules
-
-expecting success of 1092.83 'write-tree': 
-	init_repos &&
-
-	test_all_match git write-tree &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	# make a change inside the sparse cone
-	run_on_all ../edit-contents deep/a &&
-	test_all_match git update-index deep/a &&
-	test_all_match git write-tree &&
-	test_all_match git status --porcelain=v2 &&
-
-	# make a change outside the sparse cone
-	run_on_all mkdir -p folder1 &&
-	run_on_all cp a folder1/a &&
-	run_on_all ../edit-contents folder1/a &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git write-tree &&
-	test_all_match git status --porcelain=v2 &&
-
-	# check that SKIP_WORKTREE files are not materialized
-	test_path_is_missing sparse-checkout/folder2/a &&
-	test_path_is_missing sparse-index/folder2/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 83 - write-tree
-
-expecting success of 1092.84 'sparse-index is not expanded: write-tree': 
-	init_repos &&
-
-	ensure_not_expanded write-tree &&
-
-	echo "test1" >>sparse-index/a &&
-	git -C sparse-index update-index a &&
-	ensure_not_expanded write-tree
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 84 - sparse-index is not expanded: write-tree
-
-expecting success of 1092.85 'diff-files with pathspec inside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	run_on_all ../edit-contents deep/a &&
-
-	test_all_match git diff-files &&
-
-	test_all_match git diff-files -- deep/a &&
-
-	# test wildcard
-	test_all_match git diff-files -- "deep/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 85 - diff-files with pathspec inside sparse definition
-
-expecting success of 1092.86 'diff-files with pathspec outside sparse definition': 
-	init_repos &&
-
-	test_sparse_match git diff-files -- folder2/a &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	# The directory "folder1" is outside the cone of interest
-	# and will not exist in the sparse checkout repositories.
-	# Create it as needed, add file "folder1/a" there with
-	# contents that is different from the staged version.
-	run_on_all mkdir -p folder1 &&
-	run_on_all cp a folder1/a &&
-
-	run_on_all ../edit-contents folder1/a &&
-	test_all_match git diff-files &&
-	test_all_match git diff-files -- folder1/a &&
-	test_all_match git diff-files -- "folder*/a"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 86 - diff-files with pathspec outside sparse definition
-
-expecting success of 1092.87 'sparse index is not expanded: diff-files': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	run_on_all ../edit-contents deep/a &&
-
-	ensure_not_expanded diff-files &&
-	ensure_not_expanded diff-files -- deep/a &&
-	ensure_not_expanded diff-files -- "deep/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 87 - sparse index is not expanded: diff-files
-
-expecting success of 1092.88 'diff-tree': 
-	init_repos &&
-
-	# Test change inside sparse cone
-	tree1=$(git -C sparse-index rev-parse HEAD^{tree}) &&
-	tree2=$(git -C sparse-index rev-parse update-deep^{tree}) &&
-	test_all_match git diff-tree $tree1 $tree2 &&
-	test_all_match git diff-tree $tree1 $tree2 -- deep/a &&
-	test_all_match git diff-tree HEAD update-deep &&
-	test_all_match git diff-tree HEAD update-deep -- deep/a &&
-
-	# Test change outside sparse cone
-	tree3=$(git -C sparse-index rev-parse update-folder1^{tree}) &&
-	test_all_match git diff-tree $tree1 $tree3 &&
-	test_all_match git diff-tree $tree1 $tree3 -- folder1/a &&
-	test_all_match git diff-tree HEAD update-folder1 &&
-	test_all_match git diff-tree HEAD update-folder1 -- folder1/a &&
-
-	# Check that SKIP_WORKTREE files are not materialized
-	test_path_is_missing sparse-checkout/folder1/a &&
-	test_path_is_missing sparse-index/folder1/a &&
-	test_path_is_missing sparse-checkout/folder2/a &&
-	test_path_is_missing sparse-index/folder2/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 88 - diff-tree
-
-expecting success of 1092.89 'sparse-index is not expanded: diff-tree': 
-	init_repos &&
-
-	tree1=$(git -C sparse-index rev-parse HEAD^{tree}) &&
-	tree2=$(git -C sparse-index rev-parse update-deep^{tree}) &&
-	tree3=$(git -C sparse-index rev-parse update-folder1^{tree}) &&
-
-	ensure_not_expanded diff-tree $tree1 $tree2 &&
-	ensure_not_expanded diff-tree $tree1 $tree2 -- deep/a &&
-	ensure_not_expanded diff-tree HEAD update-deep &&
-	ensure_not_expanded diff-tree HEAD update-deep -- deep/a &&
-	ensure_not_expanded diff-tree $tree1 $tree3 &&
-	ensure_not_expanded diff-tree $tree1 $tree3 -- folder1/a &&
-	ensure_not_expanded diff-tree HEAD update-folder1 &&
-	ensure_not_expanded diff-tree HEAD update-folder1 -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 89 - sparse-index is not expanded: diff-tree
-
-expecting success of 1092.90 'worktree': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	for repo in full-checkout sparse-checkout sparse-index
-	do
-		worktree=${repo}-wt &&
-		git -C $repo worktree add ../$worktree &&
-
-		# Compare worktree content with "ls"
-		(cd $repo && ls) >worktree_contents &&
-		(cd $worktree && ls) >new_worktree_contents &&
-		test_cmp worktree_contents new_worktree_contents &&
-
-		# Compare index content with "ls-files --sparse"
-		git -C $repo ls-files --sparse >index_contents &&
-		git -C $worktree ls-files --sparse >new_index_contents &&
-		test_cmp index_contents new_index_contents &&
-
-		git -C $repo worktree remove ../$worktree || return 1
-	done &&
-
-	test_all_match git worktree add .worktrees/hotfix &&
-	run_on_all ../edit-contents .worktrees/hotfix/deep/a &&
-	test_all_match test_must_fail git worktree remove .worktrees/hotfix
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Preparing worktree (new branch 'full-checkout-wt')
-HEAD is now at 703fd3e initial commit
-Preparing worktree (new branch 'sparse-checkout-wt')
-HEAD is now at 703fd3e initial commit
-Preparing worktree (new branch 'sparse-index-wt')
-HEAD is now at 703fd3e initial commit
-ok 90 - worktree
-
-expecting success of 1092.91 'worktree is not expanded': 
-	init_repos &&
-
-	ensure_not_expanded worktree add .worktrees/hotfix &&
-	ensure_not_expanded worktree remove .worktrees/hotfix
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 91 - worktree is not expanded
-
-expecting success of 1092.92 'check-attr with pathspec inside sparse definition': 
-	init_repos &&
-
-	echo "a -crlf myAttr" >>.gitattributes &&
-	run_on_all cp ../.gitattributes ./deep &&
-
-	test_all_match git check-attr -a -- deep/a &&
-
-	test_all_match git add deep/.gitattributes &&
-	test_all_match git check-attr -a --cached -- deep/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 92 - check-attr with pathspec inside sparse definition
-
-expecting success of 1092.93 'check-attr with pathspec outside sparse definition': 
-	init_repos &&
-
-	echo "a -crlf myAttr" >>.gitattributes &&
-	run_on_sparse mkdir folder1 &&
-	run_on_all cp ../.gitattributes ./folder1 &&
-	run_on_all cp a folder1/a &&
-
-	test_all_match git check-attr -a -- folder1/a &&
-
-	git -C full-checkout add folder1/.gitattributes &&
-	test_sparse_match git add --sparse folder1/.gitattributes &&
-	test_all_match git commit -m "add .gitattributes" &&
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git check-attr -a --cached -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 93 - check-attr with pathspec outside sparse definition
-
-checking known breakage of 1092.94 'diff --check with pathspec outside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo "a " >"$1"
-	EOF
-
-	test_all_match git config core.whitespace -trailing-space,-space-before-tab &&
-
-	echo "a whitespace=trailing-space,space-before-tab" >>.gitattributes &&
-	run_on_all mkdir -p folder1 &&
-	run_on_all cp ../.gitattributes ./folder1 &&
-	test_all_match git add --sparse folder1/.gitattributes &&
-	run_on_all ../edit-contents folder1/a &&
-	test_all_match git add --sparse folder1/a &&
-
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match test_must_fail git diff --check --cached -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-test_must_fail: command succeeded: git diff --check --cached -- folder1/a
-not ok 94 - diff --check with pathspec outside sparse definition # TODO known breakage
-
-expecting success of 1092.95 'sparse-index is not expanded: check-attr': 
-	init_repos &&
-
-	echo "a -crlf myAttr" >>.gitattributes &&
-	mkdir ./sparse-index/folder1 &&
-	cp ./sparse-index/a ./sparse-index/folder1/a &&
-	cp .gitattributes ./sparse-index/deep &&
-	cp .gitattributes ./sparse-index/folder1 &&
-
-	git -C sparse-index add deep/.gitattributes &&
-	git -C sparse-index add --sparse folder1/.gitattributes &&
-	ensure_not_expanded check-attr -a --cached -- deep/a &&
-	ensure_not_expanded check-attr -a --cached -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 95 - sparse-index is not expanded: check-attr
-
-expecting success of 1092.96 'advice.sparseIndexExpanded': 
-	init_repos &&
-
-	git -C sparse-index config --unset advice.sparseIndexExpanded &&
-	git -C sparse-index sparse-checkout set deep/deeper1 &&
-	mkdir -p sparse-index/deep/deeper2/deepest &&
-	touch sparse-index/deep/deeper2/deepest/bogus &&
-	git -C sparse-index status 2>err &&
-	grep "The sparse index is expanding to a full index" err &&
-
-	git -C sparse-index sparse-checkout disable 2>err &&
-	test_line_count = 0 err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-On branch base
-You are in a sparse checkout with 49% of tracked files present.
+Created autostash: 083685b
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+Applying autostash resulted in conflicts.
+Your changes are safe in the stash.
+You can run "git stash pop" or "git stash drop" at any time.
+Updated 1 path from the index
+Merging Version stash was based on with Stashed changes
+On branch feature-branch
+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:   file0
 
 Untracked files:
   (use "git add <file>..." to include in what will be committed)
-	deep/deeper2/deepest/
-
-nothing added to commit but untracked files present (use "git add" to track)
-hint: The sparse index is expanding to a full index, a slow operation.
-ok 96 - advice.sparseIndexExpanded
-
-expecting success of 1092.97 'cat-file -p': 
-	init_repos &&
-	echo "new content" >>full-checkout/deep/a &&
-	echo "new content" >>sparse-checkout/deep/a &&
-	echo "new content" >>sparse-index/deep/a &&
-	run_on_all git add deep/a &&
-
-	test_all_match git cat-file -p :deep/a &&
-	ensure_not_expanded cat-file -p :deep/a &&
-	test_all_match git cat-file -p :folder1/a &&
-	ensure_expanded cat-file -p :folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20260304T075724.770747Z-H8d819085-P00077ae0","thread":"main","time":"2026-03-04T07:57:24.771693Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260304T075724.770747Z-H8d819085-P00077ae0","thread":"main","time":"2026-03-04T07:57:24.772481Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000788,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 97 - cat-file -p
-
-expecting success of 1092.98 'cat-file --batch': 
-	init_repos &&
-	echo "new content" >>full-checkout/deep/a &&
-	echo "new content" >>sparse-checkout/deep/a &&
-	echo "new content" >>sparse-index/deep/a &&
-	run_on_all git add deep/a &&
-
-	echo ":deep/a" >in &&
-	test_all_match git cat-file --batch <in &&
-	ensure_not_expanded cat-file --batch <in &&
-
-	echo ":folder1/a" >in &&
-	test_all_match git cat-file --batch <in &&
-	ensure_expanded cat-file --batch <in &&
-
-	cat >in <<-\EOF &&
-	:deep/a
-	:folder1/a
-	EOF
-	test_all_match git cat-file --batch <in &&
-	ensure_expanded cat-file --batch <in
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20260304T075725.418970Z-H8d819085-P00077d76","thread":"main","time":"2026-03-04T07:57:25.419905Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260304T075725.418970Z-H8d819085-P00077d76","thread":"main","time":"2026-03-04T07:57:25.420686Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000781,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260304T075725.622888Z-H8d819085-P00077e50","thread":"main","time":"2026-03-04T07:57:25.623949Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260304T075725.622888Z-H8d819085-P00077e50","thread":"main","time":"2026-03-04T07:57:25.624791Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000842,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 98 - cat-file --batch
-
-# still have 2 known breakage(s)
-# passed all remaining 96 test(s)
-1..98
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3427-rebase-subtree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3427-rebase-subtree/.git/
-expecting success of 3427.1 'setup': 
-	test_commit README &&
-
-	git init files &&
-	test_commit -C files topic_1 &&
-	test_commit -C files topic_2 &&
-	test_commit -C files topic_3 &&
-
-	: perform subtree merge into files_subtree/ &&
-	git fetch files refs/heads/main:refs/heads/files-main &&
-	git merge -s ours --no-commit --allow-unrelated-histories \
-		files-main &&
-	git read-tree --prefix=files_subtree -u files-main &&
-	git commit -m "Add subproject main" &&
+	actual
+	actual2
+	err
+	expect
+	expected
 
-	: add two extra commits to rebase &&
-	test_commit -C files_subtree topic_4 &&
-	test_commit files_subtree/topic_5 &&
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (083685bba8c747d8dec51b2a5ffc97733bf5a961)
+HEAD is now at 0c4d2f1 third commit
+ok 48 - autostash is saved on editor failure with conflict
 
-	git checkout -b to-rebase &&
-	git fast-export --no-data HEAD -- files_subtree/ |
-		sed -e "s%\([0-9a-f]\{40\} \)files_subtree/%\1%" |
-		git fast-import --force --quiet &&
-	git reset --hard &&
-	git commit -m "Empty commit" --allow-empty
+expecting success of 3420.49 'autostash with dirty submodules': 
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b with-submodule &&
+	git -c protocol.file.allow=always submodule add ./ sub &&
+	test_tick &&
+	git commit -m add-submodule &&
+	echo changed >sub/file0 &&
+	git rebase -i --autostash HEAD
 
-[main (root-commit) 9b47b78] README
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 README.t
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3427-rebase-subtree/files/.git/
-[main (root-commit) 8d5ac37] topic_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 topic_1.t
-[main e30c5d3] topic_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 topic_2.t
-[main 152af92] topic_3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 topic_3.t
-From files
- * [new branch]      main       -> files-main
- * [new tag]         topic_3    -> topic_3
- * [new tag]         topic_1    -> topic_1
- * [new tag]         topic_2    -> topic_2
-Automatic merge went well; stopped before committing as requested
-[main 90609d1] Add subproject main
- Author: A U Thor <author@example.com>
-[main 9e13d1d] topic_4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 files_subtree/topic_4.t
-[main 76d9147] files_subtree/topic_5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 files_subtree/topic_5.t
-Switched to a new branch 'to-rebase'
-HEAD is now at e6c9414 files_subtree/topic_5
-[to-rebase f09580c] Empty commit
+Switched to a new branch 'with-submodule'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3420-rebase-autostash/sub'...
+done.
+[with-submodule 42dcd38] add-submodule
  Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 3427.2 'Rebase -Xsubtree --empty=ask --onto commit': 
-	reset_rebase &&
-	git checkout -b rebase-onto to-rebase &&
-	test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-main main &&
-	: first pick results in no changes &&
-	git rebase --skip &&
-	test "$(commit_message HEAD~2)" = "topic_4" &&
-	test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
-	test "$(commit_message HEAD)" = "Empty commit"
-
-fatal: no rebase in progress
-HEAD is now at f09580c Empty commit
-Switched to a new branch 'rebase-onto'
-warning: --empty=ask is deprecated; use '--empty=stop' instead.
-Rebasing (1/4)
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 152af92
-Last command done (1 command done):
-   pick 4b9884c Add subproject main
-Next commands to do (3 remaining commands):
-   pick a622443 topic_4
-   pick e6c9414 files_subtree/topic_5
-  (use "git rebase --edit-todo" to view and edit)
-You are currently rebasing branch 'rebase-onto' on '152af92'.
-  (all conflicts fixed: run "git rebase --continue")
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	files/
-
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 4b9884c... Add subproject main
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/rebase-onto.
-ok 2 - Rebase -Xsubtree --empty=ask --onto commit
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Successfully rebased and updated refs/heads/with-submodule.
+HEAD is now at 42dcd38 add-submodule
+warning: unable to rmdir 'sub': Directory not empty
+Switched to branch 'main'
+ok 49 - autostash with dirty submodules
 
-expecting success of 3427.3 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit': 
-	reset_rebase &&
-	git checkout -b rebase-merges-onto to-rebase &&
-	test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-main --root &&
-	: first pick results in no changes &&
-	git rebase --skip &&
-	test "$(commit_message HEAD~2)" = "topic_4" &&
-	test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
-	test "$(commit_message HEAD)" = "Empty commit"
+expecting success of 3420.50 'branch is left alone when possible': 
+	git checkout -b unchanged-branch &&
+	echo changed >file0 &&
+	git rebase --autostash unchanged-branch &&
+	test changed = "$(cat file0)" &&
+	test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)"
 
-fatal: no rebase in progress
-HEAD is now at d6e246a Empty commit
-Switched to a new branch 'rebase-merges-onto'
-warning: --empty=ask is deprecated; use '--empty=stop' instead.
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+Switched to a new branch 'unchanged-branch'
+Created autostash: 84b1204
+Current branch unchanged-branch is up to date.
+Applied autostash.
+ok 50 - branch is left alone when possible
 
-    git commit --allow-empty
+expecting success of 3420.51 'never change active branch': 
+	git checkout -b not-the-feature-branch unrelated-onto-branch &&
+	test_when_finished "git reset --hard && git checkout main" &&
+	echo changed >file0 &&
+	git rebase --autostash not-the-feature-branch feature-branch &&
+	test_cmp_rev not-the-feature-branch unrelated-onto-branch
 
-Otherwise, please use 'git rebase --skip'
-interactive rebase in progress; onto 152af92
-Last commands done (3 commands done):
-   reset onto
-   pick 4b9884c Add subproject main
-  (see more in file .git/rebase-merge/done)
-Next commands to do (3 remaining commands):
-   pick a622443 topic_4
-   pick e6c9414 files_subtree/topic_5
-  (use "git rebase --edit-todo" to view and edit)
-You are currently rebasing branch 'rebase-merges-onto' on '152af92'.
-  (all conflicts fixed: run "git rebase --continue")
+Switched to a new branch 'not-the-feature-branch'
+M	file0
+Created autostash: 37b7cba
+Rebasing (1/2)
Rebasing (2/2)
Applied autostash.
+Successfully rebased and updated refs/heads/feature-branch.
+HEAD is now at 543b47f third commit
+Switched to branch 'main'
+ok 51 - never change active branch
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	files/
+expecting success of 3420.52 'autostash commit is marked as reachable': 
+	echo changed >file0 &&
+	git rebase --autostash --exec "git prune --expire=now" \
+		feature-branch^ feature-branch &&
+	# git rebase succeeds if the stash cannot be applied so we need to check
+	# the contents of file0
+	echo changed >expect &&
+	test_cmp expect file0
 
-nothing added to commit but untracked files present (use "git add" to track)
-Could not apply 4b9884c... Add subproject main
-Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/rebase-merges-onto.
-ok 3 - Rebase -Xsubtree --empty=ask --rebase-merges --onto commit
+Created autostash: 81533a6
+Rebasing (2/2)
Executing: git prune --expire=now
+Applied autostash.
+Successfully rebased and updated refs/heads/feature-branch.
+ok 52 - autostash commit is marked as reachable
 
-# passed all 3 test(s)
-1..3
+# passed all 52 test(s)
+1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3421-rebase-topology-linear.sh ***
@@ -153035,3685 +151476,824 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3420-rebase-autostash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3420-rebase-autostash/.git/
-expecting success of 3420.1 'setup': 
-	echo hello-world >file0 &&
-	git add . &&
-	test_tick &&
-	git commit -m "initial commit" &&
-	git checkout -b feature-branch &&
-	echo another-hello >file1 &&
-	echo goodbye >file2 &&
-	git add . &&
-	test_tick &&
-	git commit -m "second commit" &&
-	echo final-goodbye >file3 &&
-	git add . &&
-	test_tick &&
-	git commit -m "third commit" &&
-	git checkout -b unrelated-onto-branch main &&
-	echo unrelated >file4 &&
-	git add . &&
-	test_tick &&
-	git commit -m "unrelated commit" &&
-	git checkout -b related-onto-branch main &&
-	echo conflicting-change >file2 &&
-	git add . &&
-	test_tick &&
-	git commit -m "related commit" &&
-	remove_progress_re="$(printf "s/.*\\r//")"
+*** t3429-rebase-edit-todo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3429-rebase-edit-todo/.git/
+expecting success of 3429.1 'setup': 
+	test_commit first file &&
+	test_commit second file &&
+	test_commit third file
 
-[main (root-commit) bfa4f02] initial commit
+[master (root-commit) 07e65e0] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file0
-Switched to a new branch 'feature-branch'
-[feature-branch 6fe95e2] second commit
+ create mode 100644 file
+[master fa10d42] second
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-[feature-branch 0c4d2f1] third commit
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master ba0a06e] third
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Switched to a new branch 'unrelated-onto-branch'
-[unrelated-onto-branch 4aede2f] unrelated commit
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 3429.2 'rebase exec modifies rebase-todo': 
+	todo=.git/rebase-merge/git-rebase-todo &&
+	git rebase HEAD~1 -x "echo exec touch F >>$todo" &&
+	test -e F
+
+Rebasing (2/2)
Executing: echo exec touch F >>.git/rebase-merge/git-rebase-todo
+Rebasing (3/3)
Executing: touch F
+Successfully rebased and updated refs/heads/master.
+ok 2 - rebase exec modifies rebase-todo
+
+expecting success of 3429.3 'rebase exec with an empty list does not exec anything': 
+	git rebase HEAD -x "true" 2>output &&
+	! grep "Executing: true" output
+
+ok 3 - rebase exec with an empty list does not exec anything
+
+expecting success of 3429.4 'loose object cache vs re-reading todo list': 
+	GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo &&
+	export GIT_REBASE_TODO &&
+	write_script append-todo.sh <<-\EOS &&
+	# For values 5 and 6, this yields SHA-1s with the same first two digits
+	echo "pick $(git rev-parse --short \
+		$(printf "%s\\n" \
+			"tree $EMPTY_TREE" \
+			"author A U Thor <author@example.org> $1 +0000" \
+			"committer A U Thor <author@example.org> $1 +0000" \
+			"" \
+			"$1" |
+		  git hash-object -t commit -w --stdin))" >>$GIT_REBASE_TODO
+
+	shift
+	test -z "$*" ||
+	echo "exec $0 $*" >>$GIT_REBASE_TODO
+	EOS
+
+	git rebase HEAD -x "./append-todo.sh 5 6"
+
+Successfully rebased and updated refs/heads/master.
+ok 4 - loose object cache vs re-reading todo list
+
+expecting success of 3429.5 'todo is re-read after reword and squash': 
+	write_script reword-editor.sh <<-\EOS &&
+	GIT_SEQUENCE_EDITOR="echo \"exec echo $(cat file) >>actual\" >>" \
+		git rebase --edit-todo
+	EOS
+
+	test_write_lines first third >expected &&
+	set_fake_editor &&
+	GIT_SEQUENCE_EDITOR="$EDITOR" FAKE_LINES="reword 1 squash 2 fixup 3" \
+		GIT_EDITOR=./reword-editor.sh git rebase -i --root third &&
+	test_cmp expected actual
+
+rebase -i script before editing:
+pick 07e65e0 first
+pick fa10d42 second
+pick ba0a06e third
+
+rebase -i script after editing:
+reword 07e65e0 first
+squash fa10d42 second
+fixup ba0a06e third
+Rebasing (1/3)
[detached HEAD 67746ec] first
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file4
-Switched to a new branch 'related-onto-branch'
-[related-onto-branch c57d250] related commit
+ create mode 100644 file
+Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 15dd5e0] first
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 1 - setup
+ create mode 100644 file
+Rebasing (4/5)
Executing: echo first >>actual
+Rebasing (5/5)
Executing: echo third >>actual
+Successfully rebased and updated detached HEAD.
+ok 5 - todo is re-read after reword and squash
 
-expecting success of 3420.2 'rebase: fast-forward rebase': 
-	test_config rebase.autostash true &&
-	git reset --hard &&
-	git checkout -b behind-feature-branch feature-branch~1 &&
-	test_when_finished git branch -D behind-feature-branch &&
-	echo dirty >>file1 &&
-	git rebase feature-branch &&
-	grep dirty file1 &&
-	git checkout feature-branch
+expecting success of 3429.6 're-reading todo doesnt interfere with revert --edit': 
+	git reset --hard third &&
 
-HEAD is now at c57d250 related commit
-Switched to a new branch 'behind-feature-branch'
-Created autostash: b346341
-Applied autostash.
-Successfully rebased and updated refs/heads/behind-feature-branch.
-dirty
-Switched to branch 'feature-branch'
-M	file1
-Deleted branch behind-feature-branch (was 0c4d2f1).
-ok 2 - rebase: fast-forward rebase
+	git revert --edit third second &&
 
-expecting success of 3420.3 'rebase: noop rebase': 
-	test_config rebase.autostash true &&
-	git reset --hard &&
-	git checkout -b same-feature-branch feature-branch &&
-	test_when_finished git branch -D same-feature-branch &&
-	echo dirty >>file1 &&
-	git rebase feature-branch &&
-	grep dirty file1 &&
-	git checkout feature-branch
+	cat >expect <<-\EOF &&
+	Revert "second"
+	Revert "third"
+	third
+	second
+	first
+	EOF
+	git log --format="%s" >actual &&
+	test_cmp expect actual
 
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'same-feature-branch'
-Created autostash: 925afbd
-Current branch same-feature-branch is up to date.
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file1
-Deleted branch same-feature-branch (was 0c4d2f1).
-ok 3 - rebase: noop rebase
+HEAD is now at ba0a06e third
+[detached HEAD 2d8e437] Revert "third"
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 60853ee] Revert "second"
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - re-reading todo doesnt interfere with revert --edit
 
-expecting success of 3420.4 'rebase --apply: restore autostash when pre-rebase hook fails': 
-		git checkout -f feature-branch &&
-		test_hook pre-rebase <<-\EOF &&
-		exit 1
-		EOF
+expecting success of 3429.7 're-reading todo doesnt interfere with cherry-pick --edit': 
+	git reset --hard first &&
 
-		echo changed >file0 &&
-		test_must_fail git rebase $type --autostash -f HEAD^ &&
-		test_must_fail git rebase --quit 2>err &&
-		test_grep "no rebase in progress" err &&
-		echo changed >expect &&
-		test_cmp expect file0
-	
-Already on 'feature-branch'
-Created autostash: 87bce87
-Current branch feature-branch is up to date, rebase forced.
-error: The pre-rebase hook refused to rebase.
-Applied autostash.
+	git cherry-pick --edit second third &&
+
+	cat >expect <<-\EOF &&
+	third
+	second
+	first
+	EOF
+	git log --format="%s" >actual &&
+	test_cmp expect actual
+
+HEAD is now at 07e65e0 first
+[detached HEAD e619899] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD c9a7b60] third
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - re-reading todo doesnt interfere with cherry-pick --edit
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3433-rebase-across-mode-change.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 4 - rebase --apply: restore autostash when pre-rebase hook fails
+ok 2 - rebase changes with the apply backend
 
-expecting success of 3420.5 'rebase --apply: restore autostash when checkout onto fails': 
-		git checkout -f --detach feature-branch &&
-		echo uncommitted-content >file0 &&
-		echo untracked >file4 &&
-		test_when_finished "rm file4" &&
-		test_must_fail git rebase $type --autostash \
-							unrelated-onto-branch &&
-		test_must_fail git rebase --quit 2>err &&
-		test_grep "no rebase in progress" err &&
-		echo uncommitted-content >expect &&
-		test_cmp expect file0
-	
-HEAD is now at 0c4d2f1 third commit
-Created autostash: b8f272c
-error: The following untracked working tree files would be overwritten by checkout:
-	file4
-Please move or remove them before you switch branches.
-Aborting
-error: Could not detach HEAD
-First, rewinding head to replay your work on top of it...
-Applied autostash.
+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 5 - rebase --apply: restore autostash when checkout onto fails
+ok 3 - rebase changes with the merge backend
 
-expecting success of 3420.6 'rebase --apply: restore autostash when branch checkout fails': 
-		git checkout -f unrelated-onto-branch^ &&
-		echo uncommitted-content >file0 &&
-		echo untracked >file4 &&
-		test_when_finished "rm file4" &&
-		test_must_fail git rebase $type --autostash HEAD \
-							unrelated-onto-branch &&
-		test_must_fail git rebase --quit 2>err &&
-		test_grep "no rebase in progress" err &&
-		echo uncommitted-content >expect &&
-		test_cmp expect file0
-	
-Previous HEAD position was 0c4d2f1 third commit
-HEAD is now at bfa4f02 initial commit
-Created autostash: 2fa90c3
-error: The following untracked working tree files would be overwritten by checkout:
-	file4
-Please move or remove them before you switch branches.
-Aborting
-error: could not switch to unrelated-onto-branch
-Applied autostash.
+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 6 - rebase --apply: restore autostash when branch checkout fails
+ok 4 - rebase changes with the merge backend with a delay
 
-expecting success of 3420.7 'rebase --apply: dirty worktree, --no-autostash': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		test_when_finished git checkout feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type --no-autostash unrelated-onto-branch
-	
-HEAD is now at bfa4f02 initial commit
-Previous HEAD position was bfa4f02 initial commit
-Switched to a new branch 'rebased-feature-branch'
-error: cannot rebase: You have unstaged changes.
-error: Please commit or stash them.
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 7 - rebase --apply: dirty worktree, --no-autostash
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3431-rebase-fork-point.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3431-rebase-fork-point/.git/
+expecting success of 3431.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	test_commit C &&
+	git branch -t side &&
+	git reset --hard HEAD^ &&
+	test_commit D &&
+	test_commit E &&
+	git checkout side &&
+	test_commit F &&
+	test_commit G
 
-expecting success of 3420.8 'rebase --apply: dirty worktree, non-conflicting rebase': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		echo dirty >>file3 &&
-		git rebase$type unrelated-onto-branch >actual 2>&1 &&
-		grep unrelated file4 &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-unrelated
-dirty
-Switched to branch 'feature-branch'
-M	file3
-ok 8 - rebase --apply: dirty worktree, non-conflicting rebase
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+branch 'side' set up to track 'main'.
+HEAD is now at d9df450 B
+[main 3e6e33e] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[main dc25130] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+[side f231f7a] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[side d8775ba] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+ok 1 - setup
 
-expecting success of 3420.9 'rebase --apply --autostash: check output': 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-apply} &&
-		if test ${suffix} = "interactive"; then
-			suffix=merge
-		fi &&
-		create_expected_success_$suffix &&
-		sed "$remove_progress_re" <actual >actual2 &&
-		test_cmp expected actual2
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 9 - rebase --apply --autostash: check output
+expecting success of 3431.2 'git rebase ': do_test_rebase 'G F E D B A' 
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 2 - git rebase 
 
-expecting success of 3420.10 'rebase --apply: dirty index, non-conflicting rebase': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		git add file3 &&
-		git rebase$type unrelated-onto-branch &&
-		grep unrelated file4 &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: 7305f55
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Applying: third commit
-Applied autostash.
-unrelated
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was b607b14).
-ok 10 - rebase --apply: dirty index, non-conflicting rebase
+expecting success of 3431.3 'git rebase --onto D': do_test_rebase 'G F D B A' --onto D
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 2 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 3 - git rebase --onto D
 
-expecting success of 3420.11 'rebase --apply: conflicting rebase': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		rm -rf $dotest &&
-		git reset --hard &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-c57d250 related commit
-virtual second commit
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging file2
-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 advice.mergeConflict false"
-Patch failed at 0001 second commit
-HEAD is now at c57d250 related commit
-Previous HEAD position was c57d250 related commit
-Switched to branch 'feature-branch'
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 11 - rebase --apply: conflicting rebase
+expecting success of 3431.4 'git rebase --keep-base': do_test_rebase 'G F C B A' --keep-base
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 2 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Current branch side is up to date.
+ok 4 - git rebase --keep-base
 
-expecting success of 3420.12 'rebase --apply: --continue': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		echo "conflicting-plus-goodbye" >file2 &&
-		git add file2 &&
+expecting success of 3431.5 'git rebase --no-fork-point': do_test_rebase 'G F C E D B A' --no-fork-point
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 5 - git rebase --no-fork-point
+
+expecting success of 3431.6 'git rebase --no-fork-point --onto D': do_test_rebase 'G F C D B A' --no-fork-point --onto D
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 3 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 6 - git rebase --no-fork-point --onto D
+
+expecting success of 3431.7 'git rebase --no-fork-point --keep-base': do_test_rebase 'G F C B A' --no-fork-point --keep-base
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Current branch side is up to date.
+ok 7 - git rebase --no-fork-point --keep-base
+
+expecting success of 3431.8 'git rebase --fork-point refs/heads/main': do_test_rebase 'G F E D B A' --fork-point refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 8 - git rebase --fork-point refs/heads/main
+
+expecting success of 3431.9 'git rebase --fork-point main': do_test_rebase 'G F E D B A' --fork-point main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 2 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 9 - git rebase --fork-point main
+
+expecting success of 3431.10 'git rebase --fork-point --onto D refs/heads/main': do_test_rebase 'G F D B A' --fork-point --onto D refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 2 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 10 - git rebase --fork-point --onto D refs/heads/main
+
+expecting success of 3431.11 'git rebase --fork-point --onto D main': do_test_rebase 'G F D B A' --fork-point --onto D main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 2 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 11 - git rebase --fork-point --onto D main
+
+expecting success of 3431.12 'git rebase --fork-point --keep-base refs/heads/main': do_test_rebase 'G F B A' --fork-point --keep-base refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 2 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 12 - git rebase --fork-point --keep-base refs/heads/main
+
+expecting success of 3431.13 'git rebase --fork-point --keep-base main': do_test_rebase 'G F B A' --fork-point --keep-base main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 13 - git rebase --fork-point --keep-base main
+
+expecting success of 3431.14 'git rebase refs/heads/main': do_test_rebase 'G F C E D B A' refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 14 - git rebase refs/heads/main
+
+expecting success of 3431.15 'git rebase main': do_test_rebase 'G F C E D B A' main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 3 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 15 - git rebase main
+
+expecting success of 3431.16 'git rebase --onto D refs/heads/main': do_test_rebase 'G F C D B A' --onto D refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 3 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 16 - git rebase --onto D refs/heads/main
+
+expecting success of 3431.17 'git rebase --onto D main': do_test_rebase 'G F C D B A' --onto D main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 17 - git rebase --onto D main
+
+expecting success of 3431.18 'git rebase --keep-base refs/heads/main': do_test_rebase 'G F C B A' --keep-base refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Current branch side is up to date.
+ok 18 - git rebase --keep-base refs/heads/main
+
+expecting success of 3431.19 'git rebase --keep-base main': do_test_rebase 'G F C B A' --keep-base main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Current branch side is up to date.
+ok 19 - git rebase --keep-base main
+
+expecting success of 3431.20 'git rebase --fork-point with ambigous refname': 
+	git checkout main &&
+	git checkout -b one &&
+	git checkout side &&
+	git tag one &&
+	test_must_fail git rebase --fork-point --onto D one
+
+Switched to branch 'main'
+Switched to a new branch 'one'
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+warning: refname 'one' is ambiguous.
+fatal: Ambiguous refname: 'one'
+ok 20 - git rebase --fork-point with ambigous refname
+
+expecting success of 3431.21 '--fork-point and --root both given': 
+	test_must_fail git rebase --fork-point --root 2>err &&
+	test_grep "cannot be used together" err
+
+fatal: options '--root' and '--fork-point' cannot be used together
+ok 21 - --fork-point and --root both given
+
+expecting success of 3431.22 'rebase.forkPoint set to false': 
+	test_config rebase.forkPoint false &&
+	do_test_rebase "G F C E D B A"
+
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 22 - rebase.forkPoint set to false
+
+expecting success of 3431.23 'rebase.forkPoint set to false and then to true': 
+	test_config_global rebase.forkPoint false &&
+	test_config rebase.forkPoint true &&
+	do_test_rebase "G F E D B A"
+
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 3 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 23 - rebase.forkPoint set to false and then to true
+
+expecting success of 3431.24 'rebase.forkPoint set to false and command line says --fork-point': 
+	test_config rebase.forkPoint false &&
+	do_test_rebase "G F E D B A" --fork-point
+
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 2 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 24 - rebase.forkPoint set to false and command line says --fork-point
+
+expecting success of 3431.25 'rebase.forkPoint set to true and command line says --no-fork-point': 
+	test_config rebase.forkPoint true &&
+	do_test_rebase "G F C E D B A" --no-fork-point
+
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 2 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 25 - rebase.forkPoint set to true and command line says --no-fork-point
+
+expecting success of 3431.26 'rebase.forkPoint set to true and --root given': 
+	test_config rebase.forkPoint true &&
+	git rebase --root
+
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/side.
+ok 26 - rebase.forkPoint set to true and --root given
+
+# passed all 26 test(s)
+1..26
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3435-rebase-gpg-sign.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3435-rebase-gpg-sign/.git/
+checking prerequisite: GPG
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
+
+	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
+	# the gpg version 1.0.6 did not parse trust packets correctly, so for
+	# that version, creation of signed tags using the generated key fails.
+	case "$gpg_version" in
+	"gpg (GnuPG) 1.0.6"*)
+		say "Your version of gpg (1.0.6) is too buggy for testing"
+		exit 1
+		;;
+	*)
+		# Available key info:
+		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
+		#   name and email: C O Mitter <committer@example.com>
+		# * Type RSA, size 2048 bits, no expiration date,
+		#   name and email: Eris Discordia <discord@example.net>
+		# No password given, to enable non-interactive operation.
+		# To generate new key:
+		#	gpg --homedir /tmp/gpghome --gen-key
+		# To write armored exported key to keyring:
+		#	gpg --homedir /tmp/gpghome --export-secret-keys \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		#	gpg --homedir /tmp/gpghome --export \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		# To export ownertrust:
+		#	gpg --homedir /tmp/gpghome --export-ownertrust \
+		#		> lib-gpg/ownertrust
+		mkdir "$GNUPGHOME" &&
+		chmod 0700 "$GNUPGHOME" &&
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
+
+)
+prerequisite GPG not satisfied
+1..0 # SKIP skip all test rebase --[no-]gpg-sign, gpg not available
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3434-rebase-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
-		test_path_is_missing $dotest/autostash &&
-		grep dirty file3 &&
-		git checkout feature-branch
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
 	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-c57d250 related commit
-virtual second commit
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
+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 advice.mergeConflict false"
-Patch failed at 0001 second commit
-Applying: second commit
-Applying: third commit
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 51f2c81).
-ok 12 - rebase --apply: --continue
+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 3420.13 'rebase --apply: --skip': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		git rebase --skip &&
-		test_path_is_missing $dotest/autostash &&
-		grep dirty file3 &&
-		git checkout feature-branch
+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
 	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-c57d250 related commit
-virtual second commit
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
+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 advice.mergeConflict false"
-Patch failed at 0001 second commit
-Applying: third commit
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was fa02356).
-ok 13 - rebase --apply: --skip
+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 3420.14 'rebase --apply: --abort': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		git rebase --abort &&
-		test_path_is_missing $dotest/autostash &&
-		grep dirty file3 &&
-		git checkout feature-branch
+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
 	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-c57d250 related commit
-virtual second commit
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
+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 advice.mergeConflict false"
-Patch failed at 0001 second commit
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 14 - rebase --apply: --abort
-
-expecting success of 3420.15 'rebase --apply: --quit': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		git diff >expect &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		git rebase --quit &&
-		test_when_finished git stash drop &&
-		test_path_is_missing $dotest/autostash &&
-		! grep dirty file3 &&
-		git stash show -p >actual &&
-		test_cmp expect actual &&
-		git reset --hard &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-c57d250 related commit
-virtual second commit
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in file2
-Auto-merging file2
-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 advice.mergeConflict false"
-Patch failed at 0001 second commit
-Autostash exists; creating a new stash entry.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-grep: file3: No such file or directory
-HEAD is now at c57d250 related commit
-Previous HEAD position was c57d250 related commit
-Switched to branch 'feature-branch'
-Dropped refs/stash@{0} (ce96636712fc38300c1f0f777cc2fac6dee041c0)
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 15 - rebase --apply: --quit
-
-expecting success of 3420.16 'rebase --apply: non-conflicting rebase, conflicting stash': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		echo dirty >file4 &&
-		git add file4 &&
-		git rebase$type unrelated-onto-branch >actual 2>&1 &&
-		test_path_is_missing $dotest &&
-		git reset --hard &&
-		grep unrelated file4 &&
-		! grep dirty file4 &&
-		git checkout feature-branch &&
-		git stash pop &&
-		grep dirty file4
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-HEAD is now at b607b14 third commit
-unrelated
-Switched to branch 'feature-branch'
-Merging Version stash was based on with Stashed changes
-On branch feature-branch
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   file4
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual2
-	err
-	expect
-	expected
-
-Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
-dirty
-ok 16 - rebase --apply: non-conflicting rebase, conflicting stash
-
-expecting success of 3420.17 'rebase --apply: check output with conflicting stash': 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-apply} &&
-		if test ${suffix} = "interactive"; then
-			suffix=merge
-		fi &&
-		create_expected_failure_$suffix &&
-		sed "$remove_progress_re" <actual >actual2 &&
-		test_cmp expected actual2
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 17 - rebase --apply: check output with conflicting stash
-
-expecting success of 3420.18 'rebase --merge: restore autostash when pre-rebase hook fails': 
-		git checkout -f feature-branch &&
-		test_hook pre-rebase <<-\EOF &&
-		exit 1
-		EOF
-
-		echo changed >file0 &&
-		test_must_fail git rebase $type --autostash -f HEAD^ &&
-		test_must_fail git rebase --quit 2>err &&
-		test_grep "no rebase in progress" err &&
-		echo changed >expect &&
-		test_cmp expect file0
-	
-Already on 'feature-branch'
-Created autostash: 87bce87
-Current branch feature-branch is up to date, rebase forced.
-error: The pre-rebase hook refused to rebase.
-Applied autostash.
-fatal: no rebase in progress
-ok 18 - rebase --merge: restore autostash when pre-rebase hook fails
-
-expecting success of 3420.19 'rebase --merge: restore autostash when checkout onto fails': 
-		git checkout -f --detach feature-branch &&
-		echo uncommitted-content >file0 &&
-		echo untracked >file4 &&
-		test_when_finished "rm file4" &&
-		test_must_fail git rebase $type --autostash \
-							unrelated-onto-branch &&
-		test_must_fail git rebase --quit 2>err &&
-		test_grep "no rebase in progress" err &&
-		echo uncommitted-content >expect &&
-		test_cmp expect file0
-	
-HEAD is now at 0c4d2f1 third commit
-Created autostash: b8f272c
-error: The following untracked working tree files would be overwritten by checkout:
-	file4
-Please move or remove them before you switch branches.
-Aborting
-Applied autostash.
-error: could not detach HEAD
-fatal: no rebase in progress
-ok 19 - rebase --merge: restore autostash when checkout onto fails
-
-expecting success of 3420.20 'rebase --merge: restore autostash when branch checkout fails': 
-		git checkout -f unrelated-onto-branch^ &&
-		echo uncommitted-content >file0 &&
-		echo untracked >file4 &&
-		test_when_finished "rm file4" &&
-		test_must_fail git rebase $type --autostash HEAD \
-							unrelated-onto-branch &&
-		test_must_fail git rebase --quit 2>err &&
-		test_grep "no rebase in progress" err &&
-		echo uncommitted-content >expect &&
-		test_cmp expect file0
-	
-Previous HEAD position was 0c4d2f1 third commit
-HEAD is now at bfa4f02 initial commit
-Created autostash: 2fa90c3
-error: The following untracked working tree files would be overwritten by checkout:
-	file4
-Please move or remove them before you switch branches.
-Aborting
-error: could not switch to unrelated-onto-branch
-Applied autostash.
-fatal: no rebase in progress
-ok 20 - rebase --merge: restore autostash when branch checkout fails
-
-expecting success of 3420.21 'rebase --merge: dirty worktree, --no-autostash': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		test_when_finished git checkout feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type --no-autostash unrelated-onto-branch
-	
-HEAD is now at bfa4f02 initial commit
-Previous HEAD position was bfa4f02 initial commit
-Switched to a new branch 'rebased-feature-branch'
-error: cannot rebase: You have unstaged changes.
-error: Please commit or stash them.
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 21 - rebase --merge: dirty worktree, --no-autostash
-
-expecting success of 3420.22 'rebase --merge: dirty worktree, non-conflicting rebase': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		echo dirty >>file3 &&
-		git rebase$type unrelated-onto-branch >actual 2>&1 &&
-		grep unrelated file4 &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-unrelated
-dirty
-Switched to branch 'feature-branch'
-M	file3
-ok 22 - rebase --merge: dirty worktree, non-conflicting rebase
-
-expecting success of 3420.23 'rebase --merge --autostash: check output': 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-apply} &&
-		if test ${suffix} = "interactive"; then
-			suffix=merge
-		fi &&
-		create_expected_success_$suffix &&
-		sed "$remove_progress_re" <actual >actual2 &&
-		test_cmp expected actual2
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 23 - rebase --merge --autostash: check output
-
-expecting success of 3420.24 'rebase --merge: dirty index, non-conflicting rebase': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		git add file3 &&
-		git rebase$type unrelated-onto-branch &&
-		grep unrelated file4 &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: 7305f55
-Rebasing (1/2)
Rebasing (2/2)
Applied autostash.
-Successfully rebased and updated refs/heads/rebased-feature-branch.
-unrelated
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was b607b14).
-ok 24 - rebase --merge: dirty index, non-conflicting rebase
-
-expecting success of 3420.25 'rebase --merge: conflicting rebase': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		rm -rf $dotest &&
-		git reset --hard &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-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 advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-HEAD is now at c57d250 related commit
-Previous HEAD position was c57d250 related commit
-Switched to branch 'feature-branch'
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 25 - rebase --merge: conflicting rebase
-
-expecting success of 3420.26 'rebase --merge: --continue': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		echo "conflicting-plus-goodbye" >file2 &&
-		git add file2 &&
-		git rebase --continue &&
-		test_path_is_missing $dotest/autostash &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-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 advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-[detached HEAD 62edf38] second commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file1
-Rebasing (2/2)
Applied autostash.
-Successfully rebased and updated refs/heads/rebased-feature-branch.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 51f2c81).
-ok 26 - rebase --merge: --continue
-
-expecting success of 3420.27 'rebase --merge: --skip': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		git rebase --skip &&
-		test_path_is_missing $dotest/autostash &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-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 advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-Rebasing (2/2)
Applied autostash.
-Successfully rebased and updated refs/heads/rebased-feature-branch.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was fa02356).
-ok 27 - rebase --merge: --skip
-
-expecting success of 3420.28 'rebase --merge: --abort': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		git rebase --abort &&
-		test_path_is_missing $dotest/autostash &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-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 advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 28 - rebase --merge: --abort
-
-expecting success of 3420.29 'rebase --merge: --quit': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		git diff >expect &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		git rebase --quit &&
-		test_when_finished git stash drop &&
-		test_path_is_missing $dotest/autostash &&
-		! grep dirty file3 &&
-		git stash show -p >actual &&
-		test_cmp expect actual &&
-		git reset --hard &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-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 advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-Autostash exists; creating a new stash entry.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-grep: file3: No such file or directory
-HEAD is now at c57d250 related commit
-Previous HEAD position was c57d250 related commit
-Switched to branch 'feature-branch'
-Dropped refs/stash@{0} (ce96636712fc38300c1f0f777cc2fac6dee041c0)
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 29 - rebase --merge: --quit
-
-expecting success of 3420.30 'rebase --merge: non-conflicting rebase, conflicting stash': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		echo dirty >file4 &&
-		git add file4 &&
-		git rebase$type unrelated-onto-branch >actual 2>&1 &&
-		test_path_is_missing $dotest &&
-		git reset --hard &&
-		grep unrelated file4 &&
-		! grep dirty file4 &&
-		git checkout feature-branch &&
-		git stash pop &&
-		grep dirty file4
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-HEAD is now at b607b14 third commit
-unrelated
-Switched to branch 'feature-branch'
-Merging Version stash was based on with Stashed changes
-On branch feature-branch
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   file4
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual2
-	err
-	expect
-	expected
-
-Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
-dirty
-ok 30 - rebase --merge: non-conflicting rebase, conflicting stash
-
-expecting success of 3420.31 'rebase --merge: check output with conflicting stash': 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-apply} &&
-		if test ${suffix} = "interactive"; then
-			suffix=merge
-		fi &&
-		create_expected_failure_$suffix &&
-		sed "$remove_progress_re" <actual >actual2 &&
-		test_cmp expected actual2
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 31 - rebase --merge: check output with conflicting stash
-
-expecting success of 3420.32 'rebase --interactive: restore autostash when pre-rebase hook fails': 
-		git checkout -f feature-branch &&
-		test_hook pre-rebase <<-\EOF &&
-		exit 1
-		EOF
-
-		echo changed >file0 &&
-		test_must_fail git rebase $type --autostash -f HEAD^ &&
-		test_must_fail git rebase --quit 2>err &&
-		test_grep "no rebase in progress" err &&
-		echo changed >expect &&
-		test_cmp expect file0
-	
-Already on 'feature-branch'
-Created autostash: 87bce87
-error: The pre-rebase hook refused to rebase.
-Applied autostash.
-fatal: no rebase in progress
-ok 32 - rebase --interactive: restore autostash when pre-rebase hook fails
-
-expecting success of 3420.33 'rebase --interactive: restore autostash when checkout onto fails': 
-		git checkout -f --detach feature-branch &&
-		echo uncommitted-content >file0 &&
-		echo untracked >file4 &&
-		test_when_finished "rm file4" &&
-		test_must_fail git rebase $type --autostash \
-							unrelated-onto-branch &&
-		test_must_fail git rebase --quit 2>err &&
-		test_grep "no rebase in progress" err &&
-		echo uncommitted-content >expect &&
-		test_cmp expect file0
-	
-HEAD is now at 0c4d2f1 third commit
-Created autostash: b8f272c
-error: The following untracked working tree files would be overwritten by checkout:
-	file4
-Please move or remove them before you switch branches.
-Aborting
-Applied autostash.
-error: could not detach HEAD
-fatal: no rebase in progress
-ok 33 - rebase --interactive: restore autostash when checkout onto fails
-
-expecting success of 3420.34 'rebase --interactive: restore autostash when branch checkout fails': 
-		git checkout -f unrelated-onto-branch^ &&
-		echo uncommitted-content >file0 &&
-		echo untracked >file4 &&
-		test_when_finished "rm file4" &&
-		test_must_fail git rebase $type --autostash HEAD \
-							unrelated-onto-branch &&
-		test_must_fail git rebase --quit 2>err &&
-		test_grep "no rebase in progress" err &&
-		echo uncommitted-content >expect &&
-		test_cmp expect file0
-	
-Previous HEAD position was 0c4d2f1 third commit
-HEAD is now at bfa4f02 initial commit
-Created autostash: 2fa90c3
-error: The following untracked working tree files would be overwritten by checkout:
-	file4
-Please move or remove them before you switch branches.
-Aborting
-Applied autostash.
-error: could not detach HEAD
-fatal: no rebase in progress
-ok 34 - rebase --interactive: restore autostash when branch checkout fails
-
-expecting success of 3420.35 'rebase --interactive: dirty worktree, --no-autostash': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		test_when_finished git checkout feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type --no-autostash unrelated-onto-branch
-	
-HEAD is now at bfa4f02 initial commit
-Previous HEAD position was bfa4f02 initial commit
-Switched to a new branch 'rebased-feature-branch'
-error: cannot rebase: You have unstaged changes.
-error: Please commit or stash them.
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 35 - rebase --interactive: dirty worktree, --no-autostash
-
-expecting success of 3420.36 'rebase --interactive: dirty worktree, non-conflicting rebase': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		echo dirty >>file3 &&
-		git rebase$type unrelated-onto-branch >actual 2>&1 &&
-		grep unrelated file4 &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-unrelated
-dirty
-Switched to branch 'feature-branch'
-M	file3
-ok 36 - rebase --interactive: dirty worktree, non-conflicting rebase
-
-expecting success of 3420.37 'rebase --interactive --autostash: check output': 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-apply} &&
-		if test ${suffix} = "interactive"; then
-			suffix=merge
-		fi &&
-		create_expected_success_$suffix &&
-		sed "$remove_progress_re" <actual >actual2 &&
-		test_cmp expected actual2
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 37 - rebase --interactive --autostash: check output
-
-expecting success of 3420.38 'rebase --interactive: dirty index, non-conflicting rebase': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		git add file3 &&
-		git rebase$type unrelated-onto-branch &&
-		grep unrelated file4 &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: 7305f55
-Rebasing (1/2)
Rebasing (2/2)
Applied autostash.
-Successfully rebased and updated refs/heads/rebased-feature-branch.
-unrelated
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was b607b14).
-ok 38 - rebase --interactive: dirty index, non-conflicting rebase
-
-expecting success of 3420.39 'rebase --interactive: conflicting rebase': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		rm -rf $dotest &&
-		git reset --hard &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-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 advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-HEAD is now at c57d250 related commit
-Previous HEAD position was c57d250 related commit
-Switched to branch 'feature-branch'
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 39 - rebase --interactive: conflicting rebase
-
-expecting success of 3420.40 'rebase --interactive: --continue': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		echo "conflicting-plus-goodbye" >file2 &&
-		git add file2 &&
-		git rebase --continue &&
-		test_path_is_missing $dotest/autostash &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-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 advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-[detached HEAD 62edf38] second commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file1
-Rebasing (2/2)
Applied autostash.
-Successfully rebased and updated refs/heads/rebased-feature-branch.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 51f2c81).
-ok 40 - rebase --interactive: --continue
-
-expecting success of 3420.41 'rebase --interactive: --skip': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		git rebase --skip &&
-		test_path_is_missing $dotest/autostash &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-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 advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-Rebasing (2/2)
Applied autostash.
-Successfully rebased and updated refs/heads/rebased-feature-branch.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was fa02356).
-ok 41 - rebase --interactive: --skip
-
-expecting success of 3420.42 'rebase --interactive: --abort': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		git rebase --abort &&
-		test_path_is_missing $dotest/autostash &&
-		grep dirty file3 &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-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 advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 42 - rebase --interactive: --abort
-
-expecting success of 3420.43 'rebase --interactive: --quit': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		test_when_finished git branch -D rebased-feature-branch &&
-		echo dirty >>file3 &&
-		git diff >expect &&
-		test_must_fail git rebase$type related-onto-branch &&
-		test_path_is_file $dotest/autostash &&
-		test_path_is_missing file3 &&
-		git rebase --quit &&
-		test_when_finished git stash drop &&
-		test_path_is_missing $dotest/autostash &&
-		! grep dirty file3 &&
-		git stash show -p >actual &&
-		test_cmp expect actual &&
-		git reset --hard &&
-		git checkout feature-branch
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-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 advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-Autostash exists; creating a new stash entry.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-grep: file3: No such file or directory
-HEAD is now at c57d250 related commit
-Previous HEAD position was c57d250 related commit
-Switched to branch 'feature-branch'
-Dropped refs/stash@{0} (ce96636712fc38300c1f0f777cc2fac6dee041c0)
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 43 - rebase --interactive: --quit
-
-expecting success of 3420.44 'rebase --interactive: non-conflicting rebase, conflicting stash': 
-		test_config rebase.autostash true &&
-		git reset --hard &&
-		git checkout -b rebased-feature-branch feature-branch &&
-		echo dirty >file4 &&
-		git add file4 &&
-		git rebase$type unrelated-onto-branch >actual 2>&1 &&
-		test_path_is_missing $dotest &&
-		git reset --hard &&
-		grep unrelated file4 &&
-		! grep dirty file4 &&
-		git checkout feature-branch &&
-		git stash pop &&
-		grep dirty file4
-	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-HEAD is now at b607b14 third commit
-unrelated
-Switched to branch 'feature-branch'
-Merging Version stash was based on with Stashed changes
-On branch feature-branch
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   file4
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual2
-	err
-	expect
-	expected
-
-Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
-dirty
-ok 44 - rebase --interactive: non-conflicting rebase, conflicting stash
-
-expecting success of 3420.45 'rebase --interactive: check output with conflicting stash': 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-apply} &&
-		if test ${suffix} = "interactive"; then
-			suffix=merge
-		fi &&
-		create_expected_failure_$suffix &&
-		sed "$remove_progress_re" <actual >actual2 &&
-		test_cmp expected actual2
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 45 - rebase --interactive: check output with conflicting stash
-
-expecting success of 3420.46 'abort rebase -i with --autostash': 
-	test_when_finished "git reset --hard" &&
-	echo uncommitted-content >file0 &&
-	(
-		write_script abort-editor.sh <<-\EOF &&
-			echo >"$1"
-		EOF
-		test_set_editor "$(pwd)/abort-editor.sh" &&
-		test_must_fail git rebase -i --autostash HEAD^ &&
-		rm -f abort-editor.sh
-	) &&
-	echo uncommitted-content >expected &&
-	test_cmp expected file0
-
-Created autostash: d9b9f3e
-Applied autostash.
-error: nothing to do
-HEAD is now at 0c4d2f1 third commit
-ok 46 - abort rebase -i with --autostash
-
-expecting success of 3420.47 'restore autostash on editor failure': 
-	test_when_finished "git reset --hard" &&
-	echo uncommitted-content >file0 &&
-	(
-		test_set_editor "false" &&
-		test_must_fail git rebase -i --autostash HEAD^
-	) &&
-	echo uncommitted-content >expected &&
-	test_cmp expected file0
-
-Created autostash: 083685b
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-Applied autostash.
-HEAD is now at 0c4d2f1 third commit
-ok 47 - restore autostash on editor failure
-
-expecting success of 3420.48 'autostash is saved on editor failure with conflict': 
-	test_when_finished "git reset --hard" &&
-	echo uncommitted-content >file0 &&
-	(
-		write_script abort-editor.sh <<-\EOF &&
-			echo conflicting-content >file0
-			exit 1
-		EOF
-		test_set_editor "$(pwd)/abort-editor.sh" &&
-		test_must_fail git rebase -i --autostash HEAD^ &&
-		rm -f abort-editor.sh
-	) &&
-	echo conflicting-content >expected &&
-	test_cmp expected file0 &&
-	git checkout file0 &&
-	git stash pop &&
-	echo uncommitted-content >expected &&
-	test_cmp expected file0
-
-Created autostash: 083685b
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-Applying autostash resulted in conflicts.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-Updated 1 path from the index
-Merging Version stash was based on with Stashed changes
-On branch feature-branch
-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:   file0
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual2
-	err
-	expect
-	expected
-
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (083685bba8c747d8dec51b2a5ffc97733bf5a961)
-HEAD is now at 0c4d2f1 third commit
-ok 48 - autostash is saved on editor failure with conflict
-
-expecting success of 3420.49 'autostash with dirty submodules': 
-	test_when_finished "git reset --hard && git checkout main" &&
-	git checkout -b with-submodule &&
-	git -c protocol.file.allow=always submodule add ./ sub &&
-	test_tick &&
-	git commit -m add-submodule &&
-	echo changed >sub/file0 &&
-	git rebase -i --autostash HEAD
-
-Switched to a new branch 'with-submodule'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3420-rebase-autostash/sub'...
-done.
-[with-submodule 42dcd38] add-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Successfully rebased and updated refs/heads/with-submodule.
-HEAD is now at 42dcd38 add-submodule
-warning: unable to rmdir 'sub': Directory not empty
-Switched to branch 'main'
-ok 49 - autostash with dirty submodules
-
-expecting success of 3420.50 'branch is left alone when possible': 
-	git checkout -b unchanged-branch &&
-	echo changed >file0 &&
-	git rebase --autostash unchanged-branch &&
-	test changed = "$(cat file0)" &&
-	test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)"
-
-Switched to a new branch 'unchanged-branch'
-Created autostash: 84b1204
-Current branch unchanged-branch is up to date.
-Applied autostash.
-ok 50 - branch is left alone when possible
-
-expecting success of 3420.51 'never change active branch': 
-	git checkout -b not-the-feature-branch unrelated-onto-branch &&
-	test_when_finished "git reset --hard && git checkout main" &&
-	echo changed >file0 &&
-	git rebase --autostash not-the-feature-branch feature-branch &&
-	test_cmp_rev not-the-feature-branch unrelated-onto-branch
-
-Switched to a new branch 'not-the-feature-branch'
-M	file0
-Created autostash: 37b7cba
-Rebasing (1/2)
Rebasing (2/2)
Applied autostash.
-Successfully rebased and updated refs/heads/feature-branch.
-HEAD is now at 543b47f third commit
-Switched to branch 'main'
-ok 51 - never change active branch
-
-expecting success of 3420.52 'autostash commit is marked as reachable': 
-	echo changed >file0 &&
-	git rebase --autostash --exec "git prune --expire=now" \
-		feature-branch^ feature-branch &&
-	# git rebase succeeds if the stash cannot be applied so we need to check
-	# the contents of file0
-	echo changed >expect &&
-	test_cmp expect file0
-
-Created autostash: 81533a6
-Rebasing (2/2)
Executing: git prune --expire=now
-Applied autostash.
-Successfully rebased and updated refs/heads/feature-branch.
-ok 52 - autostash commit is marked as reachable
-
-# passed all 52 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3429-rebase-edit-todo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3429-rebase-edit-todo/.git/
-expecting success of 3429.1 'setup': 
-	test_commit first file &&
-	test_commit second file &&
-	test_commit third file
-
-[master (root-commit) 07e65e0] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master fa10d42] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master ba0a06e] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 3429.2 'rebase exec modifies rebase-todo': 
-	todo=.git/rebase-merge/git-rebase-todo &&
-	git rebase HEAD~1 -x "echo exec touch F >>$todo" &&
-	test -e F
-
-Rebasing (2/2)
Executing: echo exec touch F >>.git/rebase-merge/git-rebase-todo
-Rebasing (3/3)
Executing: touch F
-Successfully rebased and updated refs/heads/master.
-ok 2 - rebase exec modifies rebase-todo
-
-expecting success of 3429.3 'rebase exec with an empty list does not exec anything': 
-	git rebase HEAD -x "true" 2>output &&
-	! grep "Executing: true" output
-
-ok 3 - rebase exec with an empty list does not exec anything
-
-expecting success of 3429.4 'loose object cache vs re-reading todo list': 
-	GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo &&
-	export GIT_REBASE_TODO &&
-	write_script append-todo.sh <<-\EOS &&
-	# For values 5 and 6, this yields SHA-1s with the same first two digits
-	echo "pick $(git rev-parse --short \
-		$(printf "%s\\n" \
-			"tree $EMPTY_TREE" \
-			"author A U Thor <author@example.org> $1 +0000" \
-			"committer A U Thor <author@example.org> $1 +0000" \
-			"" \
-			"$1" |
-		  git hash-object -t commit -w --stdin))" >>$GIT_REBASE_TODO
-
-	shift
-	test -z "$*" ||
-	echo "exec $0 $*" >>$GIT_REBASE_TODO
-	EOS
-
-	git rebase HEAD -x "./append-todo.sh 5 6"
-
-Successfully rebased and updated refs/heads/master.
-ok 4 - loose object cache vs re-reading todo list
-
-expecting success of 3429.5 'todo is re-read after reword and squash': 
-	write_script reword-editor.sh <<-\EOS &&
-	GIT_SEQUENCE_EDITOR="echo \"exec echo $(cat file) >>actual\" >>" \
-		git rebase --edit-todo
-	EOS
-
-	test_write_lines first third >expected &&
-	set_fake_editor &&
-	GIT_SEQUENCE_EDITOR="$EDITOR" FAKE_LINES="reword 1 squash 2 fixup 3" \
-		GIT_EDITOR=./reword-editor.sh git rebase -i --root third &&
-	test_cmp expected actual
-
-rebase -i script before editing:
-pick 07e65e0 first
-pick fa10d42 second
-pick ba0a06e third
-
-rebase -i script after editing:
-reword 07e65e0 first
-squash fa10d42 second
-fixup ba0a06e third
-Rebasing (1/3)
[detached HEAD 67746ec] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 15dd5e0] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Rebasing (4/5)
Executing: echo first >>actual
-Rebasing (5/5)
Executing: echo third >>actual
-Successfully rebased and updated detached HEAD.
-ok 5 - todo is re-read after reword and squash
-
-expecting success of 3429.6 're-reading todo doesnt interfere with revert --edit': 
-	git reset --hard third &&
-
-	git revert --edit third second &&
-
-	cat >expect <<-\EOF &&
-	Revert "second"
-	Revert "third"
-	third
-	second
-	first
-	EOF
-	git log --format="%s" >actual &&
-	test_cmp expect actual
-
-HEAD is now at ba0a06e third
-[detached HEAD 2d8e437] Revert "third"
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 60853ee] Revert "second"
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - re-reading todo doesnt interfere with revert --edit
-
-expecting success of 3429.7 're-reading todo doesnt interfere with cherry-pick --edit': 
-	git reset --hard first &&
-
-	git cherry-pick --edit second third &&
-
-	cat >expect <<-\EOF &&
-	third
-	second
-	first
-	EOF
-	git log --format="%s" >actual &&
-	test_cmp expect actual
-
-HEAD is now at 07e65e0 first
-[detached HEAD e619899] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD c9a7b60] third
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - re-reading todo doesnt interfere with cherry-pick --edit
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3434-rebase-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 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 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
+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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3433-rebase-across-mode-change.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3435-rebase-gpg-sign.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3435-rebase-gpg-sign/.git/
-checking prerequisite: GPG
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
-	# the gpg version 1.0.6 did not parse trust packets correctly, so for
-	# that version, creation of signed tags using the generated key fails.
-	case "$gpg_version" in
-	"gpg (GnuPG) 1.0.6"*)
-		say "Your version of gpg (1.0.6) is too buggy for testing"
-		exit 1
-		;;
-	*)
-		# Available key info:
-		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
-		#   name and email: C O Mitter <committer@example.com>
-		# * Type RSA, size 2048 bits, no expiration date,
-		#   name and email: Eris Discordia <discord@example.net>
-		# No password given, to enable non-interactive operation.
-		# To generate new key:
-		#	gpg --homedir /tmp/gpghome --gen-key
-		# To write armored exported key to keyring:
-		#	gpg --homedir /tmp/gpghome --export-secret-keys \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		#	gpg --homedir /tmp/gpghome --export \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		# To export ownertrust:
-		#	gpg --homedir /tmp/gpghome --export-ownertrust \
-		#		> lib-gpg/ownertrust
-		mkdir "$GNUPGHOME" &&
-		chmod 0700 "$GNUPGHOME" &&
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
-
-)
-prerequisite GPG not satisfied
-1..0 # SKIP skip all test rebase --[no-]gpg-sign, gpg not available
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3431-rebase-fork-point.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3431-rebase-fork-point/.git/
-expecting success of 3431.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	test_commit C &&
-	git branch -t side &&
-	git reset --hard HEAD^ &&
-	test_commit D &&
-	test_commit E &&
-	git checkout side &&
-	test_commit F &&
-	test_commit G
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-branch 'side' set up to track 'main'.
-HEAD is now at d9df450 B
-[main 3e6e33e] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[main dc25130] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-[side f231f7a] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[side d8775ba] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-ok 1 - setup
-
-expecting success of 3431.2 'git rebase ': do_test_rebase 'G F E D B A' 
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 2 - git rebase 
-
-expecting success of 3431.3 'git rebase --onto D': do_test_rebase 'G F D B A' --onto D
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 3 - git rebase --onto D
-
-expecting success of 3431.4 'git rebase --keep-base': do_test_rebase 'G F C B A' --keep-base
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 4 - git rebase --keep-base
-
-expecting success of 3431.5 'git rebase --no-fork-point': do_test_rebase 'G F C E D B A' --no-fork-point
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 5 - git rebase --no-fork-point
-
-expecting success of 3431.6 'git rebase --no-fork-point --onto D': do_test_rebase 'G F C D B A' --no-fork-point --onto D
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 6 - git rebase --no-fork-point --onto D
-
-expecting success of 3431.7 'git rebase --no-fork-point --keep-base': do_test_rebase 'G F C B A' --no-fork-point --keep-base
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 7 - git rebase --no-fork-point --keep-base
-
-expecting success of 3431.8 'git rebase --fork-point refs/heads/main': do_test_rebase 'G F E D B A' --fork-point refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 8 - git rebase --fork-point refs/heads/main
-
-expecting success of 3431.9 'git rebase --fork-point main': do_test_rebase 'G F E D B A' --fork-point main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 9 - git rebase --fork-point main
-
-expecting success of 3431.10 'git rebase --fork-point --onto D refs/heads/main': do_test_rebase 'G F D B A' --fork-point --onto D refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 10 - git rebase --fork-point --onto D refs/heads/main
-
-expecting success of 3431.11 'git rebase --fork-point --onto D main': do_test_rebase 'G F D B A' --fork-point --onto D main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 11 - git rebase --fork-point --onto D main
-
-expecting success of 3431.12 'git rebase --fork-point --keep-base refs/heads/main': do_test_rebase 'G F B A' --fork-point --keep-base refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 12 - git rebase --fork-point --keep-base refs/heads/main
-
-expecting success of 3431.13 'git rebase --fork-point --keep-base main': do_test_rebase 'G F B A' --fork-point --keep-base main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 13 - git rebase --fork-point --keep-base main
-
-expecting success of 3431.14 'git rebase refs/heads/main': do_test_rebase 'G F C E D B A' refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 14 - git rebase refs/heads/main
-
-expecting success of 3431.15 'git rebase main': do_test_rebase 'G F C E D B A' main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 15 - git rebase main
-
-expecting success of 3431.16 'git rebase --onto D refs/heads/main': do_test_rebase 'G F C D B A' --onto D refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 16 - git rebase --onto D refs/heads/main
-
-expecting success of 3431.17 'git rebase --onto D main': do_test_rebase 'G F C D B A' --onto D main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 17 - git rebase --onto D main
-
-expecting success of 3431.18 'git rebase --keep-base refs/heads/main': do_test_rebase 'G F C B A' --keep-base refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 18 - git rebase --keep-base refs/heads/main
-
-expecting success of 3431.19 'git rebase --keep-base main': do_test_rebase 'G F C B A' --keep-base main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 19 - git rebase --keep-base main
-
-expecting success of 3431.20 'git rebase --fork-point with ambigous refname': 
-	git checkout main &&
-	git checkout -b one &&
-	git checkout side &&
-	git tag one &&
-	test_must_fail git rebase --fork-point --onto D one
-
-Switched to branch 'main'
-Switched to a new branch 'one'
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-warning: refname 'one' is ambiguous.
-fatal: Ambiguous refname: 'one'
-ok 20 - git rebase --fork-point with ambigous refname
-
-expecting success of 3431.21 '--fork-point and --root both given': 
-	test_must_fail git rebase --fork-point --root 2>err &&
-	test_grep "cannot be used together" err
-
-fatal: options '--root' and '--fork-point' cannot be used together
-ok 21 - --fork-point and --root both given
-
-expecting success of 3431.22 'rebase.forkPoint set to false': 
-	test_config rebase.forkPoint false &&
-	do_test_rebase "G F C E D B A"
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 22 - rebase.forkPoint set to false
-
-expecting success of 3431.23 'rebase.forkPoint set to false and then to true': 
-	test_config_global rebase.forkPoint false &&
-	test_config rebase.forkPoint true &&
-	do_test_rebase "G F E D B A"
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 23 - rebase.forkPoint set to false and then to true
-
-expecting success of 3431.24 'rebase.forkPoint set to false and command line says --fork-point': 
-	test_config rebase.forkPoint false &&
-	do_test_rebase "G F E D B A" --fork-point
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 24 - rebase.forkPoint set to false and command line says --fork-point
-
-expecting success of 3431.25 'rebase.forkPoint set to true and command line says --no-fork-point': 
-	test_config rebase.forkPoint true &&
-	do_test_rebase "G F C E D B A" --no-fork-point
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 25 - rebase.forkPoint set to true and command line says --no-fork-point
-
-expecting success of 3431.26 'rebase.forkPoint set to true and --root given': 
-	test_config rebase.forkPoint true &&
-	git rebase --root
-
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/side.
-ok 26 - rebase.forkPoint set to true and --root given
-
-# passed all 26 test(s)
-1..26
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3438-rebase-broken-files.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 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 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 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 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 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 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3436-rebase-more-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3436-rebase-more-options/.git/
-expecting success of 3436.1 'setup': 
-	git checkout -b topic &&
-	test_write_lines "line 1" "	line 2" "line 3" >file &&
-	git add file &&
-	git commit -m "add file" &&
-
-	test_write_lines "line 1" "new line 2" "line 3" >file &&
-	git commit -am "update file" &&
-	git tag side &&
-	test_commit commit1 foo foo1 &&
-	test_commit commit2 foo foo2 &&
-	test_commit commit3 foo foo3 &&
-
-	git checkout --orphan main &&
-	rm foo &&
-	test_write_lines "line 1" "        line 2" "line 3" >file &&
-	git commit -am "add file" &&
-	git tag main &&
-
-	mkdir test-bin &&
-	write_script test-bin/git-merge-test <<-\EOF
-	exec git merge-recursive "$@"
-	EOF
-
-Switched to a new branch 'topic'
-[topic (root-commit) c24e627] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 file
-[topic 139b464] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[topic 7c57c40] commit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[topic bd08fd4] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[topic eda6f49] commit3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'main'
-[main (root-commit) 3ada4af] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 3436.2 '--ignore-whitespace works with apply backend': 
-	test_must_fail git rebase --apply main side &&
-	git rebase --abort &&
-	git rebase --apply --ignore-whitespace main side &&
-	git diff --exit-code side
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-3ada4af add file
-virtual update file
-found 1 common ancestor:
-virtual cea075e2ce716201e60e4bbadc9a40706c56c362
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 update file
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-ok 2 - --ignore-whitespace works with apply backend
-
-expecting success of 3436.3 '--ignore-whitespace works with merge backend': 
-	test_must_fail git rebase --merge main side &&
-	git rebase --abort &&
-	git rebase --merge --ignore-whitespace main side &&
-	git diff --exit-code side
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 139b464... update file
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 139b464... update file
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 3 - --ignore-whitespace works with merge backend
-
-expecting success of 3436.4 '--ignore-whitespace is remembered when continuing': 
-	(
-		set_fake_editor &&
-		FAKE_LINES="break 1" git rebase -i --ignore-whitespace \
-			main side &&
-		git rebase --continue
-	) &&
-	git diff --exit-code side
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-rebase -i script before editing:
-pick 139b464 update file
-
-rebase -i script after editing:
-break
-pick 139b464 update file
-Rebasing (1/2)
Stopped at 3ada4af (add file)
-Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 4 - --ignore-whitespace is remembered when continuing
-
-expecting success of 3436.5 '--committer-date-is-author-date works with apply backend': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	git rebase --apply --committer-date-is-author-date HEAD^ &&
-	test_ctime_is_atime -1
-
-[detached HEAD 6184e8b] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-ok 5 - --committer-date-is-author-date works with apply backend
-
-expecting success of 3436.6 '--committer-date-is-author-date works with merge backend': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	git rebase -m --committer-date-is-author-date HEAD^ &&
-	test_ctime_is_atime -1
-
-[detached HEAD 6184e8b] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is up to date, rebase forced.
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 6 - --committer-date-is-author-date works with merge backend
-
-expecting success of 3436.7 '--committer-date-is-author-date works when rewording': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE=edited \
-			FAKE_LINES="reword 1" \
-			git rebase -i --committer-date-is-author-date HEAD^
-	) &&
-	test_write_lines edited "" >expect &&
-	git log --format="%B" -1 >actual &&
-	test_cmp expect actual &&
-	test_ctime_is_atime -1
-
-[detached HEAD 6184e8b] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-rebase -i script before editing:
-pick 6184e8b update file
-
-rebase -i script after editing:
-reword 6184e8b update file
-Rebasing (1/1)
[detached HEAD 5c38296] edited
- Author: A U Thor <author@example.com>
- Date: Thu Jan 1 03:20:34 1970 +0300
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated detached HEAD.
-ok 7 - --committer-date-is-author-date works when rewording
-
-expecting success of 3436.8 '--committer-date-is-author-date works with rebase -r': 
-	git checkout side &&
-	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
-	git rebase -r --root --committer-date-is-author-date &&
-	test_ctime_is_atime
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  5c38296 edited
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 5c38296
-
-HEAD is now at 139b464 update file
-Merge made by the 'ort' strategy.
- foo | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Successfully rebased and updated detached HEAD.
-ok 8 - --committer-date-is-author-date works with rebase -r
-
-expecting success of 3436.9 '--committer-date-is-author-date works when forking merge': 
-	git checkout side &&
-	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
-	PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \
-					--committer-date-is-author-date &&
-	test_ctime_is_atime
-
-Warning: you are leaving 6 commits behind, not connected to
-any of your branches:
-
-  aa07736 Merge tag 'commit3' into HEAD
-  54193eb commit3
-  a2d9c2e commit2
-  8251e18 commit1
- ... and 2 more.
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> aa07736
-
-HEAD is now at 139b464 update file
-Merge made by the 'ort' strategy.
- foo | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Merging 2a85097a58eecaad11df374857a87fbc0e47e389 with c24e62700f83d7b12297f45d1ce1e9689ebb2b1f
-Merging:
-2a85097 c24e627 add file
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-Rebasing (4/11)
Merging eaa553d7eb7c0d13b95960e348a77332601bbc3e with 139b46443e355afd5f438ac2849d41f3a53b8c77
-Merging:
-eaa553d add file
-139b464 update file
-found 1 common ancestor:
-c24e627 add file
-Rebasing (5/11)
Rebasing (6/11)
Merging 34dfd6c233143884ddd9180be88112657b590d86 with 7c57c40ccd2483ccea76831595c0e232d40560c7
-Merging:
-34dfd6c update file
-7c57c40 commit1
-found 1 common ancestor:
-139b464 update file
-Rebasing (7/11)
Merging 8251e18d67ff84cb7aa93676b4cb93be15ef6810 with bd08fd48eeadc218177587a9f467f39ac4b51d49
-Merging:
-8251e18 commit1
-bd08fd4 commit2
-found 1 common ancestor:
-7c57c40 commit1
-Rebasing (8/11)
Merging a2d9c2ebb6808fff81a49a500b865fbf8f4fcbf5 with eda6f49c7ee63a956ad612b98a03b92c19face55
-Merging:
-a2d9c2e commit2
-eda6f49 commit3
-found 1 common ancestor:
-bd08fd4 commit2
-Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Merging HEAD with 54193ebc0e463528ab8c3f723f89752960c98304
-Merging:
-34dfd6c update file
-54193eb commit3
-found 1 common ancestor:
-34dfd6c update file
-Merge made by the 'test' strategy.
-Successfully rebased and updated detached HEAD.
-ok 9 - --committer-date-is-author-date works when forking merge
-
-expecting success of 3436.10 '--committer-date-is-author-date works when committing conflict resolution': 
-	git checkout commit2 &&
-	GIT_AUTHOR_DATE="@1980 +0000" git commit --amend --only --reset-author &&
-	test_must_fail git rebase -m --committer-date-is-author-date \
-		--onto HEAD^^ HEAD^ &&
-	echo resolved > foo &&
-	git add foo &&
-	git rebase --continue &&
-	test_ctime_is_atime -1
-
-Warning: you are leaving 6 commits behind, not connected to
-any of your branches:
-
-  aa07736 Merge tag 'commit3' into HEAD
-  54193eb commit3
-  a2d9c2e commit2
-  8251e18 commit1
- ... and 2 more.
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> aa07736
-
-HEAD is now at bd08fd4 commit2
-[detached HEAD 832d950] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in 832d950 (commit2).  Version 832d950 (commit2) of foo left in tree.
-error: could not apply 832d950... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 832d950... commit2
-[detached HEAD 3bf7cf9] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Successfully rebased and updated detached HEAD.
-ok 10 - --committer-date-is-author-date works when committing conflict resolution
-
-expecting success of 3436.11 '--reset-author-date works with apply backend': 
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --apply --reset-author-date HEAD^ &&
-	test_atime_is_ignored -1
-
-[detached HEAD 70e7180] commit2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-HEAD is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: commit2
-ok 11 - --reset-author-date works with apply backend
-
-expecting success of 3436.12 '--reset-author-date works with merge backend': 
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --reset-author-date -m HEAD^ &&
-	test_atime_is_ignored -1
-
-[detached HEAD 70e7180] commit2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-HEAD is up to date, rebase forced.
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 12 - --reset-author-date works with merge backend
-
-expecting success of 3436.13 '--reset-author-date works after conflict resolution': 
-	test_must_fail git rebase --reset-author-date -m \
-		--onto commit2^^ commit2^ commit2 &&
-	echo resolved >foo &&
-	git add foo &&
-	git rebase --continue &&
-	test_atime_is_ignored -1
-
-Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
-error: could not apply bd08fd4... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply bd08fd4... commit2
-[detached HEAD a3c45c7] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Successfully rebased and updated detached HEAD.
-ok 13 - --reset-author-date works after conflict resolution
-
-expecting success of 3436.14 '--reset-author-date works with rebase -r': 
-	git checkout side &&
-	git merge --no-ff commit3 &&
-	git rebase -r --root --reset-author-date &&
-	test_atime_is_ignored
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  a3c45c7 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> a3c45c7
-
-HEAD is now at 139b464 update file
-Merge made by the 'ort' strategy.
- foo | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Successfully rebased and updated detached HEAD.
-ok 14 - --reset-author-date works with rebase -r
-
-expecting success of 3436.15 '--reset-author-date with --committer-date-is-author-date works': 
-	test_must_fail git rebase -m --committer-date-is-author-date \
-		--reset-author-date --onto commit2^^ commit2^ commit3 &&
-	git checkout --theirs foo &&
-	git add foo &&
-	git rebase --continue &&
-	test_ctime_is_atime -2 &&
-	test_atime_is_ignored -2
-
-Rebasing (1/2)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
-error: could not apply bd08fd4... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply bd08fd4... commit2
-Updated 1 path from the index
-[detached HEAD d13d95b] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 15 - --reset-author-date with --committer-date-is-author-date works
-
-expecting success of 3436.16 'reset-author-date with --committer-date-is-author-date works when rewording': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE=edited \
-			FAKE_LINES="reword 1" \
-			git rebase -i --committer-date-is-author-date \
-				--reset-author-date HEAD^
-	) &&
-	test_write_lines edited "" >expect &&
-	git log --format="%B" -1 >actual &&
-	test_cmp expect actual &&
-	test_atime_is_ignored -1
-
-[detached HEAD 3446e4a] commit3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-rebase -i script before editing:
-pick 3446e4a commit3
-
-rebase -i script after editing:
-reword 3446e4a commit3
-Rebasing (1/1)
[detached HEAD 05a5363] edited
- Author: A U Thor <author@example.com>
- Date: Wed Mar 4 07:57:36 2026 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated detached HEAD.
-ok 16 - reset-author-date with --committer-date-is-author-date works when rewording
-
-expecting success of 3436.17 '--reset-author-date --committer-date-is-author-date works when forking merge': 
-	GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \
-		PATH="./test-bin:$PATH" git rebase -i --strategy=test \
-				--reset-author-date \
-				--committer-date-is-author-date side side &&
-	test_ctime_is_atime -1 &&
-	test_atime_is_ignored -1
- 
-Rebasing (1/1)
Merging HEAD with eda6f49c7ee63a956ad612b98a03b92c19face55
-Merging:
-139b464 update file
-eda6f49 commit3
-found 1 common ancestor:
-139b464 update file
-Merge made by the 'test' strategy.
-Successfully rebased and updated detached HEAD.
-ok 17 - --reset-author-date --committer-date-is-author-date works when forking merge
-
-expecting success of 3436.18 '--ignore-date is an alias for --reset-author-date': 
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --apply --ignore-date HEAD^ &&
-	git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" &&
-	git rebase -m --ignore-date HEAD^ &&
-	test_atime_is_ignored -2
-
-[detached HEAD 09e9cd3] edited
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-First, rewinding head to replay your work on top of it...
-Applying: commit1
-Applying: commit2
-Applying: commit3
-[detached HEAD 72b3436] empty
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-HEAD is up to date, rebase forced.
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 18 - --ignore-date is an alias for --reset-author-date
-
-expecting success of 3436.19 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
-
-ok 19 - $EDITOR and friends are unchanged
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3500-cherry.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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': 
-	echo First > A &&
-	git update-index --add A &&
-	test_tick &&
-	git commit -m "Add A." &&
-
-	git checkout -b my-topic-branch &&
-
-	echo Second > B &&
-	git update-index --add B &&
-	test_tick &&
-	git commit -m "Add B." &&
-
-	echo AnotherSecond > C &&
-	git update-index --add C &&
-	test_tick &&
-	git commit -m "Add C." &&
-
-	git checkout -f main &&
-	rm -f B C &&
-
-	echo Third >> A &&
-	git update-index A &&
-	test_tick &&
-	git commit -m "Modify A." &&
-
-	expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* + .*"
-
-[main (root-commit) 4655d1a] Add A.
- Author: A U Thor <bogus_email_address>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-Switched to a new branch 'my-topic-branch'
-[my-topic-branch 75dd694] Add B.
- Author: A U Thor <bogus_email_address>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-[my-topic-branch c8d60d2] Add C.
- Author: A U Thor <bogus_email_address>
- 1 file changed, 1 insertion(+)
- create mode 100644 C
-Switched to branch 'main'
-[main 90cb8ed] Modify A.
- Author: A U Thor <bogus_email_address>
- 1 file changed, 1 insertion(+)
-85
-ok 1 - prepare repository with topic branch, and check cherry finds the 2 patches from there
-
-expecting success of 3500.2 'check that cherry with limit returns only the top patch': 
-	expr "$(echo $(git cherry main my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
-
-42
-ok 2 - check that cherry with limit returns only the top patch
-
-expecting success of 3500.3 'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new': 
-	git cherry-pick my-topic-branch^0 &&
-	echo $(git cherry main my-topic-branch) &&
-	expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* - .*"
-
-[main 3a1a38a] Add C.
- Author: A U Thor <bogus_email_address>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 C
-+ 75dd694131e593dac8cf8ea0a377f1b73a80c1ad - c8d60d26f42936e7a055747f5412d41a6bce7d77
-85
-ok 3 - cherry-pick one of the 2 patches, and check cherry recognized one and only one as new
-
-expecting success of 3500.4 'cherry ignores whitespace': 
-	git switch --orphan=upstream-with-space &&
-	test_commit initial file &&
-	>expect &&
-	git switch --create=feature-without-space &&
-
-	# A spaceless file on the feature branch.  Expect a match upstream.
-	printf space >file &&
-	git add file &&
-	git commit -m"file without space" &&
-	git log --format="- %H" -1 >>expect &&
-
-	# A further change.  Should not match upstream.
-	test_commit change file &&
-	git log --format="+ %H" -1 >>expect &&
-
-	git switch upstream-with-space &&
-	# Same as the spaceless file, just with spaces and on upstream.
-	test_commit "file with space" file "s p a c e" file-with-space &&
-	git cherry upstream-with-space feature-without-space >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'upstream-with-space'
-[upstream-with-space (root-commit) 42825d6] initial
- Author: A U Thor <bogus_email_address>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'feature-without-space'
-[feature-without-space 21e64a6] file without space
- Author: A U Thor <bogus_email_address>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[feature-without-space efc65e3] change
- Author: A U Thor <bogus_email_address>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'upstream-with-space'
-[upstream-with-space 2ae2c61] file with space
- Author: A U Thor <bogus_email_address>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - cherry ignores whitespace
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3437-rebase-fixup-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3437-rebase-fixup-options/.git/
-expecting success of 3437.1 'setup': 
-	cat >message <<-EOF &&
-	amend! B
-	$EMPTY
-	new subject
-	$EMPTY
-	new
-	body
-	EOF
-
-	test_commit initial &&
-	test_commit A A &&
-	test_commit B B &&
-	get_author HEAD >expected-author &&
-	ORIG_AUTHOR_NAME="$GIT_AUTHOR_NAME" &&
-	ORIG_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" &&
-	GIT_AUTHOR_NAME="Amend Author" &&
-	GIT_AUTHOR_EMAIL="amend@example.com" &&
-	test_commit "$(cat message)" A A1 A1 &&
-	test_commit A2 A &&
-	test_commit A3 A &&
-	GIT_AUTHOR_NAME="$ORIG_AUTHOR_NAME" &&
-	GIT_AUTHOR_EMAIL="$ORIG_AUTHOR_EMAIL" &&
-	git checkout -b conflicts-branch A &&
-	test_commit conflicts A &&
-
-	set_fake_editor &&
-	git checkout -b branch B &&
-	echo B1 >B &&
-	test_tick &&
-	git commit --fixup=HEAD -a &&
-	git tag B1 &&
-	test_tick &&
-	FAKE_COMMIT_AMEND="edited 1" git commit --fixup=reword:B &&
-	test_tick &&
-	FAKE_COMMIT_AMEND="edited 2" git commit --fixup=reword:HEAD &&
-	echo B2 >B &&
-	test_tick &&
-	FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
-	git tag B2 &&
-	echo B3 >B &&
-	test_tick &&
-	FAKE_COMMIT_AMEND="edited 3" git commit -a --fixup=amend:HEAD^ &&
-	git tag B3 &&
-
-	GIT_AUTHOR_NAME="Rebase Author" &&
-	GIT_AUTHOR_EMAIL="rebase.author@example.com" &&
-	GIT_COMMITTER_NAME="Rebase Committer" &&
-	GIT_COMMITTER_EMAIL="rebase.committer@example.com"
-
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[master e45ed32] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-[master 0b010d6] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-[master 24547d2] amend! B
- Author: Amend Author <amend@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 34b9ec4] A2
- Author: Amend Author <amend@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master fc6fe24] A3
- Author: Amend Author <amend@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'conflicts-branch'
-[conflicts-branch 1ae01f5] conflicts
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch'
-[branch 5ea5a69] fixup! B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[branch 9954cb8] amend! B
- Author: A U Thor <author@example.com>
-[branch ddcbd4a] amend! amend! B
- Author: A U Thor <author@example.com>
-[branch 4d0230e] squash! amend! amend! B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[branch e0c8cb3] amend! amend! amend! B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 3437.2 'simple fixup -C works': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A2 &&
-	FAKE_LINES="1 fixup_-C 2" git rebase -i B &&
-	test_cmp_rev HEAD^ B &&
-	test_cmp_rev HEAD^{tree} A2^{tree} &&
-	test_commit_message HEAD -m "A2"
-
-HEAD is now at 34b9ec4 A2
-rebase -i script before editing:
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-
-rebase -i script after editing:
-pick 24547d2 amend! B
-fixup -C 34b9ec4 A2
-Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 2 - simple fixup -C works
-
-expecting success of 3437.3 'simple fixup -c works': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A2 &&
-	git log -1 --pretty=format:%B >expected-fixup-message &&
-	test_write_lines "" "Modified A2" >>expected-fixup-message &&
-	FAKE_LINES="1 fixup_-c 2" \
-		FAKE_COMMIT_AMEND="Modified A2" \
-		git rebase -i B &&
-	test_cmp_rev HEAD^ B &&
-	test_cmp_rev HEAD^{tree} A2^{tree} &&
-	test_commit_message HEAD expected-fixup-message
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  9e14115 A2
-
-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> 9e14115
-
-HEAD is now at 34b9ec4 A2
-rebase -i script before editing:
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-
-rebase -i script after editing:
-pick 24547d2 amend! B
-fixup -c 34b9ec4 A2
-Rebasing (2/2)
[detached HEAD e21ffe9] A2
- Author: Amend Author <amend@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 3 - simple fixup -c works
-
-expecting success of 3437.4 'fixup -C removes amend! from message': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A1 &&
-	git log -1 --pretty=format:%b >expected-message &&
-	FAKE_LINES="1 fixup_-C 2" git rebase -i A &&
-	test_cmp_rev HEAD^ A &&
-	test_cmp_rev HEAD^{tree} A1^{tree} &&
-	test_commit_message HEAD expected-message &&
-	get_author HEAD >actual-author &&
-	test_cmp expected-author actual-author
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  e21ffe9 A2
-
-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> e21ffe9
-
-HEAD is now at 24547d2 amend! B
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup -C 24547d2 amend! B
-Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 4 - fixup -C removes amend! from message
-
-expecting success of 3437.5 'fixup -C with conflicts gives correct message': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A1 &&
-	git log -1 --pretty=format:%b >expected-message &&
-	test_write_lines "" "edited" >>expected-message &&
-	test_must_fail env FAKE_LINES="1 fixup_-C 2" git rebase -i conflicts &&
-	git checkout --theirs -- A &&
-	git add A &&
-	FAKE_COMMIT_AMEND=edited git rebase --continue &&
-	test_cmp_rev HEAD^ conflicts &&
-	test_cmp_rev HEAD^{tree} A1^{tree} &&
-	test_commit_message HEAD expected-message &&
-	get_author HEAD >actual-author &&
-	test_cmp expected-author actual-author
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b96345a new subject
-
-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> b96345a
-
-HEAD is now at 24547d2 amend! B
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup -C 24547d2 amend! B
-Rebasing (1/2)
Rebasing (2/2)
Auto-merging A
-CONFLICT (content): Merge conflict in A
-error: could not apply 24547d2... amend! 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 advice.mergeConflict false"
-Could not apply 24547d2... amend! B
-[detached HEAD df4c993] new subject
- 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 B
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 5 - fixup -C with conflicts gives correct message
-
-expecting success of 3437.6 'skipping fixup -C after fixup gives correct message': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A3 &&
-	test_must_fail env FAKE_LINES="1 fixup 2 fixup_-C 4" git rebase -i A &&
-	git reset --hard &&
-	FAKE_COMMIT_AMEND=edited git rebase --continue &&
-	test_commit_message HEAD -m "B"
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  df4c993 new subject
-
-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> df4c993
-
-HEAD is now at fc6fe24 A3
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-pick fc6fe24 A3
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup 24547d2 amend! B
-fixup -C fc6fe24 A3
-Rebasing (2/3)
Rebasing (3/3)
Auto-merging A
-CONFLICT (content): Merge conflict in A
-error: could not apply fc6fe24... A3
-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 advice.mergeConflict false"
-Could not apply fc6fe24... A3
-HEAD is now at dfd7a63 # This is a combination of 2 commits. # This is the 1st commit message:
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 6 - skipping fixup -C after fixup gives correct message
-
-expecting success of 3437.7 'sequence of fixup, fixup -C & squash --signoff works': 
-	git checkout --detach B3 &&
-	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4 squash 5 fixup_-C 6" \
-		FAKE_COMMIT_AMEND=squashed \
-		FAKE_MESSAGE_COPY=actual-squash-message \
-		git -c commit.status=false rebase -ik --signoff A &&
-	git diff-tree --exit-code --patch HEAD B3 -- &&
-	test_cmp_rev HEAD^ A &&
-	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
-		actual-squash-message
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  e650b85 B
-
-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> e650b85
-
-HEAD is now at e0c8cb3 amend! amend! amend! B
-rebase -i script before editing:
-pick 0b010d6 B
-pick 5ea5a69 fixup! B
-pick 9954cb8 amend! B # empty
-pick ddcbd4a amend! amend! B # empty
-pick 4d0230e squash! amend! amend! B
-pick e0c8cb3 amend! amend! amend! B
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup 5ea5a69 fixup! B
-fixup -C 9954cb8 amend! B # empty
-fixup -C ddcbd4a amend! amend! B # empty
-squash 4d0230e squash! amend! amend! B
-fixup -C e0c8cb3 amend! amend! amend! B
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
[detached HEAD 93e1c61] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-Successfully rebased and updated detached HEAD.
-ok 7 - sequence of fixup, fixup -C & squash --signoff works
-
-expecting success of 3437.8 'first fixup -C commented out in sequence fixup fixup -C fixup -C': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach B2~ &&
-	git log -1 --pretty=format:%b >expected-message &&
-	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4" git rebase -i A &&
-	test_cmp_rev HEAD^ A &&
-	test_commit_message HEAD expected-message
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  93e1c61 B
-
-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> 93e1c61
-
-HEAD is now at ddcbd4a amend! amend! B
-rebase -i script before editing:
-pick 0b010d6 B
-pick 5ea5a69 fixup! B
-pick 9954cb8 amend! B # empty
-pick ddcbd4a amend! amend! B # empty
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup 5ea5a69 fixup! B
-fixup -C 9954cb8 amend! B # empty
-fixup -C ddcbd4a amend! amend! B # empty
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 8 - first fixup -C commented out in sequence fixup fixup -C fixup -C
-
-expecting success of 3437.9 'multiple fixup -c opens editor once': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A3 &&
-	git log -1 --pretty=format:%B >expected-message &&
-	test_write_lines "" "Modified-A3" >>expected-message &&
-	FAKE_COMMIT_AMEND="Modified-A3" \
-		FAKE_LINES="1 fixup_-C 2 fixup_-c 3 fixup_-c 4" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i A &&
-	test_cmp_rev HEAD^ A &&
-	get_author HEAD >actual-author &&
-	test_cmp expected-author actual-author &&
-	test_commit_message HEAD expected-message
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  8566dee B
-
-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> 8566dee
-
-HEAD is now at fc6fe24 A3
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-pick fc6fe24 A3
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup -C 24547d2 amend! B
-fixup -c 34b9ec4 A2
-fixup -c fc6fe24 A3
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 68e48e4] A3
- 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 B
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 9 - multiple fixup -c opens editor once
-
-expecting success of 3437.10 'sequence squash, fixup & fixup -c gives combined message': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A3 &&
-	FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
-		FAKE_MESSAGE_COPY=actual-combined-message \
-		git -c commit.status=false rebase -i A &&
-	test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
-		actual-combined-message &&
-	test_cmp_rev HEAD^ A
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  68e48e4 A3
-
-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> 68e48e4
-
-HEAD is now at fc6fe24 A3
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-pick fc6fe24 A3
-
-rebase -i script after editing:
-pick 0b010d6 B
-squash 24547d2 amend! B
-fixup 34b9ec4 A2
-fixup -c fc6fe24 A3
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 0a304e5] B
- 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 B
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 10 - sequence squash, fixup & fixup -c gives combined message
-
-expecting success of 3437.11 'fixup -C works upon --autosquash with amend!': 
-	git checkout --detach B3 &&
-	FAKE_COMMIT_AMEND=squashed \
-		FAKE_MESSAGE_COPY=actual-squash-message \
-		git -c commit.status=false rebase -ik --autosquash \
-						--signoff A &&
-	git diff-tree --exit-code --patch HEAD B3 -- &&
-	test_cmp_rev HEAD^ A &&
-	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
-		actual-squash-message
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  0a304e5 B
-
-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> 0a304e5
-
-HEAD is now at e0c8cb3 amend! amend! amend! B
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
[detached HEAD 93e1c61] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-Successfully rebased and updated detached HEAD.
-ok 11 - fixup -C works upon --autosquash with amend!
-
-expecting success of 3437.12 'fixup -[Cc]<commit> works': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	cat >todo <<-\EOF &&
-	pick A
-	fixup -CA1
-	pick B
-	fixup -cA2
-	EOF
-	(
-		set_replace_editor todo &&
-		FAKE_COMMIT_MESSAGE="edited and fixed up" \
-			git rebase -i initial initial
-	) &&
-	git log --pretty=format:%B initial.. >actual &&
-	cat >expect <<-EOF &&
-	edited and fixed up
-	$EMPTY
-	new subject
-	$EMPTY
-	new
-	body
-	EOF
-	test_cmp expect actual
-
-rebase -i script after editing:
-pick A
-fixup -CA1
-pick B
-fixup -cA2
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 755eebe] edited and fixed up
- 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 B
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 12 - fixup -[Cc]<commit> works
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3311-notes-merge-fanout.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3311-notes-merge-fanout/.git/
 expecting success of 3311.1 'setup a few initial commits with notes (notes ref: x)': 
@@ -159385,541 +154965,1069 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3502-cherry-pick-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3502-cherry-pick-merge/.git/
-expecting success of 3502.1 'setup': 
-
-	>A &&
-	>B &&
-	git add A B &&
-	git commit -m "Initial" &&
-	git tag initial &&
-	git branch side &&
-	echo new line >A &&
-	git commit -m "add line to A" A &&
-	git tag a &&
-	git checkout side &&
-	echo new line >B &&
-	git commit -m "add line to B" B &&
-	git tag b &&
-	git checkout main &&
-	git merge side &&
-	git tag c
-
+*** t3438-rebase-broken-files.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-[main (root-commit) 5c8827d] Initial
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 A
- create mode 100644 B
-[main 6e41539] add line to A
+[master (root-commit) 215235d] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'side'
-[side 4fb21f2] add line to B
+ create mode 100644 file
+Switched to a new branch 'branch1'
+[branch1 92a1cb8] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- B | 1 +
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 3502.2 'cherry-pick -m complains of bogus numbers': 
-	# expect 129 here to distinguish between cases where
-	# there was nothing to cherry-pick
-	test_expect_code 129 git cherry-pick -m &&
-	test_expect_code 129 git cherry-pick -m foo b &&
-	test_expect_code 129 git cherry-pick -m -1 b &&
-	test_expect_code 129 git cherry-pick -m 0 b
+ 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
 
-error: switch `m' requires a value
-error: option `mainline' expects a number greater than zero
-error: option `mainline' expects a number greater than zero
-error: option `mainline' expects a number greater than zero
-ok 2 - cherry-pick -m complains of bogus numbers
+expecting success of 3438.2 'detect missing GIT_AUTHOR_NAME': 
+		create_conflict &&
 
-expecting success of 3502.3 'cherry-pick explicit first parent of a non-merge': 
+		grep -v $item .git/rebase-merge/author-script >tmp &&
+		mv tmp .git/rebase-merge/author-script &&
 
-	git reset --hard &&
-	git checkout a^0 &&
-	git cherry-pick -m 1 b &&
-	git diff --exit-code c --
+		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 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 
 
-HEAD is now at c81ef52 Merge branch 'side'
-Note: switching to 'a^0'.
+If they are meant to go into a new commit, run:
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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:
+In both cases, once you're done, continue with:
 
-  git switch -c <new-branch-name>
+  git rebase --continue
 
-Or undo this operation with:
+error: could not commit staged changes.
+ok 2 - detect missing GIT_AUTHOR_NAME
 
-  git switch -
+expecting success of 3438.3 'detect missing GIT_AUTHOR_EMAIL': 
+		create_conflict &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		grep -v $item .git/rebase-merge/author-script >tmp &&
+		mv tmp .git/rebase-merge/author-script &&
 
-HEAD is now at 6e41539 add line to A
-[detached HEAD 99ce4f9] add line to B
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 3 - cherry-pick explicit first parent of a non-merge
+		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 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:
 
-expecting success of 3502.4 'cherry pick a merge without -m should fail': 
+  git commit --amend 
 
-	git reset --hard &&
-	git checkout a^0 &&
-	test_must_fail git cherry-pick c &&
-	git diff --exit-code a --
+If they are meant to go into a new commit, run:
 
+  git commit 
 
-HEAD is now at 99ce4f9 add line to B
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+In both cases, once you're done, continue with:
 
-  99ce4f9 add line to B
+  git rebase --continue
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+error: could not commit staged changes.
+ok 3 - detect missing GIT_AUTHOR_EMAIL
 
- git branch <new-branch-name> 99ce4f9
+expecting success of 3438.4 'detect missing GIT_AUTHOR_DATE': 
+		create_conflict &&
 
-HEAD is now at 6e41539 add line to A
-error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 is a merge but no -m option was given.
-fatal: cherry-pick failed
-ok 4 - cherry pick a merge without -m should fail
+		grep -v $item .git/rebase-merge/author-script >tmp &&
+		mv tmp .git/rebase-merge/author-script &&
 
-expecting success of 3502.5 'cherry pick a merge (1)': 
+		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 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 reset --hard &&
-	git checkout a^0 &&
-	git cherry-pick -m 1 c &&
-	git diff --exit-code c
+  git commit --amend 
 
+If they are meant to go into a new commit, run:
 
-HEAD is now at 6e41539 add line to A
-HEAD is now at 6e41539 add line to A
-[detached HEAD 9d31cba] Merge branch 'side'
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 5 - cherry pick a merge (1)
+  git commit 
 
-expecting success of 3502.6 'cherry pick a merge (2)': 
+In both cases, once you're done, continue with:
 
-	git reset --hard &&
-	git checkout b^0 &&
-	git cherry-pick -m 2 c &&
-	git diff --exit-code c
+  git rebase --continue
 
+error: could not commit staged changes.
+ok 4 - detect missing GIT_AUTHOR_DATE
 
-HEAD is now at 9d31cba Merge branch 'side'
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3438.5 'detect duplicate GIT_AUTHOR_NAME': 
+		create_conflict &&
 
-  9d31cba Merge branch 'side'
+		grep -i $item .git/rebase-merge/author-script >tmp &&
+		cat tmp >>.git/rebase-merge/author-script &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+		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 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 branch <new-branch-name> 9d31cba
+  git commit --amend 
 
-HEAD is now at 4fb21f2 add line to B
-[detached HEAD 9554515] Merge branch 'side'
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 6 - cherry pick a merge (2)
+If they are meant to go into a new commit, run:
 
-expecting success of 3502.7 'cherry pick a merge relative to nonexistent parent should fail': 
+  git commit 
 
-	git reset --hard &&
-	git checkout b^0 &&
-	test_must_fail git cherry-pick -m 3 c
+In both cases, once you're done, continue with:
 
+  git rebase --continue
 
-HEAD is now at 9554515 Merge branch 'side'
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+error: could not commit staged changes.
+ok 5 - detect duplicate GIT_AUTHOR_NAME
 
-  9554515 Merge branch 'side'
+expecting success of 3438.6 'detect duplicate GIT_AUTHOR_EMAIL': 
+		create_conflict &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+		grep -i $item .git/rebase-merge/author-script >tmp &&
+		cat tmp >>.git/rebase-merge/author-script &&
 
- git branch <new-branch-name> 9554515
+		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 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:
 
-HEAD is now at 4fb21f2 add line to B
-error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 does not have parent 3
-fatal: cherry-pick failed
-ok 7 - cherry pick a merge relative to nonexistent parent should fail
+  git commit --amend 
 
-expecting success of 3502.8 'revert explicit first parent of a non-merge': 
+If they are meant to go into a new commit, run:
 
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 1 b &&
-	git diff --exit-code a --
+  git commit 
 
+In both cases, once you're done, continue with:
 
-HEAD is now at 4fb21f2 add line to B
-Previous HEAD position was 4fb21f2 add line to B
-HEAD is now at c81ef52 Merge branch 'side'
-[detached HEAD 1b3e5cc] Revert "add line to B"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-ok 8 - revert explicit first parent of a non-merge
+  git rebase --continue
 
-expecting success of 3502.9 'revert a merge without -m should fail': 
+error: could not commit staged changes.
+ok 6 - detect duplicate GIT_AUTHOR_EMAIL
 
-	git reset --hard &&
-	git checkout c^0 &&
-	test_must_fail git revert c &&
-	git diff --exit-code c
+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 &&
 
-HEAD is now at 1b3e5cc Revert "add line to B"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+		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 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:
 
-  1b3e5cc Revert "add line to B"
+  git commit --amend 
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+If they are meant to go into a new commit, run:
 
- git branch <new-branch-name> 1b3e5cc
+  git commit 
 
-HEAD is now at c81ef52 Merge branch 'side'
-error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 is a merge but no -m option was given.
-fatal: revert failed
-ok 9 - revert a merge without -m should fail
+In both cases, once you're done, continue with:
 
-expecting success of 3502.10 'revert a merge (1)': 
+  git rebase --continue
 
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 1 c &&
-	git diff --exit-code a --
+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 &&
 
-HEAD is now at c81ef52 Merge branch 'side'
-HEAD is now at c81ef52 Merge branch 'side'
-[detached HEAD ab594ec] Revert "Merge branch 'side'"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-ok 10 - revert a merge (1)
+	echo "GIT_AUTHOR_BOGUS=${SQ}whatever${SQ}" \
+		>>.git/rebase-merge/author-script &&
 
-expecting success of 3502.11 'revert a merge (2)': 
+	check_resolve_fails
 
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 2 c &&
-	git diff --exit-code b --
+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 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 
 
-HEAD is now at ab594ec Revert "Merge branch 'side'"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+If they are meant to go into a new commit, run:
 
-  ab594ec Revert "Merge branch 'side'"
+  git commit 
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+In both cases, once you're done, continue with:
 
- git branch <new-branch-name> ab594ec
+  git rebase --continue
 
-HEAD is now at c81ef52 Merge branch 'side'
-[detached HEAD 3f41b61] Revert "Merge branch 'side'"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-ok 11 - revert a merge (2)
+error: could not commit staged changes.
+ok 8 - unknown key in author-script
 
-expecting success of 3502.12 'revert a merge relative to nonexistent parent should fail': 
+checking prerequisite: SANITY
 
-	git reset --hard &&
-	git checkout c^0 &&
-	test_must_fail git revert -m 3 c &&
-	git diff --exit-code c
+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"
 
-HEAD is now at 3f41b61 Revert "Merge branch 'side'"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-  3f41b61 Revert "Merge branch 'side'"
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+)
+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 branch <new-branch-name> 3f41b61
+	git checkout -b side HEAD^ &&
+	test_commit unrelated &&
+	test_must_fail git rebase --apply --onto tmp HEAD^
 
-HEAD is now at c81ef52 Merge branch 'side'
-error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 does not have parent 3
-fatal: revert failed
-ok 12 - revert a merge relative to nonexistent parent should fail
+Switched to a new branch '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 12 test(s)
-1..12
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3430-rebase-merges.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3430-rebase-merges/.git/
-expecting success of 3430.1 'setup': 
-	write_script replace-editor.sh <<-\EOF &&
-	mv "$1" "$(git rev-parse --git-path ORIGINAL-TODO)"
-	cp script-from-scratch "$1"
-	EOF
+*** t3436-rebase-more-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3436-rebase-more-options/.git/
+expecting success of 3436.1 'setup': 
+	git checkout -b topic &&
+	test_write_lines "line 1" "	line 2" "line 3" >file &&
+	git add file &&
+	git commit -m "add file" &&
 
-	test_commit A &&
-	git checkout -b first &&
-	test_commit B &&
-	b=$(git rev-parse --short HEAD) &&
-	git checkout main &&
-	test_commit C &&
-	c=$(git rev-parse --short HEAD) &&
-	test_commit D &&
-	d=$(git rev-parse --short HEAD) &&
-	git merge --no-commit B &&
-	test_tick &&
-	git commit -m E &&
-	git tag -m E E &&
-	e=$(git rev-parse --short HEAD) &&
-	git checkout -b second C &&
-	test_commit F &&
-	f=$(git rev-parse --short HEAD) &&
-	test_commit G &&
-	g=$(git rev-parse --short HEAD) &&
-	git checkout main &&
-	git merge --no-commit G &&
-	test_tick &&
-	git commit -m H &&
-	h=$(git rev-parse --short HEAD) &&
-	git tag -m H H &&
-	git checkout A &&
-	test_commit conflicting-G G.t
+	test_write_lines "line 1" "new line 2" "line 3" >file &&
+	git commit -am "update file" &&
+	git tag side &&
+	test_commit commit1 foo foo1 &&
+	test_commit commit2 foo foo2 &&
+	test_commit commit3 foo foo3 &&
 
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'first'
-[first d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to branch 'main'
-[main 5dee784] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[main 12bd07b] D
+	git checkout --orphan main &&
+	rm foo &&
+	test_write_lines "line 1" "        line 2" "line 3" >file &&
+	git commit -am "add file" &&
+	git tag main &&
+
+	mkdir test-bin &&
+	write_script test-bin/git-merge-test <<-\EOF
+	exec git merge-recursive "$@"
+	EOF
+
+Switched to a new branch 'topic'
+[topic (root-commit) c24e627] add file
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Automatic merge went well; stopped before committing as requested
-[main 2051b56] E
+ 1 file changed, 3 insertions(+)
+ create mode 100644 file
+[topic 139b464] update file
  Author: A U Thor <author@example.com>
-Switched to a new branch 'second'
-[second ca2c861] F
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[topic 7c57c40] commit1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[second 088b00a] G
+ create mode 100644 foo
+[topic bd08fd4] commit2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'main'
-Automatic merge went well; stopped before committing as requested
-[main 233d48a] H
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[topic eda6f49] commit3
  Author: A U Thor <author@example.com>
-Note: switching to 'A'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-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 0ddfaf1 A
-[detached HEAD 82776a5] conflicting-G
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'main'
+[main (root-commit) 3ada4af] add file
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
+ 1 file changed, 3 insertions(+)
+ create mode 100644 file
 ok 1 - setup
 
-expecting success of 3430.2 'create completely different structure': 
-	cat >script-from-scratch <<-\EOF &&
-	label onto
-
-	# onebranch
-	pick G
-	pick D
-	label onebranch
+expecting success of 3436.2 '--ignore-whitespace works with apply backend': 
+	test_must_fail git rebase --apply main side &&
+	git rebase --abort &&
+	git rebase --apply --ignore-whitespace main side &&
+	git diff --exit-code side
 
-	# second
-	reset onto
-	pick B
-	label second
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+First, rewinding head to replay your work on top of it...
+Applying: update file
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+3ada4af add file
+virtual update file
+found 1 common ancestor:
+virtual cea075e2ce716201e60e4bbadc9a40706c56c362
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 update file
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+First, rewinding head to replay your work on top of it...
+Applying: update file
+ok 2 - --ignore-whitespace works with apply backend
 
-	reset onto
-	merge -C H second
-	merge onebranch # Merge the topic branch 'onebranch'
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	git rebase -i -r A main &&
-	test_cmp_graph <<-\EOF
-	*   Merge the topic branch 'onebranch'
-	|\
-	| * D
-	| * G
-	* |   H
-	|\ \
-	| |/
-	|/|
-	| * B
-	|/
-	* A
-	EOF
+expecting success of 3436.3 '--ignore-whitespace works with merge backend': 
+	test_must_fail git rebase --merge main side &&
+	git rebase --abort &&
+	git rebase --merge --ignore-whitespace main side &&
+	git diff --exit-code side
 
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
[detached HEAD c2c3fe3] Merge the topic branch 'onebranch'
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
-Successfully rebased and updated refs/heads/main.
-ok 2 - create completely different structure
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 139b464... update file
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 139b464... update file
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 3 - --ignore-whitespace works with merge backend
 
-expecting success of 3430.3 'generate correct todo list': 
-	cat >expect <<-EOF &&
-	label onto
+expecting success of 3436.4 '--ignore-whitespace is remembered when continuing': 
+	(
+		set_fake_editor &&
+		FAKE_LINES="break 1" git rebase -i --ignore-whitespace \
+			main side &&
+		git rebase --continue
+	) &&
+	git diff --exit-code side
 
-	reset onto
-	pick $b B
-	label E
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+rebase -i script before editing:
+pick 139b464 update file
 
-	reset onto
-	pick $c C
-	label branch-point
-	pick $f F
-	pick $g G
-	label H
+rebase -i script after editing:
+break
+pick 139b464 update file
+Rebasing (1/2)
Stopped at 3ada4af (add file)
+Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 4 - --ignore-whitespace is remembered when continuing
 
-	reset branch-point # C
-	pick $d D
-	merge -C $e E # E
-	merge -C $h H # H
+expecting success of 3436.5 '--committer-date-is-author-date works with apply backend': 
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	git rebase --apply --committer-date-is-author-date HEAD^ &&
+	test_ctime_is_atime -1
 
-	EOF
+[detached HEAD 6184e8b] update file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is up to date, rebase forced.
+First, rewinding head to replay your work on top of it...
+Applying: update file
+ok 5 - --committer-date-is-author-date works with apply backend
 
-	grep -v "^#" <.git/ORIGINAL-TODO >output &&
-	test_cmp expect output
+expecting success of 3436.6 '--committer-date-is-author-date works with merge backend': 
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	git rebase -m --committer-date-is-author-date HEAD^ &&
+	test_ctime_is_atime -1
 
-ok 3 - generate correct todo list
+[detached HEAD 6184e8b] update file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is up to date, rebase forced.
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 6 - --committer-date-is-author-date works with merge backend
 
-expecting success of 3430.4 '`reset` refuses to overwrite untracked files': 
-	git checkout B &&
-	test_commit dont-overwrite-untracked &&
-	cat >script-from-scratch <<-EOF &&
-	exec >dont-overwrite-untracked.t
-	pick $(git rev-parse B) B
-	reset refs/tags/dont-overwrite-untracked
-	pick $(git rev-parse C) C
-	exec cat .git/rebase-merge/done >actual
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_must_fail git rebase -ir A &&
-	test_cmp_rev HEAD B &&
-	head -n3 script-from-scratch >expect &&
-	test_cmp expect .git/rebase-merge/done &&
-	rm dont-overwrite-untracked.t &&
-	git rebase --continue &&
-	tail -n3 script-from-scratch >>expect &&
-	test_cmp expect actual
+expecting success of 3436.7 '--committer-date-is-author-date works when rewording': 
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE=edited \
+			FAKE_LINES="reword 1" \
+			git rebase -i --committer-date-is-author-date HEAD^
+	) &&
+	test_write_lines edited "" >expect &&
+	git log --format="%B" -1 >actual &&
+	test_cmp expect actual &&
+	test_ctime_is_atime -1
 
-Note: switching to 'B'.
+[detached HEAD 6184e8b] update file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+rebase -i script before editing:
+pick 6184e8b update file
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+rebase -i script after editing:
+reword 6184e8b update file
+Rebasing (1/1)
[detached HEAD 5c38296] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 1 03:20:34 1970 +0300
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+ok 7 - --committer-date-is-author-date works when rewording
 
-If you want to 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 3436.8 '--committer-date-is-author-date works with rebase -r': 
+	git checkout side &&
+	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
+	git rebase -r --root --committer-date-is-author-date &&
+	test_ctime_is_atime
 
-  git switch -c <new-branch-name>
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Or undo this operation with:
+  5c38296 edited
 
-  git switch -
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ git branch <new-branch-name> 5c38296
 
-HEAD is now at d9df450 B
-[detached HEAD 8acd0a8] dont-overwrite-untracked
- Author: A U Thor <author@example.com>
+HEAD is now at 139b464 update file
+Merge made by the 'ort' strategy.
+ foo | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 dont-overwrite-untracked.t
-Rebasing (1/5)
Executing: >dont-overwrite-untracked.t
-Rebasing (2/5)
Rebasing (3/5)
error: The following untracked working tree files would be overwritten by reset:
-	dont-overwrite-untracked.t
-Please move or remove them before you reset.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     reset refs/tags/dont-overwrite-untracked
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Executing: cat .git/rebase-merge/done >actual
-Successfully rebased and updated detached HEAD.
-ok 4 - `reset` refuses to overwrite untracked files
+ create mode 100644 foo
+Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Successfully rebased and updated detached HEAD.
+ok 8 - --committer-date-is-author-date works with rebase -r
 
-expecting success of 3430.5 '`reset` rejects trees': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset A^{tree} >" \
-		git rebase -i B C >out 2>err &&
-	grep "object .* is a tree" err &&
-	test_must_be_empty out
+expecting success of 3436.9 '--committer-date-is-author-date works when forking merge': 
+	git checkout side &&
+	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
+	PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \
+					--committer-date-is-author-date &&
+	test_ctime_is_atime
 
-Rebasing (1/1)
error: object da5497437fd67ca928333aab79c4b4b55036ea66 is a tree, not a commit
-ok 5 - `reset` rejects trees
+Warning: you are leaving 6 commits behind, not connected to
+any of your branches:
 
-expecting success of 3430.6 '`reset` only looks for labels under refs/rewritten/': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git branch refs/rewritten/my-label A &&
-	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset my-label >" \
-		git rebase -i B C >out 2>err &&
-	grep "could not resolve ${SQ}my-label${SQ}" err &&
-	test_must_be_empty out
+  aa07736 Merge tag 'commit3' into HEAD
+  54193eb commit3
+  a2d9c2e commit2
+  8251e18 commit1
+ ... and 2 more.
 
-Rebasing (1/1)
error: could not resolve 'my-label'
-ok 6 - `reset` only looks for labels under refs/rewritten/
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3430.7 'failed `merge -C` writes patch (may be rescheduled, too)': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b conflicting-merge A &&
+ git branch <new-branch-name> aa07736
 
-	: fail because of conflicting untracked file &&
+HEAD is now at 139b464 update file
+Merge made by the 'ort' strategy.
+ foo | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Merging 2a85097a58eecaad11df374857a87fbc0e47e389 with c24e62700f83d7b12297f45d1ce1e9689ebb2b1f
+Merging:
+2a85097 c24e627 add file
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+Rebasing (4/11)
Merging eaa553d7eb7c0d13b95960e348a77332601bbc3e with 139b46443e355afd5f438ac2849d41f3a53b8c77
+Merging:
+eaa553d add file
+139b464 update file
+found 1 common ancestor:
+c24e627 add file
+Rebasing (5/11)
Rebasing (6/11)
Merging 34dfd6c233143884ddd9180be88112657b590d86 with 7c57c40ccd2483ccea76831595c0e232d40560c7
+Merging:
+34dfd6c update file
+7c57c40 commit1
+found 1 common ancestor:
+139b464 update file
+Rebasing (7/11)
Merging 8251e18d67ff84cb7aa93676b4cb93be15ef6810 with bd08fd48eeadc218177587a9f467f39ac4b51d49
+Merging:
+8251e18 commit1
+bd08fd4 commit2
+found 1 common ancestor:
+7c57c40 commit1
+Rebasing (8/11)
Merging a2d9c2ebb6808fff81a49a500b865fbf8f4fcbf5 with eda6f49c7ee63a956ad612b98a03b92c19face55
+Merging:
+a2d9c2e commit2
+eda6f49 commit3
+found 1 common ancestor:
+bd08fd4 commit2
+Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Merging HEAD with 54193ebc0e463528ab8c3f723f89752960c98304
+Merging:
+34dfd6c update file
+54193eb commit3
+found 1 common ancestor:
+34dfd6c update file
+Merge made by the 'test' strategy.
+Successfully rebased and updated detached HEAD.
+ok 9 - --committer-date-is-author-date works when forking merge
+
+expecting success of 3436.10 '--committer-date-is-author-date works when committing conflict resolution': 
+	git checkout commit2 &&
+	GIT_AUTHOR_DATE="@1980 +0000" git commit --amend --only --reset-author &&
+	test_must_fail git rebase -m --committer-date-is-author-date \
+		--onto HEAD^^ HEAD^ &&
+	echo resolved > foo &&
+	git add foo &&
+	git rebase --continue &&
+	test_ctime_is_atime -1
+
+Warning: you are leaving 6 commits behind, not connected to
+any of your branches:
+
+  aa07736 Merge tag 'commit3' into HEAD
+  54193eb commit3
+  a2d9c2e commit2
+  8251e18 commit1
+ ... and 2 more.
+
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> aa07736
+
+HEAD is now at bd08fd4 commit2
+[detached HEAD 832d950] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in 832d950 (commit2).  Version 832d950 (commit2) of foo left in tree.
+error: could not apply 832d950... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 832d950... commit2
+[detached HEAD 3bf7cf9] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Successfully rebased and updated detached HEAD.
+ok 10 - --committer-date-is-author-date works when committing conflict resolution
+
+expecting success of 3436.11 '--reset-author-date works with apply backend': 
+	git commit --amend --date="$GIT_AUTHOR_DATE" &&
+	git rebase --apply --reset-author-date HEAD^ &&
+	test_atime_is_ignored -1
+
+[detached HEAD 70e7180] commit2
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+HEAD is up to date, rebase forced.
+First, rewinding head to replay your work on top of it...
+Applying: commit2
+ok 11 - --reset-author-date works with apply backend
+
+expecting success of 3436.12 '--reset-author-date works with merge backend': 
+	git commit --amend --date="$GIT_AUTHOR_DATE" &&
+	git rebase --reset-author-date -m HEAD^ &&
+	test_atime_is_ignored -1
+
+[detached HEAD 70e7180] commit2
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+HEAD is up to date, rebase forced.
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 12 - --reset-author-date works with merge backend
+
+expecting success of 3436.13 '--reset-author-date works after conflict resolution': 
+	test_must_fail git rebase --reset-author-date -m \
+		--onto commit2^^ commit2^ commit2 &&
+	echo resolved >foo &&
+	git add foo &&
+	git rebase --continue &&
+	test_atime_is_ignored -1
+
+Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
+error: could not apply bd08fd4... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply bd08fd4... commit2
+[detached HEAD 9cb79cf] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Successfully rebased and updated detached HEAD.
+ok 13 - --reset-author-date works after conflict resolution
+
+expecting success of 3436.14 '--reset-author-date works with rebase -r': 
+	git checkout side &&
+	git merge --no-ff commit3 &&
+	git rebase -r --root --reset-author-date &&
+	test_atime_is_ignored
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  9cb79cf 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> 9cb79cf
+
+HEAD is now at 139b464 update file
+Merge made by the 'ort' strategy.
+ foo | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Successfully rebased and updated detached HEAD.
+ok 14 - --reset-author-date works with rebase -r
+
+expecting success of 3436.15 '--reset-author-date with --committer-date-is-author-date works': 
+	test_must_fail git rebase -m --committer-date-is-author-date \
+		--reset-author-date --onto commit2^^ commit2^ commit3 &&
+	git checkout --theirs foo &&
+	git add foo &&
+	git rebase --continue &&
+	test_ctime_is_atime -2 &&
+	test_atime_is_ignored -2
+
+Rebasing (1/2)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
+error: could not apply bd08fd4... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply bd08fd4... commit2
+Updated 1 path from the index
+[detached HEAD 841515f] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 15 - --reset-author-date with --committer-date-is-author-date works
+
+expecting success of 3436.16 'reset-author-date with --committer-date-is-author-date works when rewording': 
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE=edited \
+			FAKE_LINES="reword 1" \
+			git rebase -i --committer-date-is-author-date \
+				--reset-author-date HEAD^
+	) &&
+	test_write_lines edited "" >expect &&
+	git log --format="%B" -1 >actual &&
+	test_cmp expect actual &&
+	test_atime_is_ignored -1
+
+[detached HEAD 3383d5e] commit3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+rebase -i script before editing:
+pick 3383d5e commit3
+
+rebase -i script after editing:
+reword 3383d5e commit3
+Rebasing (1/1)
[detached HEAD 1de278d] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 30 02:10:25 2025 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+ok 16 - reset-author-date with --committer-date-is-author-date works when rewording
+
+expecting success of 3436.17 '--reset-author-date --committer-date-is-author-date works when forking merge': 
+	GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \
+		PATH="./test-bin:$PATH" git rebase -i --strategy=test \
+				--reset-author-date \
+				--committer-date-is-author-date side side &&
+	test_ctime_is_atime -1 &&
+	test_atime_is_ignored -1
+ 
+Rebasing (1/1)
Merging HEAD with eda6f49c7ee63a956ad612b98a03b92c19face55
+Merging:
+139b464 update file
+eda6f49 commit3
+found 1 common ancestor:
+139b464 update file
+Merge made by the 'test' strategy.
+Successfully rebased and updated detached HEAD.
+ok 17 - --reset-author-date --committer-date-is-author-date works when forking merge
+
+expecting success of 3436.18 '--ignore-date is an alias for --reset-author-date': 
+	git commit --amend --date="$GIT_AUTHOR_DATE" &&
+	git rebase --apply --ignore-date HEAD^ &&
+	git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" &&
+	git rebase -m --ignore-date HEAD^ &&
+	test_atime_is_ignored -2
+
+[detached HEAD 09e9cd3] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+First, rewinding head to replay your work on top of it...
+Applying: commit1
+Applying: commit2
+Applying: commit3
+[detached HEAD 089a684] empty
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+HEAD is up to date, rebase forced.
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 18 - --ignore-date is an alias for --reset-author-date
+
+expecting success of 3436.19 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
+
+ok 19 - $EDITOR and friends are unchanged
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3430-rebase-merges.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3430-rebase-merges/.git/
+expecting success of 3430.1 'setup': 
+	write_script replace-editor.sh <<-\EOF &&
+	mv "$1" "$(git rev-parse --git-path ORIGINAL-TODO)"
+	cp script-from-scratch "$1"
+	EOF
+
+	test_commit A &&
+	git checkout -b first &&
+	test_commit B &&
+	b=$(git rev-parse --short HEAD) &&
+	git checkout main &&
+	test_commit C &&
+	c=$(git rev-parse --short HEAD) &&
+	test_commit D &&
+	d=$(git rev-parse --short HEAD) &&
+	git merge --no-commit B &&
+	test_tick &&
+	git commit -m E &&
+	git tag -m E E &&
+	e=$(git rev-parse --short HEAD) &&
+	git checkout -b second C &&
+	test_commit F &&
+	f=$(git rev-parse --short HEAD) &&
+	test_commit G &&
+	g=$(git rev-parse --short HEAD) &&
+	git checkout main &&
+	git merge --no-commit G &&
+	test_tick &&
+	git commit -m H &&
+	h=$(git rev-parse --short HEAD) &&
+	git tag -m H H &&
+	git checkout A &&
+	test_commit conflicting-G G.t
+
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Switched to a new branch 'first'
+[first d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to branch 'main'
+[main 5dee784] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[main 12bd07b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Automatic merge went well; stopped before committing as requested
+[main 2051b56] E
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'second'
+[second ca2c861] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[second 088b00a] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'main'
+Automatic merge went well; stopped before committing as requested
+[main 233d48a] H
+ Author: A U Thor <author@example.com>
+Note: switching to 'A'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+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 0ddfaf1 A
+[detached HEAD 82776a5] conflicting-G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+ok 1 - setup
+
+expecting success of 3430.2 'create completely different structure': 
+	cat >script-from-scratch <<-\EOF &&
+	label onto
+
+	# onebranch
+	pick G
+	pick D
+	label onebranch
+
+	# second
+	reset onto
+	pick B
+	label second
+
+	reset onto
+	merge -C H second
+	merge onebranch # Merge the topic branch 'onebranch'
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	git rebase -i -r A main &&
+	test_cmp_graph <<-\EOF
+	*   Merge the topic branch 'onebranch'
+	|\
+	| * D
+	| * G
+	* |   H
+	|\ \
+	| |/
+	|/|
+	| * B
+	|/
+	* A
+	EOF
+
+Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
[detached HEAD c2c3fe3] Merge the topic branch 'onebranch'
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+Successfully rebased and updated refs/heads/main.
+ok 2 - create completely different structure
+
+expecting success of 3430.3 'generate correct todo list': 
+	cat >expect <<-EOF &&
+	label onto
+
+	reset onto
+	pick $b B
+	label E
+
+	reset onto
+	pick $c C
+	label branch-point
+	pick $f F
+	pick $g G
+	label H
+
+	reset branch-point # C
+	pick $d D
+	merge -C $e E # E
+	merge -C $h H # H
+
+	EOF
+
+	grep -v "^#" <.git/ORIGINAL-TODO >output &&
+	test_cmp expect output
+
+ok 3 - generate correct todo list
+
+expecting success of 3430.4 '`reset` refuses to overwrite untracked files': 
+	git checkout B &&
+	test_commit dont-overwrite-untracked &&
+	cat >script-from-scratch <<-EOF &&
+	exec >dont-overwrite-untracked.t
+	pick $(git rev-parse B) B
+	reset refs/tags/dont-overwrite-untracked
+	pick $(git rev-parse C) C
+	exec cat .git/rebase-merge/done >actual
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_must_fail git rebase -ir A &&
+	test_cmp_rev HEAD B &&
+	head -n3 script-from-scratch >expect &&
+	test_cmp expect .git/rebase-merge/done &&
+	rm dont-overwrite-untracked.t &&
+	git rebase --continue &&
+	tail -n3 script-from-scratch >>expect &&
+	test_cmp expect actual
+
+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 d9df450 B
+[detached HEAD 8acd0a8] dont-overwrite-untracked
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dont-overwrite-untracked.t
+Rebasing (1/5)
Executing: >dont-overwrite-untracked.t
+Rebasing (2/5)
Rebasing (3/5)
error: The following untracked working tree files would be overwritten by reset:
+	dont-overwrite-untracked.t
+Please move or remove them before you reset.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     reset refs/tags/dont-overwrite-untracked
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Executing: cat .git/rebase-merge/done >actual
+Successfully rebased and updated detached HEAD.
+ok 4 - `reset` refuses to overwrite untracked files
+
+expecting success of 3430.5 '`reset` rejects trees': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset A^{tree} >" \
+		git rebase -i B C >out 2>err &&
+	grep "object .* is a tree" err &&
+	test_must_be_empty out
+
+Rebasing (1/1)
error: object da5497437fd67ca928333aab79c4b4b55036ea66 is a tree, not a commit
+ok 5 - `reset` rejects trees
+
+expecting success of 3430.6 '`reset` only looks for labels under refs/rewritten/': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git branch refs/rewritten/my-label A &&
+	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset my-label >" \
+		git rebase -i B C >out 2>err &&
+	grep "could not resolve ${SQ}my-label${SQ}" err &&
+	test_must_be_empty out
+
+Rebasing (1/1)
error: could not resolve 'my-label'
+ok 6 - `reset` only looks for labels under refs/rewritten/
+
+expecting success of 3430.7 'failed `merge -C` writes patch (may be rescheduled, too)': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -b conflicting-merge A &&
+
+	: fail because of conflicting untracked file &&
 	>G.t &&
 	echo "merge -C H G" >script-from-scratch &&
 	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
@@ -160739,6 +156847,922 @@
 1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3500-cherry.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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': 
+	echo First > A &&
+	git update-index --add A &&
+	test_tick &&
+	git commit -m "Add A." &&
+
+	git checkout -b my-topic-branch &&
+
+	echo Second > B &&
+	git update-index --add B &&
+	test_tick &&
+	git commit -m "Add B." &&
+
+	echo AnotherSecond > C &&
+	git update-index --add C &&
+	test_tick &&
+	git commit -m "Add C." &&
+
+	git checkout -f main &&
+	rm -f B C &&
+
+	echo Third >> A &&
+	git update-index A &&
+	test_tick &&
+	git commit -m "Modify A." &&
+
+	expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* + .*"
+
+[main (root-commit) 4655d1a] Add A.
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+Switched to a new branch 'my-topic-branch'
+[my-topic-branch 75dd694] Add B.
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+[my-topic-branch c8d60d2] Add C.
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C
+Switched to branch 'main'
+[main 90cb8ed] Modify A.
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+)
+85
+ok 1 - prepare repository with topic branch, and check cherry finds the 2 patches from there
+
+expecting success of 3500.2 'check that cherry with limit returns only the top patch': 
+	expr "$(echo $(git cherry main my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
+
+42
+ok 2 - check that cherry with limit returns only the top patch
+
+expecting success of 3500.3 'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new': 
+	git cherry-pick my-topic-branch^0 &&
+	echo $(git cherry main my-topic-branch) &&
+	expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* - .*"
+
+[main 3a1a38a] Add C.
+ Author: A U Thor <bogus_email_address>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C
++ 75dd694131e593dac8cf8ea0a377f1b73a80c1ad - c8d60d26f42936e7a055747f5412d41a6bce7d77
+85
+ok 3 - cherry-pick one of the 2 patches, and check cherry recognized one and only one as new
+
+expecting success of 3500.4 'cherry ignores whitespace': 
+	git switch --orphan=upstream-with-space &&
+	test_commit initial file &&
+	>expect &&
+	git switch --create=feature-without-space &&
+
+	# A spaceless file on the feature branch.  Expect a match upstream.
+	printf space >file &&
+	git add file &&
+	git commit -m"file without space" &&
+	git log --format="- %H" -1 >>expect &&
+
+	# A further change.  Should not match upstream.
+	test_commit change file &&
+	git log --format="+ %H" -1 >>expect &&
+
+	git switch upstream-with-space &&
+	# Same as the spaceless file, just with spaces and on upstream.
+	test_commit "file with space" file "s p a c e" file-with-space &&
+	git cherry upstream-with-space feature-without-space >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'upstream-with-space'
+[upstream-with-space (root-commit) 42825d6] initial
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'feature-without-space'
+[feature-without-space 21e64a6] file without space
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[feature-without-space efc65e3] change
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'upstream-with-space'
+[upstream-with-space 2ae2c61] file with space
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - cherry ignores whitespace
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3437-rebase-fixup-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3437-rebase-fixup-options/.git/
+expecting success of 3437.1 'setup': 
+	cat >message <<-EOF &&
+	amend! B
+	$EMPTY
+	new subject
+	$EMPTY
+	new
+	body
+	EOF
+
+	test_commit initial &&
+	test_commit A A &&
+	test_commit B B &&
+	get_author HEAD >expected-author &&
+	ORIG_AUTHOR_NAME="$GIT_AUTHOR_NAME" &&
+	ORIG_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" &&
+	GIT_AUTHOR_NAME="Amend Author" &&
+	GIT_AUTHOR_EMAIL="amend@example.com" &&
+	test_commit "$(cat message)" A A1 A1 &&
+	test_commit A2 A &&
+	test_commit A3 A &&
+	GIT_AUTHOR_NAME="$ORIG_AUTHOR_NAME" &&
+	GIT_AUTHOR_EMAIL="$ORIG_AUTHOR_EMAIL" &&
+	git checkout -b conflicts-branch A &&
+	test_commit conflicts A &&
+
+	set_fake_editor &&
+	git checkout -b branch B &&
+	echo B1 >B &&
+	test_tick &&
+	git commit --fixup=HEAD -a &&
+	git tag B1 &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited 1" git commit --fixup=reword:B &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited 2" git commit --fixup=reword:HEAD &&
+	echo B2 >B &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
+	git tag B2 &&
+	echo B3 >B &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited 3" git commit -a --fixup=amend:HEAD^ &&
+	git tag B3 &&
+
+	GIT_AUTHOR_NAME="Rebase Author" &&
+	GIT_AUTHOR_EMAIL="rebase.author@example.com" &&
+	GIT_COMMITTER_NAME="Rebase Committer" &&
+	GIT_COMMITTER_EMAIL="rebase.committer@example.com"
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[master e45ed32] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+[master 0b010d6] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+[master 24547d2] amend! B
+ Author: Amend Author <amend@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 34b9ec4] A2
+ Author: Amend Author <amend@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master fc6fe24] A3
+ Author: Amend Author <amend@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'conflicts-branch'
+[conflicts-branch 1ae01f5] conflicts
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch'
+[branch 5ea5a69] fixup! B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[branch 9954cb8] amend! B
+ Author: A U Thor <author@example.com>
+[branch ddcbd4a] amend! amend! B
+ Author: A U Thor <author@example.com>
+[branch 4d0230e] squash! amend! amend! B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[branch e0c8cb3] amend! amend! amend! B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 3437.2 'simple fixup -C works': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A2 &&
+	FAKE_LINES="1 fixup_-C 2" git rebase -i B &&
+	test_cmp_rev HEAD^ B &&
+	test_cmp_rev HEAD^{tree} A2^{tree} &&
+	test_commit_message HEAD -m "A2"
+
+HEAD is now at 34b9ec4 A2
+rebase -i script before editing:
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+
+rebase -i script after editing:
+pick 24547d2 amend! B
+fixup -C 34b9ec4 A2
+Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 2 - simple fixup -C works
+
+expecting success of 3437.3 'simple fixup -c works': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A2 &&
+	git log -1 --pretty=format:%B >expected-fixup-message &&
+	test_write_lines "" "Modified A2" >>expected-fixup-message &&
+	FAKE_LINES="1 fixup_-c 2" \
+		FAKE_COMMIT_AMEND="Modified A2" \
+		git rebase -i B &&
+	test_cmp_rev HEAD^ B &&
+	test_cmp_rev HEAD^{tree} A2^{tree} &&
+	test_commit_message HEAD expected-fixup-message
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  9e14115 A2
+
+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> 9e14115
+
+HEAD is now at 34b9ec4 A2
+rebase -i script before editing:
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+
+rebase -i script after editing:
+pick 24547d2 amend! B
+fixup -c 34b9ec4 A2
+Rebasing (2/2)
[detached HEAD e21ffe9] A2
+ Author: Amend Author <amend@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 3 - simple fixup -c works
+
+expecting success of 3437.4 'fixup -C removes amend! from message': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A1 &&
+	git log -1 --pretty=format:%b >expected-message &&
+	FAKE_LINES="1 fixup_-C 2" git rebase -i A &&
+	test_cmp_rev HEAD^ A &&
+	test_cmp_rev HEAD^{tree} A1^{tree} &&
+	test_commit_message HEAD expected-message &&
+	get_author HEAD >actual-author &&
+	test_cmp expected-author actual-author
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  e21ffe9 A2
+
+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> e21ffe9
+
+HEAD is now at 24547d2 amend! B
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup -C 24547d2 amend! B
+Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 4 - fixup -C removes amend! from message
+
+expecting success of 3437.5 'fixup -C with conflicts gives correct message': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A1 &&
+	git log -1 --pretty=format:%b >expected-message &&
+	test_write_lines "" "edited" >>expected-message &&
+	test_must_fail env FAKE_LINES="1 fixup_-C 2" git rebase -i conflicts &&
+	git checkout --theirs -- A &&
+	git add A &&
+	FAKE_COMMIT_AMEND=edited git rebase --continue &&
+	test_cmp_rev HEAD^ conflicts &&
+	test_cmp_rev HEAD^{tree} A1^{tree} &&
+	test_commit_message HEAD expected-message &&
+	get_author HEAD >actual-author &&
+	test_cmp expected-author actual-author
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  b96345a new subject
+
+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> b96345a
+
+HEAD is now at 24547d2 amend! B
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup -C 24547d2 amend! B
+Rebasing (1/2)
Rebasing (2/2)
Auto-merging A
+CONFLICT (content): Merge conflict in A
+error: could not apply 24547d2... amend! 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 advice.mergeConflict false"
+Could not apply 24547d2... amend! B
+[detached HEAD df4c993] new subject
+ 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 B
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 5 - fixup -C with conflicts gives correct message
+
+expecting success of 3437.6 'skipping fixup -C after fixup gives correct message': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A3 &&
+	test_must_fail env FAKE_LINES="1 fixup 2 fixup_-C 4" git rebase -i A &&
+	git reset --hard &&
+	FAKE_COMMIT_AMEND=edited git rebase --continue &&
+	test_commit_message HEAD -m "B"
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  df4c993 new subject
+
+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> df4c993
+
+HEAD is now at fc6fe24 A3
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+pick fc6fe24 A3
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup 24547d2 amend! B
+fixup -C fc6fe24 A3
+Rebasing (2/3)
Rebasing (3/3)
Auto-merging A
+CONFLICT (content): Merge conflict in A
+error: could not apply fc6fe24... A3
+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 advice.mergeConflict false"
+Could not apply fc6fe24... A3
+HEAD is now at dfd7a63 # This is a combination of 2 commits. # This is the 1st commit message:
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 6 - skipping fixup -C after fixup gives correct message
+
+expecting success of 3437.7 'sequence of fixup, fixup -C & squash --signoff works': 
+	git checkout --detach B3 &&
+	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4 squash 5 fixup_-C 6" \
+		FAKE_COMMIT_AMEND=squashed \
+		FAKE_MESSAGE_COPY=actual-squash-message \
+		git -c commit.status=false rebase -ik --signoff A &&
+	git diff-tree --exit-code --patch HEAD B3 -- &&
+	test_cmp_rev HEAD^ A &&
+	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
+		actual-squash-message
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  e650b85 B
+
+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> e650b85
+
+HEAD is now at e0c8cb3 amend! amend! amend! B
+rebase -i script before editing:
+pick 0b010d6 B
+pick 5ea5a69 fixup! B
+pick 9954cb8 amend! B # empty
+pick ddcbd4a amend! amend! B # empty
+pick 4d0230e squash! amend! amend! B
+pick e0c8cb3 amend! amend! amend! B
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup 5ea5a69 fixup! B
+fixup -C 9954cb8 amend! B # empty
+fixup -C ddcbd4a amend! amend! B # empty
+squash 4d0230e squash! amend! amend! B
+fixup -C e0c8cb3 amend! amend! amend! B
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
[detached HEAD 93e1c61] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+Successfully rebased and updated detached HEAD.
+ok 7 - sequence of fixup, fixup -C & squash --signoff works
+
+expecting success of 3437.8 'first fixup -C commented out in sequence fixup fixup -C fixup -C': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach B2~ &&
+	git log -1 --pretty=format:%b >expected-message &&
+	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4" git rebase -i A &&
+	test_cmp_rev HEAD^ A &&
+	test_commit_message HEAD expected-message
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  93e1c61 B
+
+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> 93e1c61
+
+HEAD is now at ddcbd4a amend! amend! B
+rebase -i script before editing:
+pick 0b010d6 B
+pick 5ea5a69 fixup! B
+pick 9954cb8 amend! B # empty
+pick ddcbd4a amend! amend! B # empty
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup 5ea5a69 fixup! B
+fixup -C 9954cb8 amend! B # empty
+fixup -C ddcbd4a amend! amend! B # empty
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 8 - first fixup -C commented out in sequence fixup fixup -C fixup -C
+
+expecting success of 3437.9 'multiple fixup -c opens editor once': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A3 &&
+	git log -1 --pretty=format:%B >expected-message &&
+	test_write_lines "" "Modified-A3" >>expected-message &&
+	FAKE_COMMIT_AMEND="Modified-A3" \
+		FAKE_LINES="1 fixup_-C 2 fixup_-c 3 fixup_-c 4" \
+		EXPECT_HEADER_COUNT=4 \
+		git rebase -i A &&
+	test_cmp_rev HEAD^ A &&
+	get_author HEAD >actual-author &&
+	test_cmp expected-author actual-author &&
+	test_commit_message HEAD expected-message
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  8566dee B
+
+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> 8566dee
+
+HEAD is now at fc6fe24 A3
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+pick fc6fe24 A3
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup -C 24547d2 amend! B
+fixup -c 34b9ec4 A2
+fixup -c fc6fe24 A3
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 68e48e4] A3
+ 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 B
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 9 - multiple fixup -c opens editor once
+
+expecting success of 3437.10 'sequence squash, fixup & fixup -c gives combined message': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A3 &&
+	FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
+		FAKE_MESSAGE_COPY=actual-combined-message \
+		git -c commit.status=false rebase -i A &&
+	test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
+		actual-combined-message &&
+	test_cmp_rev HEAD^ A
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  68e48e4 A3
+
+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> 68e48e4
+
+HEAD is now at fc6fe24 A3
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+pick fc6fe24 A3
+
+rebase -i script after editing:
+pick 0b010d6 B
+squash 24547d2 amend! B
+fixup 34b9ec4 A2
+fixup -c fc6fe24 A3
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 0a304e5] B
+ 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 B
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 10 - sequence squash, fixup & fixup -c gives combined message
+
+expecting success of 3437.11 'fixup -C works upon --autosquash with amend!': 
+	git checkout --detach B3 &&
+	FAKE_COMMIT_AMEND=squashed \
+		FAKE_MESSAGE_COPY=actual-squash-message \
+		git -c commit.status=false rebase -ik --autosquash \
+						--signoff A &&
+	git diff-tree --exit-code --patch HEAD B3 -- &&
+	test_cmp_rev HEAD^ A &&
+	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
+		actual-squash-message
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  0a304e5 B
+
+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> 0a304e5
+
+HEAD is now at e0c8cb3 amend! amend! amend! B
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
[detached HEAD 93e1c61] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+Successfully rebased and updated detached HEAD.
+ok 11 - fixup -C works upon --autosquash with amend!
+
+expecting success of 3437.12 'fixup -[Cc]<commit> works': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	cat >todo <<-\EOF &&
+	pick A
+	fixup -CA1
+	pick B
+	fixup -cA2
+	EOF
+	(
+		set_replace_editor todo &&
+		FAKE_COMMIT_MESSAGE="edited and fixed up" \
+			git rebase -i initial initial
+	) &&
+	git log --pretty=format:%B initial.. >actual &&
+	cat >expect <<-EOF &&
+	edited and fixed up
+	$EMPTY
+	new subject
+	$EMPTY
+	new
+	body
+	EOF
+	test_cmp expect actual
+
+rebase -i script after editing:
+pick A
+fixup -CA1
+pick B
+fixup -cA2
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 755eebe] edited and fixed up
+ 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 B
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 12 - fixup -[Cc]<commit> works
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3502-cherry-pick-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3502-cherry-pick-merge/.git/
+expecting success of 3502.1 'setup': 
+
+	>A &&
+	>B &&
+	git add A B &&
+	git commit -m "Initial" &&
+	git tag initial &&
+	git branch side &&
+	echo new line >A &&
+	git commit -m "add line to A" A &&
+	git tag a &&
+	git checkout side &&
+	echo new line >B &&
+	git commit -m "add line to B" B &&
+	git tag b &&
+	git checkout main &&
+	git merge side &&
+	git tag c
+
+
+[main (root-commit) 5c8827d] Initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 A
+ create mode 100644 B
+[main 6e41539] add line to A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'side'
+[side 4fb21f2] add line to B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ B | 1 +
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 3502.2 'cherry-pick -m complains of bogus numbers': 
+	# expect 129 here to distinguish between cases where
+	# there was nothing to cherry-pick
+	test_expect_code 129 git cherry-pick -m &&
+	test_expect_code 129 git cherry-pick -m foo b &&
+	test_expect_code 129 git cherry-pick -m -1 b &&
+	test_expect_code 129 git cherry-pick -m 0 b
+
+error: switch `m' requires a value
+error: option `mainline' expects a number greater than zero
+error: option `mainline' expects a number greater than zero
+error: option `mainline' expects a number greater than zero
+ok 2 - cherry-pick -m complains of bogus numbers
+
+expecting success of 3502.3 'cherry-pick explicit first parent of a non-merge': 
+
+	git reset --hard &&
+	git checkout a^0 &&
+	git cherry-pick -m 1 b &&
+	git diff --exit-code c --
+
+
+HEAD is now at c81ef52 Merge branch 'side'
+Note: switching to 'a^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 6e41539 add line to A
+[detached HEAD 99ce4f9] add line to B
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 3 - cherry-pick explicit first parent of a non-merge
+
+expecting success of 3502.4 'cherry pick a merge without -m should fail': 
+
+	git reset --hard &&
+	git checkout a^0 &&
+	test_must_fail git cherry-pick c &&
+	git diff --exit-code a --
+
+
+HEAD is now at 99ce4f9 add line to B
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  99ce4f9 add line to B
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 99ce4f9
+
+HEAD is now at 6e41539 add line to A
+error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 is a merge but no -m option was given.
+fatal: cherry-pick failed
+ok 4 - cherry pick a merge without -m should fail
+
+expecting success of 3502.5 'cherry pick a merge (1)': 
+
+	git reset --hard &&
+	git checkout a^0 &&
+	git cherry-pick -m 1 c &&
+	git diff --exit-code c
+
+
+HEAD is now at 6e41539 add line to A
+HEAD is now at 6e41539 add line to A
+[detached HEAD 9d31cba] Merge branch 'side'
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 5 - cherry pick a merge (1)
+
+expecting success of 3502.6 'cherry pick a merge (2)': 
+
+	git reset --hard &&
+	git checkout b^0 &&
+	git cherry-pick -m 2 c &&
+	git diff --exit-code c
+
+
+HEAD is now at 9d31cba Merge branch 'side'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  9d31cba Merge branch 'side'
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 9d31cba
+
+HEAD is now at 4fb21f2 add line to B
+[detached HEAD 9554515] Merge branch 'side'
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 6 - cherry pick a merge (2)
+
+expecting success of 3502.7 'cherry pick a merge relative to nonexistent parent should fail': 
+
+	git reset --hard &&
+	git checkout b^0 &&
+	test_must_fail git cherry-pick -m 3 c
+
+
+HEAD is now at 9554515 Merge branch 'side'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  9554515 Merge branch 'side'
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 9554515
+
+HEAD is now at 4fb21f2 add line to B
+error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 does not have parent 3
+fatal: cherry-pick failed
+ok 7 - cherry pick a merge relative to nonexistent parent should fail
+
+expecting success of 3502.8 'revert explicit first parent of a non-merge': 
+
+	git reset --hard &&
+	git checkout c^0 &&
+	git revert -m 1 b &&
+	git diff --exit-code a --
+
+
+HEAD is now at 4fb21f2 add line to B
+Previous HEAD position was 4fb21f2 add line to B
+HEAD is now at c81ef52 Merge branch 'side'
+[detached HEAD 1b3e5cc] Revert "add line to B"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+ok 8 - revert explicit first parent of a non-merge
+
+expecting success of 3502.9 'revert a merge without -m should fail': 
+
+	git reset --hard &&
+	git checkout c^0 &&
+	test_must_fail git revert c &&
+	git diff --exit-code c
+
+
+HEAD is now at 1b3e5cc Revert "add line to B"
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  1b3e5cc Revert "add line to B"
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 1b3e5cc
+
+HEAD is now at c81ef52 Merge branch 'side'
+error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 is a merge but no -m option was given.
+fatal: revert failed
+ok 9 - revert a merge without -m should fail
+
+expecting success of 3502.10 'revert a merge (1)': 
+
+	git reset --hard &&
+	git checkout c^0 &&
+	git revert -m 1 c &&
+	git diff --exit-code a --
+
+
+HEAD is now at c81ef52 Merge branch 'side'
+HEAD is now at c81ef52 Merge branch 'side'
+[detached HEAD ab594ec] Revert "Merge branch 'side'"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+ok 10 - revert a merge (1)
+
+expecting success of 3502.11 'revert a merge (2)': 
+
+	git reset --hard &&
+	git checkout c^0 &&
+	git revert -m 2 c &&
+	git diff --exit-code b --
+
+
+HEAD is now at ab594ec Revert "Merge branch 'side'"
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  ab594ec Revert "Merge branch 'side'"
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> ab594ec
+
+HEAD is now at c81ef52 Merge branch 'side'
+[detached HEAD 3f41b61] Revert "Merge branch 'side'"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+ok 11 - revert a merge (2)
+
+expecting success of 3502.12 'revert a merge relative to nonexistent parent should fail': 
+
+	git reset --hard &&
+	git checkout c^0 &&
+	test_must_fail git revert -m 3 c &&
+	git diff --exit-code c
+
+
+HEAD is now at 3f41b61 Revert "Merge branch 'side'"
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  3f41b61 Revert "Merge branch 'side'"
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 3f41b61
+
+HEAD is now at c81ef52 Merge branch 'side'
+error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 does not have parent 3
+fatal: revert failed
+ok 12 - revert a merge relative to nonexistent parent should fail
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3503-cherry-pick-root.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3503-cherry-pick-root/.git/
 expecting success of 3503.1 'setup': 
@@ -162222,2365 +159246,6 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3509-cherry-pick-merge-df.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3509-cherry-pick-merge-df/.git/
-expecting success of 3509.1 'Initialize repository': 
-	mkdir a &&
-	>a/f &&
-	git add a &&
-	git commit -m a
-
-[main (root-commit) 8938fef] a
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/f
-ok 1 - Initialize repository
-
-expecting success of 3509.2 'Setup rename across paths each below D/F conflicts': 
-	mkdir b &&
-	test_ln_s_add ../a b/a &&
-	git commit -m b &&
-
-	git checkout -b branch &&
-	rm b/a &&
-	git mv a b/a &&
-	test_ln_s_add b/a a &&
-	git commit -m swap &&
-
-	>f1 &&
-	git add f1 &&
-	git commit -m f1
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[main 6c20241] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 b/a
-Switched to a new branch 'branch'
-[branch 138a745] swap
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 1 deletion(-)
- create mode 120000 a
- delete mode 120000 b/a
- rename {a => b/a}/f (100%)
-[branch b71b76f] f1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 f1
-ok 2 - Setup rename across paths each below D/F conflicts
-
-expecting success of 3509.3 'Cherry-pick succeeds with rename across D/F conflicts': 
-	git reset --hard &&
-	git checkout main^0 &&
-	git cherry-pick branch
-
-HEAD is now at b71b76f f1
-Note: switching to 'main^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6c20241 b
-[detached HEAD 1b1aec6] f1
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 f1
-ok 3 - Cherry-pick succeeds with rename across D/F conflicts
-
-expecting success of 3509.4 'Setup rename with file on one side matching directory name on other': 
-	git checkout --orphan nick-testcase &&
-	git rm -rf . &&
-
-	>empty &&
-	git add empty &&
-	git commit -m "Empty file" &&
-
-	git checkout -b simple &&
-	mv empty file &&
-	mkdir empty &&
-	mv file empty &&
-	git add empty/file &&
-	git commit -m "Empty file under empty dir" &&
-
-	echo content >newfile &&
-	git add newfile &&
-	git commit -m "New file"
-
-Switched to a new branch 'nick-testcase'
-rm 'a/f'
-rm 'b/a'
-rm 'f1'
-[nick-testcase (root-commit) f619bd8] Empty file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty
-Switched to a new branch 'simple'
-[simple 735003f] Empty file under empty dir
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename empty => empty/file (100%)
-[simple 2eb2ba1] New file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 4 - Setup rename with file on one side matching directory name on other
-
-expecting success of 3509.5 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)': 
-	git reset --hard &&
-	git checkout -q nick-testcase^0 &&
-	git cherry-pick --strategy=resolve simple
-
-HEAD is now at 2eb2ba1 New file
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-[detached HEAD 072269c] New file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 5 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)
-
-expecting success of 3509.6 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)': 
-	git reset --hard &&
-	git checkout -q nick-testcase^0 &&
-	git cherry-pick --strategy=recursive simple
-
-HEAD is now at 072269c New file
-Adding empty
-[detached HEAD 072269c] New file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 6 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)
-
-expecting success of 3509.7 'Setup rename with file on one side matching different dirname on other': 
-	git reset --hard &&
-	git checkout --orphan mergeme &&
-	git rm -rf . &&
-
-	mkdir sub &&
-	mkdir othersub &&
-	echo content > sub/file &&
-	echo foo > othersub/whatever &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git rm -rf othersub &&
-	git mv sub/file othersub &&
-	git commit -m "Commit to merge" &&
-
-	git checkout -b newhead mergeme~1 &&
-	>independent-change &&
-	git add independent-change &&
-	git commit -m "Completely unrelated change"
-
-HEAD is now at 072269c New file
-Switched to a new branch 'mergeme'
-rm 'empty'
-rm 'newfile'
-[mergeme (root-commit) 220cb6a] Common commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 othersub/whatever
- create mode 100644 sub/file
-rm 'othersub/whatever'
-[mergeme 73ee5a0] Commit to merge
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename sub/file => othersub (100%)
- delete mode 100644 othersub/whatever
-Switched to a new branch 'newhead'
-[newhead dec5ebc] Completely unrelated change
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 independent-change
-ok 7 - Setup rename with file on one side matching different dirname on other
-
-expecting success of 3509.8 'Cherry-pick with rename to different D/F conflict succeeds (resolve)': 
-	git reset --hard &&
-	git checkout -q newhead^0 &&
-	git cherry-pick --strategy=resolve mergeme
-
-HEAD is now at dec5ebc Completely unrelated change
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Adding othersub
-[detached HEAD 8d9f455] Commit to merge
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 deletion(-)
- rename sub/file => othersub (100%)
- delete mode 100644 othersub/whatever
-ok 8 - Cherry-pick with rename to different D/F conflict succeeds (resolve)
-
-expecting success of 3509.9 'Cherry-pick with rename to different D/F conflict succeeds (recursive)': 
-	git reset --hard &&
-	git checkout -q newhead^0 &&
-	git cherry-pick --strategy=recursive mergeme
-
-HEAD is now at 8d9f455 Commit to merge
-Removing othersub/whatever
-[detached HEAD 8d9f455] Commit to merge
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 deletion(-)
- rename sub/file => othersub (100%)
- delete mode 100644 othersub/whatever
-ok 9 - Cherry-pick with rename to different D/F conflict succeeds (recursive)
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3508-cherry-pick-many-commits.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
-
-	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
-
-[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 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
-
-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 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"
-
-Note: switching to 'first'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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 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:
-
-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 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
-
-	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
-
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 5 - output to keep user entertained during multi-pick
-
-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
-
-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 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
-
-	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
-
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 7 - output during multi-pick indicates merge strategy
-
-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
-
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 8 - cherry-pick --ff first..fourth works
-
-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
-
-Already on 'main'
-HEAD is now at 0c72e4f first
-ok 9 - cherry-pick -n first..fourth works
-
-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
-
-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 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
-
-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 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
-
-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 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
-
-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 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
-
-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
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3511-cherry-pick-x.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3511-cherry-pick-x/.git/
-expecting success of 3511.1 'setup': 
-	git config 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
-
-[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 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
-
-		(cherry picked from commit $sha1)
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-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 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
-
-		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:
-
-  6970a53 base: commit message
-
-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 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
-
-		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:
-
-  0fda2e1 base: commit message
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  0cf5261 base: commit message
-
-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 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
-
-		(cherry picked from commit $sha1)
-	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:
-
-  b95a0f7 base: commit message
-
-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 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
-
-		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:
-
-  6f42e54 base: commit message
-
-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 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
-
-		(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
-
-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:
-
-  adaaef8 base: commit message
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b62bd75 base: commit message
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  94e740a base: commit message
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  a836c16 base: commit message
-
-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 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 &&
-
-	printf "\n(cherry picked from commit %s)\n" $sha1 >>msg &&
-	test_cmp msg actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  2d6e386 base: commit message
-
-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 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 &&
-
-	printf "\n\n(cherry picked from commit %s)\n" $sha1 >>msg &&
-	test_cmp msg actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  96716be title
-
-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 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 &&
-
-	printf "\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
-	test_cmp msg actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  8c5d63f title
-
-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 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 &&
-
-	printf "\n\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
-	test_cmp msg actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6671fda title
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  19f481d title
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  7b5eb6d base: commit message
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b468a7b base: commit message
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  c7c741c base: commit message
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  7a2ed43 base: commit message
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  ad2d5bc base: commit message
-
-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
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3507-cherry-pick-conflict.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3507-cherry-pick-conflict/.git/
-expecting success of 3507.1 'setup': 
-
-	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 advice.detachedhead false
-
-
-[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 3507.2 'failed cherry-pick does not advance HEAD': 
-	pristine_detach initial &&
-
-	head=$(git rev-parse HEAD) &&
-	test_must_fail git cherry-pick picked &&
-	newhead=$(git rev-parse HEAD) &&
-
-	test "$head" = "$newhead"
-
-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 advice.mergeConflict false"
-ok 2 - failed cherry-pick does not advance HEAD
-
-expecting success of 3507.3 'advice from failed cherry-pick': 
-	pristine_detach initial &&
-
-	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 advice.mergeConflict false"
-	EOF
-	test_must_fail git cherry-pick picked 2>actual &&
-
-	test_cmp expected actual
-
-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 3507.4 'advice from failed cherry-pick --no-commit': 
-	pristine_detach initial &&
-
-	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 advice.mergeConflict false"
-	EOF
-	test_must_fail git cherry-pick --no-commit picked 2>actual &&
-
-	test_cmp expected actual
-
-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 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
-
-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 advice.mergeConflict false"
-ok 5 - failed cherry-pick sets CHERRY_PICK_HEAD
-
-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
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  ccd9cfc base
-
-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 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
-
-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 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
-
-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 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
-
-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 advice.mergeConflict false"
-fatal: Needed a single revision
-ok 10 - GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD
-
-expecting success of 3507.11 'git reset clears CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
-
-	test_must_fail git cherry-pick picked &&
-	git reset &&
-
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
-
-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 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 3507.12 'failed commit does not clear CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
-
-	test_must_fail git cherry-pick picked &&
-	test_must_fail git commit &&
-
-	test_cmp_rev picked CHERRY_PICK_HEAD
-
-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 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 3507.13 'cancelled commit does not clear CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
-
-	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
-	) &&
-
-	test_cmp_rev picked CHERRY_PICK_HEAD
-
-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 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 3507.14 'successful commit clears CHERRY_PICK_HEAD': 
-	pristine_detach initial &&
-
-	test_must_fail git cherry-pick picked &&
-	echo resolved >foo &&
-	git add foo &&
-	git commit &&
-
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
-
-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 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 3507.15 'partial commit of cherry-pick fails': 
-	pristine_detach initial &&
-
-	test_must_fail git cherry-pick picked &&
-	echo resolved >foo &&
-	git add foo &&
-	test_must_fail git commit foo 2>err &&
-
-	test_grep "cannot do a partial commit during a cherry-pick." err
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  a8c44c9 picked
-
-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 advice.mergeConflict false"
-fatal: cannot do a partial commit during a cherry-pick.
-ok 15 - partial commit of cherry-pick fails
-
-expecting success of 3507.16 'commit --amend of cherry-pick fails': 
-	pristine_detach initial &&
-
-	test_must_fail git cherry-pick picked &&
-	echo resolved >foo &&
-	git add foo &&
-	test_must_fail git commit --amend 2>err &&
-
-	test_grep "in the middle of a cherry-pick -- cannot amend." err
-
-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 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 3507.17 'successful final commit clears cherry-pick state': 
-	pristine_detach initial &&
-
-	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
-
-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 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 3507.18 'reset after final pick clears cherry-pick state': 
-	pristine_detach initial &&
-
-	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
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  53c8c73 picked-signed
-  ccd9cfc base
-
-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 advice.mergeConflict false"
-Unstaged changes after reset:
-M	foo
-ok 18 - reset after final pick clears cherry-pick state
-
-expecting success of 3507.19 'failed cherry-pick produces dirty index': 
-	pristine_detach initial &&
-
-	test_must_fail git cherry-pick picked &&
-
-	test_must_fail git update-index --refresh -q &&
-	test_must_fail git diff-index --exit-code HEAD
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  ccd9cfc base
-
-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 advice.mergeConflict false"
-foo: needs merge
-:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
-ok 19 - failed cherry-pick produces dirty index
-
-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 &&
-
-	test_must_fail git cherry-pick picked &&
-	git ls-files --stage --unmerged >actual &&
-
-	test_cmp expected actual
-
-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 advice.mergeConflict false"
-ok 20 - failed cherry-pick registers participants in index
-
-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
-
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
-		EOF
-
-	test_must_fail git cherry-pick picked &&
-
-	test_cmp expected .git/MERGE_MSG
-
-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 advice.mergeConflict false"
-ok 21 - cherry-pick conflict, ensure commit.cleanup = scissors places scissors line properly
-
-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
-
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
-		EOF
-
-	test_must_fail git cherry-pick --cleanup=scissors picked &&
-
-	test_cmp expected .git/MERGE_MSG
-
-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 advice.mergeConflict false"
-ok 22 - cherry-pick conflict, ensure cleanup=scissors places scissors line properly
-
-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
-
-	test_must_fail git cherry-pick picked &&
-
-	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
-	test_cmp expected actual
-
-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 advice.mergeConflict false"
-ok 23 - failed cherry-pick describes conflict in work tree
-
-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
-
-	test_must_fail git cherry-pick picked &&
-
-	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
-	test_cmp expected actual
-
-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 advice.mergeConflict false"
-ok 24 - diff3 -m style
-
-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 &&
-
-	head=$(git rev-parse HEAD) &&
-	test_must_fail git revert picked &&
-	newhead=$(git rev-parse HEAD) &&
-	git ls-files --stage --unmerged >actual-stages &&
-
-	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
-
-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 advice.mergeConflict false"
-foo: needs merge
-:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
-ok 25 - revert also handles conflicts sanely
-
-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
-
-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 advice.mergeConflict false"
-ok 26 - failed revert sets REVERT_HEAD
-
-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
-
-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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  feb2983 Revert "base"
-
-HEAD is now at dc0113b base
-fatal: Needed a single revision
-ok 28 - revert --no-commit sets REVERT_HEAD
-
-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
-
-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 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
-
-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 advice.mergeConflict false"
-fatal: Needed a single revision
-ok 30 - GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD
-
-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
-
-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 advice.mergeConflict false"
-Unstaged changes after reset:
-M	foo
-fatal: Needed a single revision
-ok 31 - git reset clears REVERT_HEAD
-
-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
-
-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 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 3507.33 'successful final commit clears revert state': 
-	pristine_detach picked-signed &&
-
-	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
-
-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 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 3507.34 'reset after final pick clears revert state': 
-	pristine_detach picked-signed &&
-
-	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
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  7342963 Revert "base"
-  b940b09 Revert "picked-signed"
-
-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 advice.mergeConflict false"
-Unstaged changes after reset:
-M	foo
-ok 34 - reset after final pick clears revert state
-
-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
-
-	test_must_fail git revert picked &&
-
-	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
-	test_cmp expected actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b940b09 Revert "picked-signed"
-
-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 advice.mergeConflict false"
-ok 35 - revert conflict, diff3 -m style
-
-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"
-
-		This reverts commit OBJID.
-
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
-		EOF
-
-	test_must_fail git revert picked &&
-
-	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
-	test_cmp expected actual
-
-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 advice.mergeConflict false"
-ok 36 - revert conflict, ensure commit.cleanup = scissors places scissors line properly
-
-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"
-
-		This reverts commit OBJID.
-
-		# ------------------------ >8 ------------------------
-		# Do not modify or remove the line above.
-		# Everything below it will be ignored.
-		#
-		# Conflicts:
-		#	foo
-		EOF
-
-	test_must_fail git revert --cleanup=scissors picked &&
-
-	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
-	test_cmp expected actual
-
-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 advice.mergeConflict false"
-ok 37 - revert conflict, ensure cleanup=scissors places scissors line properly
-
-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
-
-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 advice.mergeConflict false"
-Signed-off-by: C O Mitter <committer@example.com>
-ok 38 - failed cherry-pick does not forget -s
-
-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
-
-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 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 3507.40 'commit after failed cherry-pick adds -s at the right place': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick picked &&
-
-	git commit -a -s &&
-
-	# 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 &&
-
-	cat <<-\EOF >expected &&
-	picked
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-
-	git show -s --pretty=format:%B >actual &&
-	test_cmp expected actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  ae79e40 picked-signed
-
-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 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 3507.41 'commit --amend -s places the sign-off at the right place': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick picked &&
-
-	# emulate old-style conflicts block
-	mv .git/MERGE_MSG .git/MERGE_MSG+ &&
-	sed -e "/^# Conflicts:/,\$s/^# *//" .git/MERGE_MSG+ >.git/MERGE_MSG &&
-
-	git commit -a &&
-	git commit --amend -s &&
-
-	# 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  56f790d picked
-
-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 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 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
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  91df379 picked
-
-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:
-
-    git commit --allow-empty
-
-Otherwise, please use 'git cherry-pick --skip'
-ok 42 - cherry-pick preserves sparse-checkout
-
-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
-
-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 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 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
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  22de78d redundant-pick
-  d9f497e picked
-
-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 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
-
-# passed all 44 test(s)
-1..44
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3404-rebase-interactive.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3404-rebase-interactive/.git/
 expecting success of 3404.1 'setup': 
@@ -169423,9978 +164088,11917 @@
 1..131
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3514-cherry-pick-revert-gpg.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3514-cherry-pick-revert-gpg/.git/
-checking prerequisite: GPG
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
-	# the gpg version 1.0.6 did not parse trust packets correctly, so for
-	# that version, creation of signed tags using the generated key fails.
-	case "$gpg_version" in
-	"gpg (GnuPG) 1.0.6"*)
-		say "Your version of gpg (1.0.6) is too buggy for testing"
-		exit 1
-		;;
-	*)
-		# Available key info:
-		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
-		#   name and email: C O Mitter <committer@example.com>
-		# * Type RSA, size 2048 bits, no expiration date,
-		#   name and email: Eris Discordia <discord@example.net>
-		# No password given, to enable non-interactive operation.
-		# To generate new key:
-		#	gpg --homedir /tmp/gpghome --gen-key
-		# To write armored exported key to keyring:
-		#	gpg --homedir /tmp/gpghome --export-secret-keys \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		#	gpg --homedir /tmp/gpghome --export \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		# To export ownertrust:
-		#	gpg --homedir /tmp/gpghome --export-ownertrust \
-		#		> lib-gpg/ownertrust
-		mkdir "$GNUPGHOME" &&
-		chmod 0700 "$GNUPGHOME" &&
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
-
-)
-prerequisite GPG not satisfied
-1..0 # SKIP skip all test {cherry-pick,revert} --[no-]gpg-sign, gpg not available
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3601-rm-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3601-rm-pathspec-file/.git/
-expecting success of 3601.1 'setup': 
-	echo A >fileA.t &&
-	echo B >fileB.t &&
-	echo C >fileC.t &&
-	echo D >fileD.t &&
-	git add fileA.t fileB.t fileC.t fileD.t &&
-	git commit -m "files" &&
-
-	git tag checkpoint
-
-[master (root-commit) d32ab08] files
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
- create mode 100644 fileC.t
- create mode 100644 fileD.t
-ok 1 - setup
-
-expecting success of 3601.2 'simplest': 
-	restore_checkpoint &&
-
-	cat >expect <<-\EOF &&
-	D  fileA.t
-	EOF
-
-	echo fileA.t | git rm --pathspec-from-file=- &&
-	verify_expect
-
-HEAD is now at d32ab08 files
-rm 'fileA.t'
-ok 2 - simplest
-
-expecting success of 3601.3 '--pathspec-file-nul': 
-	restore_checkpoint &&
-
-	cat >expect <<-\EOF &&
-	D  fileA.t
-	D  fileB.t
-	EOF
-
-	printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul &&
-	verify_expect
-
-HEAD is now at d32ab08 files
-rm 'fileA.t'
-rm 'fileB.t'
-ok 3 - --pathspec-file-nul
-
-expecting success of 3601.4 'only touches what was listed': 
-	restore_checkpoint &&
-
-	cat >expect <<-\EOF &&
-	D  fileB.t
-	D  fileC.t
-	EOF
-
-	printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- &&
-	verify_expect
+*** t1092-sparse-checkout-compatibility.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
 
-HEAD is now at d32ab08 files
-rm 'fileB.t'
-rm 'fileC.t'
-ok 4 - only touches what was listed
+		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 3601.5 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
+		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/..." &&
 
-	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 &&
+		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/..." &&
 
-	test_must_fail git rm --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+		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/..." &&
 
-	>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
+		git checkout -b df-conflict-1 base &&
+		rm -rf folder1 &&
+		echo content >folder1 &&
+		git add . &&
+		git commit -m "dir to file" &&
 
-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
+		git checkout -b df-conflict-2 base &&
+		rm -rf folder2 &&
+		echo content >folder2 &&
+		git add . &&
+		git commit -m "dir to file" &&
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3602-rm-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3602-rm-sparse-checkout/.git/
-expecting success of 3602.1 'setup': 
-	mkdir -p sub/dir &&
-	touch a b c sub/d sub/dir/e &&
-	git add -A &&
-	git commit -m files &&
+		git checkout -b fd-conflict base &&
+		rm a &&
+		mkdir a &&
+		echo content >a/a &&
+		git add . &&
+		git commit -m "file to dir" &&
 
-	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
+		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 &&
 
-	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 advice.updateSparsePath false"
-	EOF
+		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" &&
 
-	echo b | cat sparse_error_header - >sparse_entry_b_error &&
-	cat sparse_entry_b_error sparse_hint >b_error_and_hint
+		git checkout -f base &&
+		git reset --hard
+	)
 
-[master (root-commit) ff99497] files
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t1092-sparse-checkout-compatibility/initial-repo/.git/
+[master (root-commit) 703fd3e] initial commit
  Author: A U Thor <author@example.com>
- 5 files changed, 0 insertions(+), 0 deletions(-)
+ 33 files changed, 26 insertions(+)
  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 3602.2 'rm does not remove sparse entries': 
-		git sparse-checkout set --no-cone a &&
-		test_must_fail git rm $opt b 2>stderr &&
-		test_cmp b_error_and_hint stderr &&
-		git ls-files --error-unmatch b
-	
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-b
-ok 2 - rm does not remove sparse entries
-
-expecting success of 3602.3 'rm -f does not remove sparse entries': 
-		git sparse-checkout set --no-cone a &&
-		test_must_fail git rm $opt b 2>stderr &&
-		test_cmp b_error_and_hint stderr &&
-		git ls-files --error-unmatch b
-	
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-b
-ok 3 - rm -f does not remove sparse entries
-
-expecting success of 3602.4 'rm --dry-run does not remove sparse entries': 
-		git sparse-checkout set --no-cone a &&
-		test_must_fail git rm $opt b 2>stderr &&
-		test_cmp b_error_and_hint stderr &&
-		git ls-files --error-unmatch b
-	
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-b
-ok 4 - rm --dry-run does not remove sparse entries
+ 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 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 1092.2 'sparse-index contents': 
+	init_repos &&
 
-	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
+	# Remove deep, add three other directories.
+	test_sparse_checkout_set \
+		"folder1 folder2 x" \
+		"before deep" &&
 
-HEAD is now at ff99497 files
-rm 'sub/dir/e'
-rm 'sub/d'
-ok 5 - recursive rm does not remove sparse entries
+	# Remove folder1, add deep
+	test_sparse_checkout_set \
+		"deep folder2 x" \
+		"before folder1" &&
 
-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
+	# Replace deep with deep/deeper2 (dropping deep/deeper1)
+	# Add folder1
+	test_sparse_checkout_set \
+		"deep/deeper2 folder1 folder2 x" \
+		"before deep/deeper1" &&
 
-HEAD is now at ff99497 files
-rm 'sub/d'
-rm 'sub/dir/e'
-ok 6 - recursive rm --sparse removes sparse entries
+	# 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 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
+	# Drop down to only files at root
+	test_sparse_checkout_set \
+		"" \
+		"before deep folder1 folder2 x" &&
 
-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
+	# 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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 ce536cb5137cec414526564049b9b175d835cde1 0	deep/
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 e0f2d30b633eb781d675fedd78808135103fe1a0 0	folder1/
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 10c8564bace86d48e22963bebe92e40ba8cfd937 0	deep/deeper1/
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 ca1fa788550e1b7b99256573687bd1dd7994e072 0	deep/deeper2/
+040000 cb4007891397aa2a451037d1c69e57f0cf498c24 0	folder2/0/
+fatal: path 'bogus' does not exist in 'HEAD'
+fatal: path 'folder2/2/3' does not exist in 'HEAD'
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 ce536cb5137cec414526564049b9b175d835cde1 0	deep/
+040000 e0f2d30b633eb781d675fedd78808135103fe1a0 0	folder1/
+040000 123706f6fc38949628eaf0483edbf97ba21123ae 0	folder2/
+040000 aaff74984cccd156a469afa7d9ab10e4777beb24 0	x/
+ok 2 - sparse-index contents
 
-HEAD is now at 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 1092.3 'expanded in-memory index matches full index': 
+	init_repos &&
+	test_sparse_match git ls-files --stage
 
-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
+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
 
-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 1092.4 'root directory cannot be sparse': 
+	init_repos &&
 
-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
+	# Remove all in-cone files and directories from the index, collapse index
+	# with `git sparse-checkout reapply`
+	git -C sparse-index rm -r . &&
+	git -C sparse-index sparse-checkout reapply &&
 
-HEAD is now at 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
+	# 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 3602.11 'refuse to rm a non-skip-worktree path outside sparse cone': 
-	git reset --hard &&
-	git sparse-checkout set a &&
-	git update-index --no-skip-worktree b &&
-	test_must_fail git rm b 2>stderr &&
-	test_cmp b_error_and_hint stderr &&
-	git rm --sparse b 2>stderr &&
-	test_must_be_empty stderr &&
-	test_path_is_missing b
+HEAD is now at 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
 
-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 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 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 &&
+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
 
-	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 1092.6 'status with diff in unexpanded sparse directory': 
+	init_repos &&
+	test_all_match git checkout rename-base &&
+	test_all_match git reset --soft rename-out-to-out &&
+	test_all_match git status --porcelain=v2
 
-HEAD is now at 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
+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 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 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
 
-	git update-index --no-skip-worktree x/y/z/f.t &&
-	test_must_fail git rm x/y/z/f.t 2>stderr &&
-	echo x/y/z/f.t | cat sparse_error_header - sparse_hint >expect &&
-	test_cmp expect stderr
+HEAD is now at 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
 
-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 1092.8 'add, commit, checkout': 
+	init_repos &&
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3650-replay-basics.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3650-replay-basics/.git/
-expecting success of 3650.1 'setup': 
-	test_commit A &&
-	test_commit B &&
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+	run_on_all ../edit-contents README.md &&
 
-	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 &&
+	test_all_match git add README.md &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "Add README.md" &&
 
-	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 &&
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
 
-	git switch main &&
-	test_commit L &&
-	test_commit M &&
+	run_on_all ../edit-contents README.md &&
 
-	git switch -c conflict B &&
-	test_commit C.conflict C.t conflict
+	test_all_match git add -A &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "Extend README.md" &&
 
-[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
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
 
-expecting success of 3650.2 'setup bare': 
-	git clone --bare . bare
+	run_on_all ../edit-contents deep/newfile &&
 
-Cloning into bare repository 'bare'...
-done.
-ok 2 - setup bare
+	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 3650.3 'using replay to rebase two branches, one on top of other': 
-	git replay --onto main topic1..topic2 >result &&
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout -
 
-	test_line_count = 1 result &&
+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
 
-	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 1092.9 'deep changes during checkout': 
+	init_repos &&
 
-	printf "update refs/heads/topic2 " >expect &&
-	printf "%s " $(cut -f 3 -d " " result) >>expect &&
-	git rev-parse topic2 >>expect &&
+	test_sparse_match git sparse-checkout set deep/deeper1/deepest &&
+	test_all_match git checkout deepest &&
+	test_all_match git checkout base
 
-	test_cmp expect result
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 9 - deep changes during checkout
 
-ok 3 - using replay to rebase two branches, one on top of other
+expecting success of 1092.10 'checkout with modified sparse directory': 
+	init_repos &&
 
-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
+	test_all_match git checkout rename-in-to-out -- . &&
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git checkout base
 
-ok 4 - using replay on bare repo to rebase two branches, one on top of other
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 10 - checkout with modified sparse directory
 
-expecting success of 3650.5 'using replay to rebase with a conflict': 
-	test_expect_code 1 git replay --onto topic1 B..conflict
+expecting success of 1092.11 'checkout orphan then non-orphan': 
+	init_repos &&
 
-ok 5 - using replay to rebase with a conflict
+	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 3650.6 'using replay on bare repo to rebase with a conflict': 
-	test_expect_code 1 git -C bare replay --onto topic1 B..conflict
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 11 - checkout orphan then non-orphan
 
-ok 6 - using replay on bare repo to rebase with a conflict
+expecting success of 1092.12 'add outside sparse cone': 
+	init_repos &&
 
-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
+	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
 
-	git replay --advance main topic1..topic2 >result &&
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+ok 12 - add outside sparse cone
 
-	test_line_count = 1 result &&
+expecting success of 1092.13 'commit including unstaged changes': 
+	init_repos &&
 
-	git log --format=%s $(cut -f 3 -d " " result) >actual &&
-	test_write_lines E D M L B A >expect &&
-	test_cmp expect actual &&
+	write_script edit-file <<-\EOF &&
+	echo $1 >$2
+	EOF
 
-	printf "update refs/heads/main " >expect &&
-	printf "%s " $(cut -f 3 -d " " result) >>expect &&
-	git rev-parse main >>expect &&
+	run_on_all ../edit-file 1 a &&
+	run_on_all ../edit-file 1 deep/a &&
 
-	test_cmp expect result
+	test_all_match git commit -m "-a" -a &&
+	test_all_match git status --porcelain=v2 &&
 
-ok 7 - using replay to perform basic cherry-pick
+	run_on_all ../edit-file 2 a &&
+	run_on_all ../edit-file 2 deep/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
+	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 &&
 
-ok 8 - using replay on bare repo to perform basic cherry-pick
+	run_on_all ../edit-file 3 a &&
+	run_on_all ../edit-file 3 deep/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
+	test_all_match git commit -m "--amend" -a --amend &&
+	test_all_match git status --porcelain=v2
 
-fatal: --onto and --advance are incompatible
-ok 9 - replay on bare repo fails with both --advance and --onto
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 13 - commit including unstaged changes
 
-expecting success of 3650.10 'replay fails when both --advance and --onto are omitted': 
-	test_must_fail git replay topic1..topic2 >result
+expecting success of 1092.14 'status/add: outside sparse cone': 
+	init_repos &&
 
-error: option --onto or --advance is mandatory
-usage: (EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>) <revision-range>...
+	# 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 &&
 
-    --[no-]advance <branch>
-                          make replay advance given branch
-    --[no-]onto <revision>
-                          replay onto given commit
-    --[no-]contained      advance all branches contained in revision-range
+	test_sparse_match git status &&
 
-ok 10 - replay fails when both --advance and --onto are omitted
+	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 3650.11 'using replay to also rebase a contained branch': 
-	git replay --contained --onto main main..topic3 >result &&
+	test_sparse_match git status --porcelain=v2 &&
 
-	test_line_count = 2 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
+	# 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 &&
 
-	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 &&
+	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} &&
 
-	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 &&
+	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}
 
-	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 &&
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+ok 14 - status/add: outside sparse cone
 
-	test_cmp expect result
+expecting success of 1092.15 'checkout and reset --hard': 
+	init_repos &&
 
-ok 11 - using replay to also rebase a contained branch
+	test_all_match git checkout update-folder1 &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	test_all_match git checkout update-deep &&
+	test_all_match git status --porcelain=v2 &&
 
-ok 12 - using replay on bare repo to also rebase a contained branch
+	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 3650.13 'using replay to rebase multiple divergent branches': 
-	git replay --onto main ^topic1 topic2 topic4 >result &&
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 15 - checkout and reset --hard
 
-	test_line_count = 2 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
+expecting success of 1092.16 'diff --cached': 
+	init_repos &&
 
-	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 &&
+	write_script edit-contents <<-\EOF &&
+	echo text >>README.md
+	EOF
+	run_on_all ../edit-contents &&
 
-	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 &&
+	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
 
-	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 &&
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 16 - diff --cached
 
-	test_cmp expect result
+expecting success of 1092.17 'diff with renames and conflicts': 
+	init_repos &&
 
-ok 13 - using replay to rebase multiple divergent branches
+	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 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 &&
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 17 - diff with renames and conflicts
 
-	test_line_count = 4 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
+expecting success of 1092.18 'diff with directory/file conflicts': 
+	init_repos &&
 
-	>expect &&
-	for i in 2 1 3 4
+	for branch in rename-out-to-out \
+		      rename-out-to-in \
+		      rename-in-to-out \
+		      df-conflict-1 \
+		      df-conflict-2 \
+		      fd-conflict
 	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 &&
+		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
 
-	test_cmp expect result &&
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 4a04e79 rename folder1/... to folder2/...
+HEAD is now at d11c5fe rename folder1/... to deep/deeper1/...
+HEAD is now at e5d0f8e rename deep/deeper1/... to folder1/...
+HEAD is now at 974b58d dir to file
+HEAD is now at bef3412 dir to file
+ok 18 - diff with directory/file conflicts
 
-	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 1092.19 'log with pathspec outside sparse definition': 
+	init_repos &&
 
-	for i in 1 2 3 4
+	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 &&
+
+	test_all_match git checkout update-folder1 &&
+	test_all_match git log -- folder1/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 19 - log with pathspec outside sparse definition
+
+expecting success of 1092.20 'blame with pathspec inside sparse definition': 
+	init_repos &&
+
+	for file in a \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
 	do
-		git -C bare log --format=%s $(grep topic$i result | cut -f 3 -d " ") >actual &&
-		test_cmp expect$i actual || return 1
+		test_all_match git blame $file || return 1
 	done
 
-ok 14 - using replay on bare repo to rebase multiple divergent branches, including contained ones
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 20 - blame with pathspec inside sparse definition
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3303-notes-subtrees.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3303-notes-subtrees/.git/
-expecting success of 3303.1 'setup: create 100 commits': 
+expecting success of 1092.21 'blame with pathspec outside sparse definition': 
+	init_repos &&
+	test_sparse_match git sparse-checkout set &&
 
-	(
-		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
+	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
 
-M 644 inline file
-data <<EOF
-file in commit #$nr
-EOF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 21 - blame with pathspec outside sparse definition
 
-INPUT_END
+expecting success of 1092.22 'checkout and reset (mixed)': 
+	init_repos &&
 
-		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
+	test_all_match git checkout -b reset-test update-deep &&
+	test_all_match git reset deepest &&
 
-deleteall
+	# 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
 
-INPUT_END
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+M	folder1/a
+ok 22 - checkout and reset (mixed)
 
-	) |
-	git fast-import --quiet &&
-	git config core.notesRef refs/notes/commits
+expecting success of 1092.23 'checkout and reset (merge)': 
+	init_repos &&
 
-ok 1 - setup: create 100 commits
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-expecting success of 3303.2 'test notes in 2/38-fanout': test_sha1_based "s|^..|&/|"
-ok 2 - test notes in 2/38-fanout
+	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 3303.3 'verify notes in 2/38-fanout': verify_notes
-ok 3 - verify notes in 2/38-fanout
+	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 3303.4 'test notes in 2/2/36-fanout': test_sha1_based "s|^\(..\)\(..\)|\1/\2/|"
-ok 4 - test notes in 2/2/36-fanout
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 23 - checkout and reset (merge)
 
-expecting success of 3303.5 'verify notes in 2/2/36-fanout': verify_notes
-ok 5 - verify notes in 2/2/36-fanout
+expecting success of 1092.24 'checkout and reset (keep)': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	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 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
+	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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 24 - checkout and reset (keep)
 
-expecting success of 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 1092.25 'reset with pathspecs inside sparse definition': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	test_all_match git checkout -b reset-test update-deep &&
+	run_on_all ../edit-contents deep/a &&
 
-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
+	test_all_match git reset base -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	test_all_match git reset base -- nonexistent-file &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	test_all_match git reset deepest -- deep &&
+	test_all_match git status --porcelain=v2
 
-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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 25 - reset with pathspecs inside sparse definition
 
-expecting success of 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 1092.26 'reset with pathspecs outside sparse definition': 
+	init_repos &&
+	test_all_match git checkout -b reset-test base &&
 
-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
+	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 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
+	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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Unstaged changes after reset:
+M	folder1/a
+Unstaged changes after reset:
+M	folder1/a
+M	folder2/a
+ok 26 - reset with pathspecs outside sparse definition
 
-expecting success of 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 1092.27 'reset with wildcard pathspec': 
+	init_repos &&
 
-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
+	test_all_match git reset update-deep -- deep\* &&
+	test_all_match git ls-files -s -- deep &&
 
-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
+	test_all_match git reset deepest -- deep\*\*\* &&
+	test_all_match git ls-files -s -- deep &&
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3510-cherry-pick-sequence.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3510-cherry-pick-sequence/.git/
-expecting success of 3510.1 'setup': 
-	git config 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
+	# The following `git reset`s result in updating the index on files with
+	# `skip-worktree` enabled. To avoid failing due to discrepencies in reported
+	# "modified" files, `test_sparse_match` reset is performed separately from
+	# "full-checkout" reset, then the index contents of all repos are verified.
 
-[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
+	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 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
+	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 &&
 
-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 advice.mergeConflict false"
-ok 2 - cherry-pick persists data on failure
+	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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Unstaged changes after reset:
+M	folder1/a
+Unstaged changes after reset:
+M	folder2/a
+Unstaged changes after reset:
+M	folder2/a
+ok 27 - reset with wildcard pathspec
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 1092.28 'reset hard with removed sparse dir': 
+	init_repos &&
 
-  2fa73e8 unrelatedpick
+	run_on_all git rm -r --sparse folder1 &&
+	test_all_match git status --porcelain=v2 &&
 
-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 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
+	test_all_match git reset --hard &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	folder1/
 	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
+	git -C sparse-index ls-files --sparse folder1 >out &&
+	test_cmp expect out
 
-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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 28 - reset hard with removed sparse dir
 
-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 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)
+expecting success of 1092.29 'update-index modify outside sparse definition': 
+	init_repos &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	msg
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	# 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 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
+	# 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 &&
 
-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 advice.mergeConflict false"
-dropping 55c7d12676e46241f1279640f1bc977feab93361 yetanotherpick -- patch contents already upstream
-ok 6 - cherry-pick persists --empty=drop correctly
+	# 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 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 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 29 - update-index modify outside sparse definition
 
-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 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 1092.30 'update-index --add outside sparse definition': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
 	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
+	# Create folder1, add new file
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/b &&
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-Skipped foo (merged same as existing)
-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)
+	# 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
 
-nothing to commit, working tree clean
-ok 8 - revert persists opts correctly
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 30 - update-index --add outside sparse definition
 
-expecting success of 3510.9 'cherry-pick cleans up sequencer state upon success': 
-	pristine_detach initial &&
-	git cherry-pick initial..picked &&
-	test_path_is_missing .git/sequencer
+expecting success of 1092.31 'update-index --remove outside sparse definition': 
+	init_repos &&
 
-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
+	# 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 3510.10 'cherry-pick --skip requires cherry-pick in progress': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick --skip
+	test_sparse_match git diff-index --cached HEAD &&
 
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
+	# Reset the state
+	test_all_match git reset --hard &&
 
-  a222ac0 picked
-  2b8ae83 unrelatedpick
-  86ee3fa base
+	# 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 &&
 
-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
+	test_sparse_match git diff-index --cached HEAD &&
 
-expecting success of 3510.11 'revert --skip requires revert in progress': 
-	pristine_detach initial &&
-	test_must_fail git revert --skip
+	# Reset the state
+	test_all_match git reset --hard &&
 
-HEAD is now at df2a63d initial
-error: no revert in progress
-fatal: revert failed
-ok 11 - revert --skip requires revert in progress
+	# --force-remove supercedes --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 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
+	test_sparse_match git diff-index --cached 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 advice.mergeConflict false"
-error: no revert in progress
-fatal: revert failed
-ok 12 - cherry-pick --skip to skip commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 31 - update-index --remove outside sparse definition
 
-expecting success of 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
+expecting success of 1092.32 'update-index with directories': 
+	init_repos &&
 
-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 advice.mergeConflict false"
-error: no cherry-pick in progress
-fatal: cherry-pick failed
-ok 13 - revert --skip to skip commit
+	# 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 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
+	# 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
 
-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)
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Ignoring path deep/
+Ignoring path folder1/
+error: folder1: is a directory - add individual files instead
+fatal: Unable to process path folder1
+ok 32 - update-index with directories
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
+expecting success of 1092.33 'update-index --again file outside sparse definition': 
+	init_repos &&
 
-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
+	test_all_match git checkout -b test-reupdate &&
 
-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
+	# Update HEAD without modifying the index to introduce a difference in
+	# folder1/a
+	test_sparse_match git reset --soft update-folder1 &&
 
-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 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 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
+	# 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 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
+	D	folder1/a
 	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
+	test_sparse_match git diff --name-status &&
+	test_cmp expect sparse-checkout-out
 
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 33 - update-index --again file outside sparse definition
 
-  61f8ec3 yetanotherpick
-  612ff5e anotherpick
-  c738c4d unrelatedpick
+expecting success of 1092.34 'update-index --cacheinfo': 
+	init_repos &&
 
-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 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
+	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 3510.17 'selectively advise --skip while launching another sequence': 
-	pristine_detach initial &&
+	test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Cannot add sparse directory, even in sparse index case
+	test_all_match test_must_fail git update-index --add --cacheinfo 040000 $folder2_oid folder2/ &&
+
+	# Sparse match only: the new outside-of-cone entry is added *without* skip-worktree,
+	# so `git status` reports it as "deleted" in the worktree
+	test_sparse_match git update-index --add --cacheinfo 100644 $folder1_a_oid folder1/a &&
+	test_sparse_match git status --porcelain=v2 &&
 	cat >expect <<-EOF &&
-	error: cherry-pick is already in progress
-	hint: try "git cherry-pick (--continue | --skip | --abort | --quit)"
-	fatal: cherry-pick failed
+	MD folder1/a
 	EOF
-	test_must_fail git cherry-pick picked..yetanotherpick &&
-	test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
-	test_cmp expect advice &&
+	test_sparse_match git status --short -- folder1/a &&
+	test_cmp expect sparse-checkout-out &&
+
+	# To return folder1/a to "normal" for a sparse checkout (ignored &
+	# outside-of-cone), add the skip-worktree flag.
+	test_sparse_match git update-index --skip-worktree folder1/a &&
 	cat >expect <<-EOF &&
-	error: cherry-pick is already in progress
-	hint: try "git cherry-pick (--continue | --abort | --quit)"
-	fatal: cherry-pick failed
+	S folder1/a
 	EOF
-	git reset --merge &&
-	test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
-	test_cmp expect advice
+	test_sparse_match git ls-files -t -- folder1/a &&
+	test_cmp expect sparse-checkout-out
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 34 - update-index --cacheinfo
 
-  43fe10f picked
-  c738c4d unrelatedpick
+expecting success of 1092.35 ''read-tree -mu base HEAD update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-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 advice.mergeConflict false"
-ok 17 - selectively advise --skip while launching another sequence
+		# 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 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
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-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 advice.mergeConflict false"
-ok 18 - allow skipping commit but not abort for a new history
+		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 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 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 35 - 'read-tree -mu base HEAD update-folder2' with files outside sparse definition
 
-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 1092.36 ''read-tree -mu update-folder1 update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-expecting success of 3510.20 '--quit does not complain when no cherry-pick is in progress': 
-	pristine_detach initial &&
-	git cherry-pick --quit
+		# 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 &&
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-  f847cb0 base
-  44a5ca1 untrack unrelated
+		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
+		test_all_match git status --porcelain=v2 &&
+		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
+		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
 
-HEAD is now at df2a63d initial
-ok 20 - --quit does not complain when no cherry-pick is in progress
+	
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 36 - 'read-tree -mu update-folder1 update-folder2' with files outside sparse definition
 
-expecting success of 3510.21 '--abort requires cherry-pick in progress': 
-	pristine_detach initial &&
-	test_must_fail git cherry-pick --abort
+expecting success of 1092.37 ''read-tree -mu update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-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
+		# 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 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
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-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 advice.mergeConflict false"
-ok 22 - --quit cleans up sequencer state
+		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 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
+	
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 37 - 'read-tree -mu update-folder2' with files outside sparse definition
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 1092.38 'read-tree --merge with edit/edit conflicts in sparse directories': 
+	init_repos &&
 
-  c738c4d unrelatedpick
+	# 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 &&
 
-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 advice.mergeConflict false"
-foo: needs merge
-ok 23 - --quit keeps HEAD and conflicted index intact
+	test_all_match git reset --hard &&
 
-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
+	test_all_match git read-tree -mu rename-base update-folder2 &&
+	test_all_match git status --porcelain=v2 &&
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	test_all_match git reset --hard &&
 
-  c738c4d unrelatedpick
+	test_all_match test_must_fail git read-tree -mu base update-folder1 rename-out-to-in &&
+	test_all_match test_must_fail git read-tree -mu rename-out-to-in update-folder1
 
-HEAD is now at 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 advice.mergeConflict false"
-ok 24 - --abort to cancel multiple cherry-pick
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 38 - read-tree --merge with edit/edit conflicts in sparse directories
 
-expecting success of 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
+expecting success of 1092.39 'read-tree --prefix': 
+	init_repos &&
 
-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 advice.mergeConflict false"
-ok 25 - --abort to cancel single cherry-pick
+	# 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 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
+	# 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 &&
 
-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 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
+	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 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
+	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
 
-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 advice.mergeConflict false"
-ok 27 - cherry-pick --abort to cancel multiple revert
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 39 - read-tree --prefix
 
-expecting success of 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
+expecting success of 1092.40 'read-tree --merge with directory-file conflicts': 
+	init_repos &&
 
-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 advice.mergeConflict false"
-ok 28 - revert --abort works, too
+	test_all_match git checkout -b test-branch rename-base &&
 
-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
+	# 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 &&
 
-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 advice.mergeConflict false"
-ok 29 - --abort to cancel single revert
+	test_sparse_match git read-tree --reset -u HEAD &&
+	test_sparse_match git status --porcelain=v2 &&
 
-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
+	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
 
-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 advice.mergeConflict false"
-ok 30 - --abort keeps unrelated change, easy case
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 40 - read-tree --merge with directory-file conflicts
 
-expecting success of 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 &&
+expecting success of 1092.41 'merge, cherry-pick, and rebase': 
+	init_repos &&
 
-	git checkout unrelated &&
-	git cherry-pick --abort &&
-	test_cmp_rev initial HEAD
+	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
 
-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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 41 - merge, cherry-pick, and rebase
 
-expecting success of 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
+expecting success of 1092.42 'merge with conflict outside cone': 
+	init_repos &&
 
-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 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
+	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 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
+	# 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 &&
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+	# 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 &&
 
-  9781982 picked
-  c738c4d unrelatedpick
+	# 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 &&
 
-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 advice.mergeConflict false"
-ok 33 - --abort after last commit in sequence
+	test_all_match git merge --continue &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git rev-parse HEAD^{tree}
 
-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 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+ok 42 - merge with conflict outside cone
 
-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 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 1092.43 'cherry-pick/rebase with conflict outside cone': 
+	init_repos &&
 
-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
+	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 &&
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+		# 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 &&
 
-  c738c4d unrelatedpick
+		# 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 &&
 
-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
+		# 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 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
+		test_all_match git $OPERATION --continue &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	done
 
-HEAD is now at 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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+ok 43 - cherry-pick/rebase with conflict outside cone
 
-expecting success of 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 &&
+expecting success of 1092.44 'merge with outside renames': 
+	init_repos &&
 
-	test_cmp expect foo &&
-	test_cmp_rev initial HEAD^ &&
-	git diff --exit-code HEAD &&
-	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
+	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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 44 - merge with outside renames
 
-  c738c4d unrelatedpick
+expecting success of 1092.45 'cherry-pick with conflicts': 
+	init_repos &&
 
-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 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
+	write_script edit-conflict <<-\EOF &&
+	echo $1 >conflict
+	EOF
 
-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 &&
+	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" &&
 
-	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
+	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" &&
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	test_all_match test_must_fail git cherry-pick to-cherry-pick
 
-  9aabd79 picked
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 45 - cherry-pick with conflicts
 
-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 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 1092.46 'stash': 
+	init_repos &&
 
-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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
 	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:
+	# 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 &&
 
-  267eac8 Revert "picked"
+	# Apply the sparse directory stash without reinstating the index
+	test_all_match git stash apply -q &&
+	test_all_match git status --porcelain=v2 &&
 
-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 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
+	# 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 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
+	# Apply the sparse directory stash *with* reinstating the index
+	test_all_match git stash apply --index -q &&
+	test_all_match git status --porcelain=v2 &&
 
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
+	# 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 &&
 
-  3b1768d anotherpick
-  43fe10f picked
-  c738c4d unrelatedpick
+	# 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 &&
 
-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 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
+	# Reset to base branch
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git reset --hard base &&
 
-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 &&
+	# Stash & unstash an untracked file outside of the sparse checkout
+	# definition.
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/new &&
+	test_all_match git stash -u &&
+	test_all_match git status --porcelain=v2 &&
 
-	test_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
+	test_all_match git stash pop -q &&
+	test_all_match git status --porcelain=v2
 
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 46 - stash
 
-  3b1768d anotherpick
-  43fe10f picked
-  c738c4d unrelatedpick
+expecting success of 1092.47 'checkout-index inside sparse definition': 
+	init_repos &&
 
-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 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)
+	run_on_all rm -f deep/a &&
+	test_all_match git checkout-index -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	msg
+	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
 
-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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 47 - checkout-index inside sparse definition
 
-expecting success of 3510.42 'follow advice and skip nil patch': 
-	pristine_detach conflicting &&
-	test_must_fail git cherry-pick initial..picked &&
+expecting success of 1092.48 'checkout-index outside sparse definition': 
+	init_repos &&
 
-	git checkout HEAD -- unrelated &&
-	test_must_fail git cherry-pick --continue &&
-	git reset &&
-	git cherry-pick --continue &&
+	# 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 &&
 
-	git rev-list initial..HEAD >commits &&
-	test_line_count = 3 commits
+	# 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 &&
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	run_on_sparse rm -rf folder1 &&
+	echo test >new-a &&
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all cp ../new-a folder1/a &&
 
-  838794c base
+	test_all_match test_must_fail git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
+	test_all_match git checkout-index -f --ignore-skip-worktree-bits -- folder1/a &&
+	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
+	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a
 
-HEAD is now at 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 advice.mergeConflict false"
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+git checkout-index: folder1/a has skip-worktree enabled; use '--ignore-skip-worktree-bits' to checkout
+ok 48 - checkout-index outside sparse definition
 
-    git commit --allow-empty
+expecting success of 1092.49 'checkout-index with folders': 
+	init_repos &&
 
-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)
+	# Inside checkout definition
+	test_all_match test_must_fail git checkout-index -f -- deep/ &&
 
-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
+	# 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 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
+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-01-30 02:09:32.271304740 +0000
++++ sparse-index-err	2025-01-30 02:09:32.347305196 +0000
+@@ -1 +1 @@
+-git checkout-index: folder1/ is not in the cache
++git checkout-index: folder1/ is a sparse directory
+git checkout-index: folder1/ is a sparse directory
+ok 49 - checkout-index with folders
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+expecting success of 1092.50 'checkout-index --all': 
+	init_repos &&
 
-  fef14ec picked
-  838794c base
+	test_all_match git checkout-index --all &&
+	test_sparse_match test_path_is_missing folder1 &&
 
-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 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
+	# --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 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
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 50 - checkout-index --all
 
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
+expecting success of 1092.51 'clean': 
+	init_repos &&
 
-  3834c90 anotherpick
-  4d735ac picked
-  a731ebf unrelatedpick
+	echo bogus >>.gitignore &&
+	run_on_all cp ../.gitignore . &&
+	test_all_match git add .gitignore &&
+	test_all_match git commit -m "ignore bogus files" &&
 
-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 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
+	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 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
+	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 &&
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	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 &&
 
-  775318b picked
+	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 &&
 
-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 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
+	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 &&
 
-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
+	test_sparse_match test_path_is_dir folder1
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 51 - clean
 
-  d310f74 anotherpick
-  775318b picked
+expecting success of 1092.52 'show (cached blobs/trees)': 
+		init_repos &&
 
-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 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
+		test_all_match git show :a &&
+		test_all_match git show :deep/a &&
+		test_sparse_match git show :folder1/a &&
 
-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 &&
+		# 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/ &&
 
-	git diff --exit-code HEAD &&
-	test_cmp_rev initial HEAD^^ &&
-	git cat-file commit HEAD^ >msg &&
-	! grep Signed-off-by: msg
+		# Change the sparse cone for an extra case:
+		run_on_sparse git sparse-checkout set deep/deeper1 &&
 
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
+		# deep/deeper2 is a sparse directory in the sparse index.
+		test_sparse_match test_must_fail git show :deep/deeper2/ &&
 
-  cf7cfba anotherpick
-  f7bab3d picked
-  9b2cda6 unrelatedpick
+		# deep/deeper2/deepest is not in the sparse index, but
+		# will trigger an index expansion.
+		test_sparse_match test_must_fail git show :deep/deeper2/deepest/
+	
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+fatal: path 'folder1/' exists on disk, but not in the index
+ok 52 - show (cached blobs/trees)
 
-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 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
+expecting success of 1092.53 'rev-parse (cached blobs/trees)': 
+		init_repos &&
 
-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 &&
+		test_all_match git rev-parse :a &&
+		test_all_match git rev-parse :deep/a &&
+		test_sparse_match git rev-parse :folder1/a &&
 
-	git diff --exit-code HEAD &&
-	test_cmp_rev initial HEAD^ &&
-	git cat-file commit HEAD >msg &&
-	! grep Signed-off-by: msg
+		# 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/ &&
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+		# Change the sparse cone for an extra case:
+		run_on_sparse git sparse-checkout set deep/deeper1 &&
 
-  d9a8514 anotherpick
-  c80a680 picked
+		# deep/deeper2 is a sparse directory in the sparse index.
+		test_sparse_match test_must_fail git rev-parse :deep/deeper2/ &&
 
-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 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
+		# deep/deeper2/deepest is not in the sparse index, but
+		# will trigger an index expansion.
+		test_sparse_match test_must_fail git rev-parse :deep/deeper2/deepest/
+	
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+fatal: path 'folder1/' exists on disk, but not in the index
+:folder1/
+ok 53 - rev-parse (cached blobs/trees)
 
-expecting success of 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
+expecting success of 1092.54 'submodule handling': 
+	init_repos &&
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	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" &&
 
-  c80a680 picked
+	test_config_global protocol.file.allow always &&
 
-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 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
+	run_on_all git submodule add "$(pwd)/initial-repo" modules/sub &&
+	test_all_match git commit -m "add submodule" &&
 
-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
+	# 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
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	modules/a
+160000 703fd3e56687611d5c0264e6f007e18e96f794bf 0	modules/sub
+ok 54 - submodule handling
 
-  9781982 picked
-  c738c4d unrelatedpick
+expecting success of 1092.55 'sparse-index is expanded and converted back': 
+	init_repos &&
 
-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 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
+	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 3510.51 'empty commit set (no commits to walk)': 
-	pristine_detach initial &&
-	test_expect_code 128 git cherry-pick base..base
+	# 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
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+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":"20250130T020944.306099Z-H5c947e1c-P001a968a","thread":"main","time":"2025-01-30T02:09:44.316783Z","file":"sparse-index.c","line":235,"repo":1,"nesting":1,"category":"index","label":"convert_to_sparse"}
+{"event":"region_leave","sid":"20250130T020944.306099Z-H5c947e1c-P001a968a","thread":"main","time":"2025-01-30T02:09:44.316919Z","file":"sparse-index.c","line":249,"repo":1,"t_rel":0.000135,"nesting":1,"category":"index","label":"convert_to_sparse"}
+{"event":"region_enter","sid":"20250130T020944.306099Z-H5c947e1c-P001a968a","thread":"main","time":"2025-01-30T02:09:44.315596Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250130T020944.306099Z-H5c947e1c-P001a968a","thread":"main","time":"2025-01-30T02:09:44.317221Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250130T020944.306099Z-H5c947e1c-P001a968a","thread":"main","time":"2025-01-30T02:09:44.316332Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000736,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250130T020944.306099Z-H5c947e1c-P001a968a","thread":"main","time":"2025-01-30T02:09:44.317389Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000167,"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":"20250130T020944.423768Z-H5c947e1c-P001a96f1","thread":"main","time":"2025-01-30T02:09:44.424694Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250130T020944.423768Z-H5c947e1c-P001a96f1","thread":"main","time":"2025-01-30T02:09:44.425550Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000855,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 55 - sparse-index is expanded and converted back
 
-  9781982 picked
-  c738c4d unrelatedpick
+expecting success of 1092.56 'index.sparse disabled inline uses full index': 
+	init_repos &&
 
-HEAD is now at df2a63d initial
-error: empty commit set passed
-fatal: cherry-pick failed
-ok 51 - empty commit set (no commits to walk)
+	# 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 3510.52 'empty commit set (culled during walk)': 
-	pristine_detach initial &&
-	test_expect_code 128 git cherry-pick -2 --author=no.such.author base
+	# 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 &&
 
-HEAD is now at df2a63d initial
-error: empty commit set passed
-fatal: cherry-pick failed
-ok 52 - empty commit set (culled during walk)
+	# 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 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 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.
 
-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 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
+nothing to commit, working tree clean
+{"event":"region_enter","sid":"20250130T020944.798016Z-H5c947e1c-P001a9839","thread":"main","time":"2025-01-30T02:09:44.798886Z","file":"sparse-index.c","line":369,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250130T020944.798016Z-H5c947e1c-P001a9839","thread":"main","time":"2025-01-30T02:09:44.803843Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.004957,"nesting":2,"category":"index","label":"ensure_full_index"}
+On branch base
+You are in a sparse checkout.
 
-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
+nothing to commit, working tree clean
+{"event":"region_enter","sid":"20250130T020944.903754Z-H5c947e1c-P001a988a","thread":"main","time":"2025-01-30T02:09:44.904506Z","file":"sparse-index.c","line":235,"repo":1,"nesting":2,"category":"index","label":"convert_to_sparse"}
+{"event":"region_leave","sid":"20250130T020944.903754Z-H5c947e1c-P001a988a","thread":"main","time":"2025-01-30T02:09:44.904692Z","file":"sparse-index.c","line":249,"repo":1,"t_rel":0.000187,"nesting":2,"category":"index","label":"convert_to_sparse"}
+On branch base
+You are in a sparse checkout.
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+nothing to commit, working tree clean
+ok 56 - index.sparse disabled inline uses full index
 
-  9781982 picked
-  c738c4d unrelatedpick
+expecting success of 1092.57 'sparse-index is not expanded': 
+	init_repos &&
 
-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 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
+	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 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
+	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 . &&
 
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
+	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 &&
 
-  3b1768d anotherpick
-  43fe10f picked
-  c738c4d unrelatedpick
+	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 &&
 
-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 advice.mergeConflict false"
-[detached HEAD 43fe10f] picked
+	ensure_not_expanded reset base -- deep/a &&
+	ensure_not_expanded reset base -- nonexistent-file &&
+	ensure_not_expanded reset deepest -- deep &&
+
+	# Although folder1 is outside the sparse definition, it exists as a
+	# directory entry in the index, so the pathspec will not force the
+	# index to be expanded.
+	ensure_not_expanded reset deepest -- folder1 &&
+	ensure_not_expanded reset deepest -- folder1/ &&
+
+	# Wildcard identifies only in-cone files, no index expansion
+	ensure_not_expanded reset deepest -- deep/\* &&
+
+	# Wildcard identifies only full sparse directories, no index expansion
+	ensure_not_expanded reset deepest -- folder\* &&
+
+	ensure_not_expanded clean -fd &&
+
+	ensure_not_expanded checkout -f update-deep &&
+	test_config -C sparse-index pull.twohead ort &&
+	(
+		sane_unset GIT_TEST_MERGE_ALGORITHM &&
+		for OPERATION in "merge -m merge" cherry-pick rebase
+		do
+			ensure_not_expanded merge -m merge update-folder1 &&
+			ensure_not_expanded merge -m merge update-folder2 || return 1
+		done
+	)
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 57 - sparse-index is not expanded
+
+expecting success of 1092.58 'sparse-index is not expanded: merge conflict in cone': 
+	init_repos &&
+
+	for side in right left
+	do
+		git -C sparse-index checkout -b expand-$side base &&
+		echo $side >sparse-index/deep/a &&
+		git -C sparse-index commit -a -m "$side" || return 1
+	done &&
+
+	(
+		sane_unset GIT_TEST_MERGE_ALGORITHM &&
+		git -C sparse-index config pull.twohead ort &&
+		ensure_not_expanded ! merge -m merged expand-right
+	)
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Switched to a new branch 'expand-right'
+[expand-right 5ebbff9] right
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
  1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 3b1768d] anotherpick
+Switched to a new branch 'expand-left'
+[expand-left 9bcd6b8] left
  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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t0027-auto-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0027-auto-crlf/.git/
-expecting success of 0027.1 'ls-files --eol -o Text/Binary': 
-	test_when_finished "rm expect actual TeBi_*" &&
-	STRT=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA &&
-	STR=$STRT$STRT$STRT$STRT &&
-	printf "${STR}BBB\001" >TeBi_127_S &&
-	printf "${STR}BBBB\001">TeBi_128_S &&
-	printf "${STR}BBB\032" >TeBi_127_E &&
-	printf "\032${STR}BBB" >TeBi_E_127 &&
-	printf "${STR}BBBB\000">TeBi_128_N &&
-	printf "${STR}BBB\012">TeBi_128_L &&
-	printf "${STR}BBB\015">TeBi_127_C &&
-	printf "${STR}BB\015\012" >TeBi_126_CL &&
-	printf "${STR}BB\015\012\015" >TeBi_126_CLC &&
-	sort <<-\EOF >expect &&
-	i/ w/-text TeBi_127_S
-	i/ w/none TeBi_128_S
-	i/ w/none TeBi_127_E
-	i/ w/-text TeBi_E_127
-	i/ w/-text TeBi_128_N
-	i/ w/lf TeBi_128_L
-	i/ w/-text TeBi_127_C
-	i/ w/crlf TeBi_126_CL
-	i/ w/-text TeBi_126_CLC
-	EOF
-	git ls-files --eol -o >tmp &&
-	sed -n -e "/TeBi_/{s!attr/[	]*!!g
-	s!	! !g
-	s!  *! !g
-	p
-	}" tmp | sort >actual &&
-	test_cmp expect actual
+ok 58 - sparse-index is not expanded: merge conflict in cone
 
-ok 1 - ls-files --eol -o Text/Binary
+expecting success of 1092.59 'sparse-index is not expanded: stash': 
+	init_repos &&
 
-expecting success of 0027.2 'setup main': 
-	echo >.gitattributes &&
-	git checkout -b main &&
-	git add .gitattributes &&
-	git commit -m "add .gitattributes" . &&
-	printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\nLINETWO\nLINETHREE"     >LF &&
-	printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONE\r\nLINETWO\r\nLINETHREE" >CRLF &&
-	printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\r\nLINETWO\nLINETHREE"   >CRLF_mix_LF &&
-	printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\nLINETWO\rLINETHREE"     >LF_mix_CR &&
-	printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONE\r\nLINETWO\rLINETHREE"   >CRLF_mix_CR &&
-	printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONEQ\r\nLINETWO\r\nLINETHREE" | q_to_nul >CRLF_nul &&
-	printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONEQ\nLINETWO\nLINETHREE" | q_to_nul >LF_nul &&
-	create_NNO_MIX_files &&
-	git -c core.autocrlf=false add NNO_*.txt MIX_*.txt &&
-	git commit -m "mixed line endings" &&
-	test_tick
+	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} &&
 
-Switched to a new branch 'main'
-[main (root-commit) 92d411f] add .gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 .gitattributes
-[main 28e6523] mixed line endings
- Author: A U Thor <author@example.com>
- 360 files changed, 1260 insertions(+)
- create mode 100644 MIX_attr_-text_aeol__false_CRLF.txt
- create mode 100644 MIX_attr_-text_aeol__false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_-text_aeol__false_CRLF_nul.txt
- create mode 100644 MIX_attr_-text_aeol__false_LF.txt
- create mode 100644 MIX_attr_-text_aeol__false_LF_mix_CR.txt
- create mode 100644 MIX_attr_-text_aeol__input_CRLF.txt
- create mode 100644 MIX_attr_-text_aeol__input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_-text_aeol__input_CRLF_nul.txt
- create mode 100644 MIX_attr_-text_aeol__input_LF.txt
- create mode 100644 MIX_attr_-text_aeol__input_LF_mix_CR.txt
- create mode 100644 MIX_attr_-text_aeol__true_CRLF.txt
- create mode 100644 MIX_attr_-text_aeol__true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_-text_aeol__true_CRLF_nul.txt
- create mode 100644 MIX_attr_-text_aeol__true_LF.txt
- create mode 100644 MIX_attr_-text_aeol__true_LF_mix_CR.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_false_CRLF.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_false_CRLF_nul.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_false_LF.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_false_LF_mix_CR.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_input_CRLF.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_input_CRLF_nul.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_input_LF.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_input_LF_mix_CR.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_true_CRLF.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_true_CRLF_nul.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_true_LF.txt
- create mode 100644 MIX_attr_-text_aeol_crlf_true_LF_mix_CR.txt
- create mode 100644 MIX_attr_-text_aeol_lf_false_CRLF.txt
- create mode 100644 MIX_attr_-text_aeol_lf_false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_-text_aeol_lf_false_CRLF_nul.txt
- create mode 100644 MIX_attr_-text_aeol_lf_false_LF.txt
- create mode 100644 MIX_attr_-text_aeol_lf_false_LF_mix_CR.txt
- create mode 100644 MIX_attr_-text_aeol_lf_input_CRLF.txt
- create mode 100644 MIX_attr_-text_aeol_lf_input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_-text_aeol_lf_input_CRLF_nul.txt
- create mode 100644 MIX_attr_-text_aeol_lf_input_LF.txt
- create mode 100644 MIX_attr_-text_aeol_lf_input_LF_mix_CR.txt
- create mode 100644 MIX_attr_-text_aeol_lf_true_CRLF.txt
- create mode 100644 MIX_attr_-text_aeol_lf_true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_-text_aeol_lf_true_CRLF_nul.txt
- create mode 100644 MIX_attr_-text_aeol_lf_true_LF.txt
- create mode 100644 MIX_attr_-text_aeol_lf_true_LF_mix_CR.txt
- create mode 100644 MIX_attr__aeol__false_CRLF.txt
- create mode 100644 MIX_attr__aeol__false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr__aeol__false_CRLF_nul.txt
- create mode 100644 MIX_attr__aeol__false_LF.txt
- create mode 100644 MIX_attr__aeol__false_LF_mix_CR.txt
- create mode 100644 MIX_attr__aeol__input_CRLF.txt
- create mode 100644 MIX_attr__aeol__input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr__aeol__input_CRLF_nul.txt
- create mode 100644 MIX_attr__aeol__input_LF.txt
- create mode 100644 MIX_attr__aeol__input_LF_mix_CR.txt
- create mode 100644 MIX_attr__aeol__true_CRLF.txt
- create mode 100644 MIX_attr__aeol__true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr__aeol__true_CRLF_nul.txt
- create mode 100644 MIX_attr__aeol__true_LF.txt
- create mode 100644 MIX_attr__aeol__true_LF_mix_CR.txt
- create mode 100644 MIX_attr__aeol_crlf_false_CRLF.txt
- create mode 100644 MIX_attr__aeol_crlf_false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr__aeol_crlf_false_CRLF_nul.txt
- create mode 100644 MIX_attr__aeol_crlf_false_LF.txt
- create mode 100644 MIX_attr__aeol_crlf_false_LF_mix_CR.txt
- create mode 100644 MIX_attr__aeol_crlf_input_CRLF.txt
- create mode 100644 MIX_attr__aeol_crlf_input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr__aeol_crlf_input_CRLF_nul.txt
- create mode 100644 MIX_attr__aeol_crlf_input_LF.txt
- create mode 100644 MIX_attr__aeol_crlf_input_LF_mix_CR.txt
- create mode 100644 MIX_attr__aeol_crlf_true_CRLF.txt
- create mode 100644 MIX_attr__aeol_crlf_true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr__aeol_crlf_true_CRLF_nul.txt
- create mode 100644 MIX_attr__aeol_crlf_true_LF.txt
- create mode 100644 MIX_attr__aeol_crlf_true_LF_mix_CR.txt
- create mode 100644 MIX_attr__aeol_lf_false_CRLF.txt
- create mode 100644 MIX_attr__aeol_lf_false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr__aeol_lf_false_CRLF_nul.txt
- create mode 100644 MIX_attr__aeol_lf_false_LF.txt
- create mode 100644 MIX_attr__aeol_lf_false_LF_mix_CR.txt
- create mode 100644 MIX_attr__aeol_lf_input_CRLF.txt
- create mode 100644 MIX_attr__aeol_lf_input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr__aeol_lf_input_CRLF_nul.txt
- create mode 100644 MIX_attr__aeol_lf_input_LF.txt
- create mode 100644 MIX_attr__aeol_lf_input_LF_mix_CR.txt
- create mode 100644 MIX_attr__aeol_lf_true_CRLF.txt
- create mode 100644 MIX_attr__aeol_lf_true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr__aeol_lf_true_CRLF_nul.txt
- create mode 100644 MIX_attr__aeol_lf_true_LF.txt
- create mode 100644 MIX_attr__aeol_lf_true_LF_mix_CR.txt
- create mode 100644 MIX_attr_auto_aeol__false_CRLF.txt
- create mode 100644 MIX_attr_auto_aeol__false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_auto_aeol__false_CRLF_nul.txt
- create mode 100644 MIX_attr_auto_aeol__false_LF.txt
- create mode 100644 MIX_attr_auto_aeol__false_LF_mix_CR.txt
- create mode 100644 MIX_attr_auto_aeol__input_CRLF.txt
- create mode 100644 MIX_attr_auto_aeol__input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_auto_aeol__input_CRLF_nul.txt
- create mode 100644 MIX_attr_auto_aeol__input_LF.txt
- create mode 100644 MIX_attr_auto_aeol__input_LF_mix_CR.txt
- create mode 100644 MIX_attr_auto_aeol__true_CRLF.txt
- create mode 100644 MIX_attr_auto_aeol__true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_auto_aeol__true_CRLF_nul.txt
- create mode 100644 MIX_attr_auto_aeol__true_LF.txt
- create mode 100644 MIX_attr_auto_aeol__true_LF_mix_CR.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_false_CRLF.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_false_CRLF_nul.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_false_LF.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_false_LF_mix_CR.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_input_CRLF.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_input_CRLF_nul.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_input_LF.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_input_LF_mix_CR.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_true_CRLF.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_true_CRLF_nul.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_true_LF.txt
- create mode 100644 MIX_attr_auto_aeol_crlf_true_LF_mix_CR.txt
- create mode 100644 MIX_attr_auto_aeol_lf_false_CRLF.txt
- create mode 100644 MIX_attr_auto_aeol_lf_false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_auto_aeol_lf_false_CRLF_nul.txt
- create mode 100644 MIX_attr_auto_aeol_lf_false_LF.txt
- create mode 100644 MIX_attr_auto_aeol_lf_false_LF_mix_CR.txt
- create mode 100644 MIX_attr_auto_aeol_lf_input_CRLF.txt
- create mode 100644 MIX_attr_auto_aeol_lf_input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_auto_aeol_lf_input_CRLF_nul.txt
- create mode 100644 MIX_attr_auto_aeol_lf_input_LF.txt
- create mode 100644 MIX_attr_auto_aeol_lf_input_LF_mix_CR.txt
- create mode 100644 MIX_attr_auto_aeol_lf_true_CRLF.txt
- create mode 100644 MIX_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_auto_aeol_lf_true_CRLF_nul.txt
- create mode 100644 MIX_attr_auto_aeol_lf_true_LF.txt
- create mode 100644 MIX_attr_auto_aeol_lf_true_LF_mix_CR.txt
- create mode 100644 MIX_attr_text_aeol__false_CRLF.txt
- create mode 100644 MIX_attr_text_aeol__false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_text_aeol__false_CRLF_nul.txt
- create mode 100644 MIX_attr_text_aeol__false_LF.txt
- create mode 100644 MIX_attr_text_aeol__false_LF_mix_CR.txt
- create mode 100644 MIX_attr_text_aeol__input_CRLF.txt
- create mode 100644 MIX_attr_text_aeol__input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_text_aeol__input_CRLF_nul.txt
- create mode 100644 MIX_attr_text_aeol__input_LF.txt
- create mode 100644 MIX_attr_text_aeol__input_LF_mix_CR.txt
- create mode 100644 MIX_attr_text_aeol__true_CRLF.txt
- create mode 100644 MIX_attr_text_aeol__true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_text_aeol__true_CRLF_nul.txt
- create mode 100644 MIX_attr_text_aeol__true_LF.txt
- create mode 100644 MIX_attr_text_aeol__true_LF_mix_CR.txt
- create mode 100644 MIX_attr_text_aeol_crlf_false_CRLF.txt
- create mode 100644 MIX_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_text_aeol_crlf_false_CRLF_nul.txt
- create mode 100644 MIX_attr_text_aeol_crlf_false_LF.txt
- create mode 100644 MIX_attr_text_aeol_crlf_false_LF_mix_CR.txt
- create mode 100644 MIX_attr_text_aeol_crlf_input_CRLF.txt
- create mode 100644 MIX_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_text_aeol_crlf_input_CRLF_nul.txt
- create mode 100644 MIX_attr_text_aeol_crlf_input_LF.txt
- create mode 100644 MIX_attr_text_aeol_crlf_input_LF_mix_CR.txt
- create mode 100644 MIX_attr_text_aeol_crlf_true_CRLF.txt
- create mode 100644 MIX_attr_text_aeol_crlf_true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_text_aeol_crlf_true_CRLF_nul.txt
- create mode 100644 MIX_attr_text_aeol_crlf_true_LF.txt
- create mode 100644 MIX_attr_text_aeol_crlf_true_LF_mix_CR.txt
- create mode 100644 MIX_attr_text_aeol_lf_false_CRLF.txt
- create mode 100644 MIX_attr_text_aeol_lf_false_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_text_aeol_lf_false_CRLF_nul.txt
- create mode 100644 MIX_attr_text_aeol_lf_false_LF.txt
- create mode 100644 MIX_attr_text_aeol_lf_false_LF_mix_CR.txt
- create mode 100644 MIX_attr_text_aeol_lf_input_CRLF.txt
- create mode 100644 MIX_attr_text_aeol_lf_input_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_text_aeol_lf_input_CRLF_nul.txt
- create mode 100644 MIX_attr_text_aeol_lf_input_LF.txt
- create mode 100644 MIX_attr_text_aeol_lf_input_LF_mix_CR.txt
- create mode 100644 MIX_attr_text_aeol_lf_true_CRLF.txt
- create mode 100644 MIX_attr_text_aeol_lf_true_CRLF_mix_LF.txt
- create mode 100644 MIX_attr_text_aeol_lf_true_CRLF_nul.txt
- create mode 100644 MIX_attr_text_aeol_lf_true_LF.txt
- create mode 100644 MIX_attr_text_aeol_lf_true_LF_mix_CR.txt
- create mode 100644 NNO_attr_-text_aeol__false_CRLF.txt
- create mode 100644 NNO_attr_-text_aeol__false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_-text_aeol__false_CRLF_nul.txt
- create mode 100644 NNO_attr_-text_aeol__false_LF.txt
- create mode 100644 NNO_attr_-text_aeol__false_LF_mix_CR.txt
- create mode 100644 NNO_attr_-text_aeol__input_CRLF.txt
- create mode 100644 NNO_attr_-text_aeol__input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_-text_aeol__input_CRLF_nul.txt
- create mode 100644 NNO_attr_-text_aeol__input_LF.txt
- create mode 100644 NNO_attr_-text_aeol__input_LF_mix_CR.txt
- create mode 100644 NNO_attr_-text_aeol__true_CRLF.txt
- create mode 100644 NNO_attr_-text_aeol__true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_-text_aeol__true_CRLF_nul.txt
- create mode 100644 NNO_attr_-text_aeol__true_LF.txt
- create mode 100644 NNO_attr_-text_aeol__true_LF_mix_CR.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_false_CRLF.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_false_CRLF_nul.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_false_LF.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_false_LF_mix_CR.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_input_CRLF.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_input_CRLF_nul.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_input_LF.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_true_CRLF.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_true_CRLF_nul.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_true_LF.txt
- create mode 100644 NNO_attr_-text_aeol_crlf_true_LF_mix_CR.txt
- create mode 100644 NNO_attr_-text_aeol_lf_false_CRLF.txt
- create mode 100644 NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_-text_aeol_lf_false_CRLF_nul.txt
- create mode 100644 NNO_attr_-text_aeol_lf_false_LF.txt
- create mode 100644 NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt
- create mode 100644 NNO_attr_-text_aeol_lf_input_CRLF.txt
- create mode 100644 NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_-text_aeol_lf_input_CRLF_nul.txt
- create mode 100644 NNO_attr_-text_aeol_lf_input_LF.txt
- create mode 100644 NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt
- create mode 100644 NNO_attr_-text_aeol_lf_true_CRLF.txt
- create mode 100644 NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_-text_aeol_lf_true_CRLF_nul.txt
- create mode 100644 NNO_attr_-text_aeol_lf_true_LF.txt
- create mode 100644 NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt
- create mode 100644 NNO_attr__aeol__false_CRLF.txt
- create mode 100644 NNO_attr__aeol__false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr__aeol__false_CRLF_nul.txt
- create mode 100644 NNO_attr__aeol__false_LF.txt
- create mode 100644 NNO_attr__aeol__false_LF_mix_CR.txt
- create mode 100644 NNO_attr__aeol__input_CRLF.txt
- create mode 100644 NNO_attr__aeol__input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr__aeol__input_CRLF_nul.txt
- create mode 100644 NNO_attr__aeol__input_LF.txt
- create mode 100644 NNO_attr__aeol__input_LF_mix_CR.txt
- create mode 100644 NNO_attr__aeol__true_CRLF.txt
- create mode 100644 NNO_attr__aeol__true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr__aeol__true_CRLF_nul.txt
- create mode 100644 NNO_attr__aeol__true_LF.txt
- create mode 100644 NNO_attr__aeol__true_LF_mix_CR.txt
- create mode 100644 NNO_attr__aeol_crlf_false_CRLF.txt
- create mode 100644 NNO_attr__aeol_crlf_false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr__aeol_crlf_false_CRLF_nul.txt
- create mode 100644 NNO_attr__aeol_crlf_false_LF.txt
- create mode 100644 NNO_attr__aeol_crlf_false_LF_mix_CR.txt
- create mode 100644 NNO_attr__aeol_crlf_input_CRLF.txt
- create mode 100644 NNO_attr__aeol_crlf_input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr__aeol_crlf_input_CRLF_nul.txt
- create mode 100644 NNO_attr__aeol_crlf_input_LF.txt
- create mode 100644 NNO_attr__aeol_crlf_input_LF_mix_CR.txt
- create mode 100644 NNO_attr__aeol_crlf_true_CRLF.txt
- create mode 100644 NNO_attr__aeol_crlf_true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr__aeol_crlf_true_CRLF_nul.txt
- create mode 100644 NNO_attr__aeol_crlf_true_LF.txt
- create mode 100644 NNO_attr__aeol_crlf_true_LF_mix_CR.txt
- create mode 100644 NNO_attr__aeol_lf_false_CRLF.txt
- create mode 100644 NNO_attr__aeol_lf_false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr__aeol_lf_false_CRLF_nul.txt
- create mode 100644 NNO_attr__aeol_lf_false_LF.txt
- create mode 100644 NNO_attr__aeol_lf_false_LF_mix_CR.txt
- create mode 100644 NNO_attr__aeol_lf_input_CRLF.txt
- create mode 100644 NNO_attr__aeol_lf_input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr__aeol_lf_input_CRLF_nul.txt
- create mode 100644 NNO_attr__aeol_lf_input_LF.txt
- create mode 100644 NNO_attr__aeol_lf_input_LF_mix_CR.txt
- create mode 100644 NNO_attr__aeol_lf_true_CRLF.txt
- create mode 100644 NNO_attr__aeol_lf_true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr__aeol_lf_true_CRLF_nul.txt
- create mode 100644 NNO_attr__aeol_lf_true_LF.txt
- create mode 100644 NNO_attr__aeol_lf_true_LF_mix_CR.txt
- create mode 100644 NNO_attr_auto_aeol__false_CRLF.txt
- create mode 100644 NNO_attr_auto_aeol__false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_auto_aeol__false_CRLF_nul.txt
- create mode 100644 NNO_attr_auto_aeol__false_LF.txt
- create mode 100644 NNO_attr_auto_aeol__false_LF_mix_CR.txt
- create mode 100644 NNO_attr_auto_aeol__input_CRLF.txt
- create mode 100644 NNO_attr_auto_aeol__input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_auto_aeol__input_CRLF_nul.txt
- create mode 100644 NNO_attr_auto_aeol__input_LF.txt
- create mode 100644 NNO_attr_auto_aeol__input_LF_mix_CR.txt
- create mode 100644 NNO_attr_auto_aeol__true_CRLF.txt
- create mode 100644 NNO_attr_auto_aeol__true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_auto_aeol__true_CRLF_nul.txt
- create mode 100644 NNO_attr_auto_aeol__true_LF.txt
- create mode 100644 NNO_attr_auto_aeol__true_LF_mix_CR.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_false_CRLF.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_false_LF.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_false_LF_mix_CR.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_input_CRLF.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_input_LF.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_true_CRLF.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_true_CRLF_nul.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_true_LF.txt
- create mode 100644 NNO_attr_auto_aeol_crlf_true_LF_mix_CR.txt
- create mode 100644 NNO_attr_auto_aeol_lf_false_CRLF.txt
- create mode 100644 NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_auto_aeol_lf_false_CRLF_nul.txt
- create mode 100644 NNO_attr_auto_aeol_lf_false_LF.txt
- create mode 100644 NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt
- create mode 100644 NNO_attr_auto_aeol_lf_input_CRLF.txt
- create mode 100644 NNO_attr_auto_aeol_lf_input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_auto_aeol_lf_input_CRLF_nul.txt
- create mode 100644 NNO_attr_auto_aeol_lf_input_LF.txt
- create mode 100644 NNO_attr_auto_aeol_lf_input_LF_mix_CR.txt
- create mode 100644 NNO_attr_auto_aeol_lf_true_CRLF.txt
- create mode 100644 NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_auto_aeol_lf_true_CRLF_nul.txt
- create mode 100644 NNO_attr_auto_aeol_lf_true_LF.txt
- create mode 100644 NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt
- create mode 100644 NNO_attr_text_aeol__false_CRLF.txt
- create mode 100644 NNO_attr_text_aeol__false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_text_aeol__false_CRLF_nul.txt
- create mode 100644 NNO_attr_text_aeol__false_LF.txt
- create mode 100644 NNO_attr_text_aeol__false_LF_mix_CR.txt
- create mode 100644 NNO_attr_text_aeol__input_CRLF.txt
- create mode 100644 NNO_attr_text_aeol__input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_text_aeol__input_CRLF_nul.txt
- create mode 100644 NNO_attr_text_aeol__input_LF.txt
- create mode 100644 NNO_attr_text_aeol__input_LF_mix_CR.txt
- create mode 100644 NNO_attr_text_aeol__true_CRLF.txt
- create mode 100644 NNO_attr_text_aeol__true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_text_aeol__true_CRLF_nul.txt
- create mode 100644 NNO_attr_text_aeol__true_LF.txt
- create mode 100644 NNO_attr_text_aeol__true_LF_mix_CR.txt
- create mode 100644 NNO_attr_text_aeol_crlf_false_CRLF.txt
- create mode 100644 NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_text_aeol_crlf_false_CRLF_nul.txt
- create mode 100644 NNO_attr_text_aeol_crlf_false_LF.txt
- create mode 100644 NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt
- create mode 100644 NNO_attr_text_aeol_crlf_input_CRLF.txt
- create mode 100644 NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_text_aeol_crlf_input_CRLF_nul.txt
- create mode 100644 NNO_attr_text_aeol_crlf_input_LF.txt
- create mode 100644 NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt
- create mode 100644 NNO_attr_text_aeol_crlf_true_CRLF.txt
- create mode 100644 NNO_attr_text_aeol_crlf_true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_text_aeol_crlf_true_CRLF_nul.txt
- create mode 100644 NNO_attr_text_aeol_crlf_true_LF.txt
- create mode 100644 NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt
- create mode 100644 NNO_attr_text_aeol_lf_false_CRLF.txt
- create mode 100644 NNO_attr_text_aeol_lf_false_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_text_aeol_lf_false_CRLF_nul.txt
- create mode 100644 NNO_attr_text_aeol_lf_false_LF.txt
- create mode 100644 NNO_attr_text_aeol_lf_false_LF_mix_CR.txt
- create mode 100644 NNO_attr_text_aeol_lf_input_CRLF.txt
- create mode 100644 NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_text_aeol_lf_input_CRLF_nul.txt
- create mode 100644 NNO_attr_text_aeol_lf_input_LF.txt
- create mode 100644 NNO_attr_text_aeol_lf_input_LF_mix_CR.txt
- create mode 100644 NNO_attr_text_aeol_lf_true_CRLF.txt
- create mode 100644 NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt
- create mode 100644 NNO_attr_text_aeol_lf_true_CRLF_nul.txt
- create mode 100644 NNO_attr_text_aeol_lf_true_LF.txt
- create mode 100644 NNO_attr_text_aeol_lf_true_LF_mix_CR.txt
-ok 2 - setup main
+	echo >>sparse-index/deep/new &&
+	ensure_not_expanded stash -u &&
+	(
+		WITHOUT_UNTRACKED_TXT=1 &&
+		ensure_not_expanded stash pop
+	) &&
 
-expecting success of 0027.3 'commit files empty attr': 
-	commit_check_warn false ""     ""        ""        ""        ""        "" &&
-	commit_check_warn true  ""     "LF_CRLF" ""        "LF_CRLF" ""        "" &&
-	commit_check_warn input ""     ""        "CRLF_LF" "CRLF_LF" ""        ""
+	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
 
-[main c62ad5d] core.autocrlf false
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_false_attr__CRLF.txt
- create mode 100644 crlf_false_attr__CRLF_mix_LF.txt
- create mode 100644 crlf_false_attr__CRLF_nul.txt
- create mode 100644 crlf_false_attr__LF.txt
- create mode 100644 crlf_false_attr__LF_mix_CR.txt
- create mode 100644 crlf_false_attr__LF_nul.txt
-[main d70a676] core.autocrlf true
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_true_attr__CRLF.txt
- create mode 100644 crlf_true_attr__CRLF_mix_LF.txt
- create mode 100644 crlf_true_attr__CRLF_nul.txt
- create mode 100644 crlf_true_attr__LF.txt
- create mode 100644 crlf_true_attr__LF_mix_CR.txt
- create mode 100644 crlf_true_attr__LF_nul.txt
-[main a106c40] core.autocrlf input
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_input_attr__CRLF.txt
- create mode 100644 crlf_input_attr__CRLF_mix_LF.txt
- create mode 100644 crlf_input_attr__CRLF_nul.txt
- create mode 100644 crlf_input_attr__LF.txt
- create mode 100644 crlf_input_attr__LF_mix_CR.txt
- create mode 100644 crlf_input_attr__LF_nul.txt
-ok 3 - commit files empty attr
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 59 - sparse-index is not expanded: stash
 
-expecting success of 0027.4 'commit files attr=auto': 
-	commit_check_warn false "auto" "$WILC"   "$WICL"   "$WAMIX"  ""        "" &&
-	commit_check_warn true  "auto" "LF_CRLF" ""        "LF_CRLF" ""        "" &&
-	commit_check_warn input "auto" ""        "CRLF_LF" "CRLF_LF" ""        ""
+expecting success of 1092.60 'describe tested on all': 
+	init_repos &&
 
-[main 68bab31] core.autocrlf false
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_false_attr_auto_CRLF.txt
- create mode 100644 crlf_false_attr_auto_CRLF_mix_LF.txt
- create mode 100644 crlf_false_attr_auto_CRLF_nul.txt
- create mode 100644 crlf_false_attr_auto_LF.txt
- create mode 100644 crlf_false_attr_auto_LF_mix_CR.txt
- create mode 100644 crlf_false_attr_auto_LF_nul.txt
-[main efc8d5d] core.autocrlf true
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_true_attr_auto_CRLF.txt
- create mode 100644 crlf_true_attr_auto_CRLF_mix_LF.txt
- create mode 100644 crlf_true_attr_auto_CRLF_nul.txt
- create mode 100644 crlf_true_attr_auto_LF.txt
- create mode 100644 crlf_true_attr_auto_LF_mix_CR.txt
- create mode 100644 crlf_true_attr_auto_LF_nul.txt
-[main 21fb1d0] core.autocrlf input
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_input_attr_auto_CRLF.txt
- create mode 100644 crlf_input_attr_auto_CRLF_mix_LF.txt
- create mode 100644 crlf_input_attr_auto_CRLF_nul.txt
- create mode 100644 crlf_input_attr_auto_LF.txt
- create mode 100644 crlf_input_attr_auto_LF_mix_CR.txt
- create mode 100644 crlf_input_attr_auto_LF_nul.txt
-ok 4 - commit files attr=auto
+	# Add tag to be read by describe
 
-expecting success of 0027.5 'commit files attr=text': 
-	commit_check_warn false "text" "$WILC"   "$WICL"   "$WAMIX"  "$WILC"   "$WICL"   &&
-	commit_check_warn true  "text" "LF_CRLF" ""        "LF_CRLF" "LF_CRLF" ""        &&
-	commit_check_warn input "text" ""        "CRLF_LF" "CRLF_LF" ""        "CRLF_LF"
+	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
 
-[main 16b2963] core.autocrlf false
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_false_attr_text_CRLF.txt
- create mode 100644 crlf_false_attr_text_CRLF_mix_LF.txt
- create mode 100644 crlf_false_attr_text_CRLF_nul.txt
- create mode 100644 crlf_false_attr_text_LF.txt
- create mode 100644 crlf_false_attr_text_LF_mix_CR.txt
- create mode 100644 crlf_false_attr_text_LF_nul.txt
-[main 006c230] core.autocrlf true
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_true_attr_text_CRLF.txt
- create mode 100644 crlf_true_attr_text_CRLF_mix_LF.txt
- create mode 100644 crlf_true_attr_text_CRLF_nul.txt
- create mode 100644 crlf_true_attr_text_LF.txt
- create mode 100644 crlf_true_attr_text_LF_mix_CR.txt
- create mode 100644 crlf_true_attr_text_LF_nul.txt
-[main 00481a2] core.autocrlf input
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_input_attr_text_CRLF.txt
- create mode 100644 crlf_input_attr_text_CRLF_mix_LF.txt
- create mode 100644 crlf_input_attr_text_CRLF_nul.txt
- create mode 100644 crlf_input_attr_text_LF.txt
- create mode 100644 crlf_input_attr_text_LF_mix_CR.txt
- create mode 100644 crlf_input_attr_text_LF_nul.txt
-ok 5 - commit files attr=text
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 60 - describe tested on all
 
-expecting success of 0027.6 'commit files attr=-text': 
-	commit_check_warn false "-text" ""       ""        ""        ""        "" &&
-	commit_check_warn true  "-text" ""       ""        ""        ""        "" &&
-	commit_check_warn input "-text" ""       ""        ""        ""        ""
+expecting success of 1092.61 'sparse-index is not expanded: describe': 
+	init_repos &&
 
-[main 88d9dda] core.autocrlf false
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_false_attr_-text_CRLF.txt
- create mode 100644 crlf_false_attr_-text_CRLF_mix_LF.txt
- create mode 100644 crlf_false_attr_-text_CRLF_nul.txt
- create mode 100644 crlf_false_attr_-text_LF.txt
- create mode 100644 crlf_false_attr_-text_LF_mix_CR.txt
- create mode 100644 crlf_false_attr_-text_LF_nul.txt
-[main 1456133] core.autocrlf true
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_true_attr_-text_CRLF.txt
- create mode 100644 crlf_true_attr_-text_CRLF_mix_LF.txt
- create mode 100644 crlf_true_attr_-text_CRLF_nul.txt
- create mode 100644 crlf_true_attr_-text_LF.txt
- create mode 100644 crlf_true_attr_-text_LF_mix_CR.txt
- create mode 100644 crlf_true_attr_-text_LF_nul.txt
-[main 08b2ac8] core.autocrlf input
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_input_attr_-text_CRLF.txt
- create mode 100644 crlf_input_attr_-text_CRLF_mix_LF.txt
- create mode 100644 crlf_input_attr_-text_CRLF_nul.txt
- create mode 100644 crlf_input_attr_-text_LF.txt
- create mode 100644 crlf_input_attr_-text_LF_mix_CR.txt
- create mode 100644 crlf_input_attr_-text_LF_nul.txt
-ok 6 - commit files attr=-text
+	# Add tag to be read by describe
 
-expecting success of 0027.7 'commit files attr=lf': 
-	commit_check_warn false "lf"    ""       "CRLF_LF" "CRLF_LF"  ""       "CRLF_LF" &&
-	commit_check_warn true  "lf"    ""       "CRLF_LF" "CRLF_LF"  ""       "CRLF_LF" &&
-	commit_check_warn input "lf"    ""       "CRLF_LF" "CRLF_LF"  ""       "CRLF_LF"
+	git -C sparse-index tag -a v1.0 -m "Version 1" &&
 
-[main f130974] core.autocrlf false
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_false_attr_lf_CRLF.txt
- create mode 100644 crlf_false_attr_lf_CRLF_mix_LF.txt
- create mode 100644 crlf_false_attr_lf_CRLF_nul.txt
- create mode 100644 crlf_false_attr_lf_LF.txt
- create mode 100644 crlf_false_attr_lf_LF_mix_CR.txt
- create mode 100644 crlf_false_attr_lf_LF_nul.txt
-[main 0b69747] core.autocrlf true
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_true_attr_lf_CRLF.txt
- create mode 100644 crlf_true_attr_lf_CRLF_mix_LF.txt
- create mode 100644 crlf_true_attr_lf_CRLF_nul.txt
- create mode 100644 crlf_true_attr_lf_LF.txt
- create mode 100644 crlf_true_attr_lf_LF_mix_CR.txt
- create mode 100644 crlf_true_attr_lf_LF_nul.txt
-[main 7d87167] core.autocrlf input
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_input_attr_lf_CRLF.txt
- create mode 100644 crlf_input_attr_lf_CRLF_mix_LF.txt
- create mode 100644 crlf_input_attr_lf_CRLF_nul.txt
- create mode 100644 crlf_input_attr_lf_LF.txt
- create mode 100644 crlf_input_attr_lf_LF_mix_CR.txt
- create mode 100644 crlf_input_attr_lf_LF_nul.txt
-ok 7 - commit files attr=lf
+	ensure_not_expanded describe --dirty &&
+	echo "test" >>sparse-index/g &&
+	ensure_not_expanded describe --dirty &&
+	ensure_not_expanded describe
 
-expecting success of 0027.8 'commit files attr=crlf': 
-	commit_check_warn false "crlf" "LF_CRLF" ""        "LF_CRLF" "LF_CRLF" "" &&
-	commit_check_warn true  "crlf" "LF_CRLF" ""        "LF_CRLF" "LF_CRLF" "" &&
-	commit_check_warn input "crlf" "LF_CRLF" ""        "LF_CRLF" "LF_CRLF" ""
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 61 - sparse-index is not expanded: describe
 
-[main 753280e] core.autocrlf false
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_false_attr_crlf_CRLF.txt
- create mode 100644 crlf_false_attr_crlf_CRLF_mix_LF.txt
- create mode 100644 crlf_false_attr_crlf_CRLF_nul.txt
- create mode 100644 crlf_false_attr_crlf_LF.txt
- create mode 100644 crlf_false_attr_crlf_LF_mix_CR.txt
- create mode 100644 crlf_false_attr_crlf_LF_nul.txt
-[main abec00d] core.autocrlf true
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_true_attr_crlf_CRLF.txt
- create mode 100644 crlf_true_attr_crlf_CRLF_mix_LF.txt
- create mode 100644 crlf_true_attr_crlf_CRLF_nul.txt
- create mode 100644 crlf_true_attr_crlf_LF.txt
- create mode 100644 crlf_true_attr_crlf_LF_mix_CR.txt
- create mode 100644 crlf_true_attr_crlf_LF_nul.txt
-[main 4e045e6] core.autocrlf input
- Author: A U Thor <author@example.com>
- 6 files changed, 15 insertions(+)
- create mode 100644 crlf_input_attr_crlf_CRLF.txt
- create mode 100644 crlf_input_attr_crlf_CRLF_mix_LF.txt
- create mode 100644 crlf_input_attr_crlf_CRLF_nul.txt
- create mode 100644 crlf_input_attr_crlf_LF.txt
- create mode 100644 crlf_input_attr_crlf_LF_mix_CR.txt
- create mode 100644 crlf_input_attr_crlf_LF_nul.txt
-ok 8 - commit files attr=crlf
+expecting success of 1092.62 'sparse index is not expanded: diff and diff-index': 
+	init_repos &&
 
-expecting success of 0027.9 'setup commit file with mixed EOL': 
-		#Commit file with CLRF_mix_LF on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp CRLF_mix_LF $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 9 - setup commit file with mixed EOL
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-expecting success of 0027.10 'commit file with mixed EOL onto LF crlf=false attr=': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 10 - commit file with mixed EOL onto LF crlf=false attr=
+	# 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 0027.11 'commit file with mixed EOL onto CLRF attr= aeol= crlf=false': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 11 - commit file with mixed EOL onto CLRF attr= aeol= crlf=false
+	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 0027.12 'commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=false': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 12 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=false
+	# 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 0027.13 'commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=false ': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 13 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=false 
+	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 0027.14 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=false': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 14 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=false
+	# 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 0027.15 'setup commit file with mixed EOL': 
-		#Commit file with CLRF_mix_LF on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp CRLF_mix_LF $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 15 - setup commit file with mixed EOL
+	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 0027.16 'commit file with mixed EOL onto LF crlf=true attr=': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 16 - commit file with mixed EOL onto LF crlf=true attr=
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 62 - sparse index is not expanded: diff and diff-index
 
-expecting success of 0027.17 'commit file with mixed EOL onto CLRF attr= aeol= crlf=true': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 17 - commit file with mixed EOL onto CLRF attr= aeol= crlf=true
+expecting success of 1092.63 'sparse index is not expanded: show and rev-parse': 
+	init_repos &&
 
-expecting success of 0027.18 'commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=true': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 18 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=true
+	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 0027.19 'commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=true ': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 19 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=true 
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 63 - sparse index is not expanded: show and rev-parse
 
-expecting success of 0027.20 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=true': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 20 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=true
+expecting success of 1092.64 'sparse index is not expanded: update-index': 
+	init_repos &&
 
-expecting success of 0027.21 'setup commit file with mixed EOL': 
-		#Commit file with CLRF_mix_LF on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp CRLF_mix_LF $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 21 - setup commit file with mixed EOL
+	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 0027.22 'commit file with mixed EOL onto LF crlf=input attr=': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 22 - commit file with mixed EOL onto LF crlf=input attr=
+	echo "test" >sparse-index/README.md &&
+	echo "test2" >sparse-index/a &&
+	rm -f sparse-index/deep/a &&
 
-expecting success of 0027.23 'commit file with mixed EOL onto CLRF attr= aeol= crlf=input': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 23 - commit file with mixed EOL onto CLRF attr= aeol= crlf=input
+	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 0027.24 'commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=input': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 24 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=input
+	ensure_not_expanded reset --soft update-deep &&
+	ensure_not_expanded update-index --add --remove --again
 
-expecting success of 0027.25 'commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=input ': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 25 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=input 
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 64 - sparse index is not expanded: update-index
 
-expecting success of 0027.26 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=input': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 26 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=input
+expecting success of 1092.65 'sparse index is not expanded: blame': 
+	init_repos &&
 
-expecting success of 0027.27 'setup commit file with mixed EOL': 
-		#Commit file with CLRF_mix_LF on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp CRLF_mix_LF $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 27 - setup commit file with mixed EOL
+	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 0027.28 'commit file with mixed EOL onto LF crlf=false attr=auto': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 28 - commit file with mixed EOL onto LF crlf=false attr=auto
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 65 - sparse index is not expanded: blame
 
-expecting success of 0027.29 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 29 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false
+expecting success of 1092.66 'sparse index is not expanded: fetch/pull': 
+	init_repos &&
 
-expecting success of 0027.30 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=false': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 30 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=false
+	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 0027.31 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=false ': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 31 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=false 
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+[base f236285] for pull merge
+ Author: A U Thor <author@example.com>
+[base f236285] for pull merge
+ Author: A U Thor <author@example.com>
+ok 66 - sparse index is not expanded: fetch/pull
 
-expecting success of 0027.32 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=false': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 32 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=false
+expecting success of 1092.67 'sparse index is not expanded: read-tree': 
+	init_repos &&
 
-expecting success of 0027.33 'setup commit file with mixed EOL': 
-		#Commit file with CLRF_mix_LF on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp CRLF_mix_LF $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 33 - setup commit file with mixed EOL
+	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 0027.34 'commit file with mixed EOL onto LF crlf=true attr=auto': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 34 - commit file with mixed EOL onto LF crlf=true attr=auto
+	rm -rf sparse-index/deep/deeper2 &&
+	ensure_not_expanded add . &&
+	ensure_not_expanded commit -m "test" &&
 
-expecting success of 0027.35 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=true': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 35 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=true
+	ensure_not_expanded read-tree --prefix=deep/deeper2 -u deepest
 
-expecting success of 0027.36 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=true': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 36 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=true
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 67 - sparse index is not expanded: read-tree
 
-expecting success of 0027.37 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true ': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 37 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true 
+expecting success of 1092.68 'ls-files': 
+	init_repos &&
 
-expecting success of 0027.38 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=true': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 38 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=true
+	# Use a smaller sparse-checkout for reduced output
+	test_sparse_match git sparse-checkout set &&
 
-expecting success of 0027.39 'setup commit file with mixed EOL': 
-		#Commit file with CLRF_mix_LF on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp CRLF_mix_LF $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 39 - setup commit file with mixed EOL
+	# Behavior agrees by default. Sparse index is expanded.
+	test_all_match git ls-files &&
 
-expecting success of 0027.40 'commit file with mixed EOL onto LF crlf=input attr=auto': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 40 - commit file with mixed EOL onto LF crlf=input attr=auto
+	# With --sparse, the sparse index data changes behavior.
+	git -C sparse-index ls-files --sparse >actual &&
 
-expecting success of 0027.41 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=input': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 41 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=input
+	cat >expect <<-\EOF &&
+	a
+	before/
+	deep/
+	e
+	folder1-
+	folder1.x
+	folder1/
+	folder10
+	folder2/
+	g
+	x/
+	z
+	EOF
 
-expecting success of 0027.42 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=input': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 42 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=input
+	test_cmp expect actual &&
 
-expecting success of 0027.43 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input ': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 43 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input 
+	# 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 0027.44 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=input': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 44 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=input
+	# 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 0027.45 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 45 - setup commit NNO files
+	test_all_match git ls-files --modified &&
 
-expecting success of 0027.46 'commit NNO files crlf=false attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 46 - commit NNO files crlf=false attr= LF
+	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 0027.47 'commit NNO files attr= aeol= crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 47 - commit NNO files attr= aeol= crlf=false CRLF
+	# 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 0027.48 'commit NNO files attr= aeol= crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 48 - commit NNO files attr= aeol= crlf=false CRLF_mix_LF
+	test_all_match git ls-files &&
+	git -C sparse-index ls-files --sparse >actual &&
 
-expecting success of 0027.49 'commit NNO files attr= aeol= crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 49 - commit NNO files attr= aeol= crlf=false LF_mix_cr
+	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 0027.50 'commit NNO files attr= aeol= crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 50 - commit NNO files attr= aeol= crlf=false CRLF_nul
+	test_cmp expect actual &&
 
-expecting success of 0027.51 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 51 - setup commit NNO files
+	# Double-check index expansion is avoided
+	ensure_not_expanded ls-files --sparse
 
-expecting success of 0027.52 'commit NNO files crlf=true attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 52 - commit NNO files crlf=true attr= LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 68 - ls-files
 
-expecting success of 0027.53 'commit NNO files attr= aeol= crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 53 - commit NNO files attr= aeol= crlf=true CRLF
+expecting success of 1092.69 'sparse index is not expanded: sparse-checkout': 
+	init_repos &&
 
-expecting success of 0027.54 'commit NNO files attr= aeol= crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 54 - commit NNO files attr= aeol= crlf=true CRLF_mix_LF
+	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 0027.55 'commit NNO files attr= aeol= crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 55 - commit NNO files attr= aeol= crlf=true LF_mix_cr
+	# 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 0027.56 'commit NNO files attr= aeol= crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 56 - commit NNO files attr= aeol= crlf=true CRLF_nul
+	ensure_not_expanded sparse-checkout add folder1 &&
 
-expecting success of 0027.57 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 57 - setup commit NNO files
+	# 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 0027.58 'commit NNO files crlf=input attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 58 - commit NNO files crlf=input attr= LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 69 - sparse index is not expanded: sparse-checkout
 
-expecting success of 0027.59 'commit NNO files attr= aeol= crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 59 - commit NNO files attr= aeol= crlf=input CRLF
+expecting success of 1092.70 'reset mixed and checkout orphan': 
+	init_repos &&
 
-expecting success of 0027.60 'commit NNO files attr= aeol= crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 60 - commit NNO files attr= aeol= crlf=input CRLF_mix_LF
+	test_all_match git checkout rename-out-to-in &&
 
-expecting success of 0027.61 'commit NNO files attr= aeol= crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 61 - commit NNO files attr= aeol= crlf=input LF_mix_cr
+	# 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 0027.62 'commit NNO files attr= aeol= crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 62 - commit NNO files attr= aeol= crlf=input CRLF_nul
+	# 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 0027.63 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 63 - setup commit NNO files
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 70 - reset mixed and checkout orphan
 
-expecting success of 0027.64 'commit NNO files crlf=false attr=auto LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 64 - commit NNO files crlf=false attr=auto LF
+expecting success of 1092.71 'add everything with deep new file': 
+	init_repos &&
 
-expecting success of 0027.65 'commit NNO files attr=auto aeol= crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 65 - commit NNO files attr=auto aeol= crlf=false CRLF
+	run_on_sparse git sparse-checkout set deep/deeper1/deepest &&
 
-expecting success of 0027.66 'commit NNO files attr=auto aeol= crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 66 - commit NNO files attr=auto aeol= crlf=false CRLF_mix_LF
+	run_on_all touch deep/deeper1/x &&
+	test_all_match git add . &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 0027.67 'commit NNO files attr=auto aeol= crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 67 - commit NNO files attr=auto aeol= crlf=false LF_mix_cr
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 71 - add everything with deep new file
 
-expecting success of 0027.68 'commit NNO files attr=auto aeol= crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 68 - commit NNO files attr=auto aeol= crlf=false CRLF_nul
+expecting success of 1092.72 'checkout behaves oddly with df-conflict-1': 
+	init_repos &&
 
-expecting success of 0027.69 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 69 - setup commit NNO files
+	test_sparse_match git sparse-checkout disable &&
 
-expecting success of 0027.70 'commit NNO files crlf=true attr=auto LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 70 - commit NNO files crlf=true attr=auto LF
+	write_script edit-content <<-\EOF &&
+	echo content >>folder1/larger-content
+	git add folder1
+	EOF
 
-expecting success of 0027.71 'commit NNO files attr=auto aeol= crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 71 - commit NNO files attr=auto aeol= crlf=true CRLF
+	run_on_all ../edit-content &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 0027.72 'commit NNO files attr=auto aeol= crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 72 - commit NNO files attr=auto aeol= crlf=true CRLF_mix_LF
+	git -C sparse-checkout sparse-checkout init --cone &&
+	git -C sparse-index sparse-checkout init --cone --sparse-index &&
 
-expecting success of 0027.73 'commit NNO files attr=auto aeol= crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 73 - commit NNO files attr=auto aeol= crlf=true LF_mix_cr
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 0027.74 'commit NNO files attr=auto aeol= crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 74 - commit NNO files attr=auto aeol= crlf=true CRLF_nul
+	# 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 0027.75 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 75 - setup commit NNO files
+	# 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 0027.76 'commit NNO files crlf=input attr=auto LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 76 - commit NNO files crlf=input attr=auto LF
+	# The sparse-index reports no output
+	test_must_be_empty sparse-index-out &&
 
-expecting success of 0027.77 'commit NNO files attr=auto aeol= crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 77 - commit NNO files attr=auto aeol= crlf=input CRLF
+	# 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 0027.78 'commit NNO files attr=auto aeol= crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 78 - commit NNO files attr=auto aeol= crlf=input CRLF_mix_LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 72 - checkout behaves oddly with df-conflict-1
 
-expecting success of 0027.79 'commit NNO files attr=auto aeol= crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 79 - commit NNO files attr=auto aeol= crlf=input LF_mix_cr
+expecting success of 1092.73 'checkout behaves oddly with df-conflict-2': 
+	init_repos &&
 
-expecting success of 0027.80 'commit NNO files attr=auto aeol= crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 80 - commit NNO files attr=auto aeol= crlf=input CRLF_nul
+	test_sparse_match git sparse-checkout disable &&
 
-expecting success of 0027.81 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 81 - setup commit NNO files
+	write_script edit-content <<-\EOF &&
+	echo content >>folder2/larger-content
+	git add folder2
+	EOF
 
-expecting success of 0027.82 'commit NNO files crlf=true attr=-text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 82 - commit NNO files crlf=true attr=-text LF
+	run_on_all ../edit-content &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 0027.83 'commit NNO files attr=-text aeol= crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 83 - commit NNO files attr=-text aeol= crlf=true CRLF
+	git -C sparse-checkout sparse-checkout init --cone &&
+	git -C sparse-index sparse-checkout init --cone --sparse-index &&
 
-expecting success of 0027.84 'commit NNO files attr=-text aeol= crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 84 - commit NNO files attr=-text aeol= crlf=true CRLF_mix_LF
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 0027.85 'commit NNO files attr=-text aeol= crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 85 - commit NNO files attr=-text aeol= crlf=true LF_mix_cr
+	# 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 0027.86 'commit NNO files attr=-text aeol= crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 86 - commit NNO files attr=-text aeol= crlf=true CRLF_nul
+	# 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 0027.87 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 87 - setup commit NNO files
+	# 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 0027.88 'commit NNO files crlf=true attr=-text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 88 - commit NNO files crlf=true attr=-text LF
+	# 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 0027.89 'commit NNO files attr=-text aeol=lf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 89 - commit NNO files attr=-text aeol=lf crlf=true CRLF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 73 - checkout behaves oddly with df-conflict-2
 
-expecting success of 0027.90 'commit NNO files attr=-text aeol=lf crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 90 - commit NNO files attr=-text aeol=lf crlf=true CRLF_mix_LF
+expecting success of 1092.74 'mv directory from out-of-cone to in-cone': 
+	init_repos &&
 
-expecting success of 0027.91 'commit NNO files attr=-text aeol=lf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 91 - commit NNO files attr=-text aeol=lf crlf=true LF_mix_cr
+	# <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 0027.92 'commit NNO files attr=-text aeol=lf crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 92 - commit NNO files attr=-text aeol=lf crlf=true CRLF_nul
+	test_all_match git reset --hard &&
 
-expecting success of 0027.93 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 93 - setup commit NNO files
+	# <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 0027.94 'commit NNO files crlf=true attr=-text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 94 - commit NNO files crlf=true attr=-text LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+H deep/folder1/0/0/0
+H deep/folder1/0/1
+H deep/folder1/a
+H deep/0/0/0
+H deep/0/1
+ok 74 - mv directory from out-of-cone to in-cone
 
-expecting success of 0027.95 'commit NNO files attr=-text aeol=crlf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 95 - commit NNO files attr=-text aeol=crlf crlf=true CRLF
+expecting success of 1092.75 'rm pathspec inside sparse definition': 
+	init_repos &&
 
-expecting success of 0027.96 'commit NNO files attr=-text aeol=crlf crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 96 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_mix_LF
+	test_all_match git rm deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 0027.97 'commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 97 - commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr
+	# test wildcard
+	run_on_all git reset --hard &&
+	test_all_match git rm deep/* &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 0027.98 'commit NNO files attr=-text aeol=crlf crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 98 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_nul
+	# 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 0027.99 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 99 - setup commit NNO files
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 75 - rm pathspec inside sparse definition
 
-expecting success of 0027.100 'commit NNO files crlf=true attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 100 - commit NNO files crlf=true attr= LF
+expecting success of 1092.76 'rm pathspec outside sparse definition': 
+	init_repos &&
 
-expecting success of 0027.101 'commit NNO files attr= aeol=lf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 101 - commit NNO files attr= aeol=lf crlf=true CRLF
+	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 0027.102 'commit NNO files attr= aeol=lf crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 102 - commit NNO files attr= aeol=lf crlf=true CRLF_mix_LF
+	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 0027.103 'commit NNO files attr= aeol=lf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 103 - commit NNO files attr= aeol=lf crlf=true LF_mix_cr
+	cat >folder1-sparse <<-EOF &&
+	rm ${SQ}folder1/${SQ}
+	EOF
 
-expecting success of 0027.104 'commit NNO files attr= aeol=lf crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 104 - commit NNO files attr= aeol=lf crlf=true CRLF_nul
+	# 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 0027.105 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 105 - setup commit NNO files
+	# 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 0027.106 'commit NNO files crlf=true attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 106 - commit NNO files crlf=true attr= LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 76 - rm pathspec outside sparse definition
 
-expecting success of 0027.107 'commit NNO files attr= aeol=crlf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 107 - commit NNO files attr= aeol=crlf crlf=true CRLF
+expecting success of 1092.77 'rm pathspec expands index when necessary': 
+	init_repos &&
 
-expecting success of 0027.108 'commit NNO files attr= aeol=crlf crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 108 - commit NNO files attr= aeol=crlf crlf=true CRLF_mix_LF
+	# in-cone pathspec (do not expand)
+	ensure_not_expanded rm "deep/deep*" &&
+	test_must_be_empty sparse-index-err &&
 
-expecting success of 0027.109 'commit NNO files attr= aeol=crlf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 109 - commit NNO files attr= aeol=crlf crlf=true LF_mix_cr
+	# out-of-cone pathspec (expand)
+	! ensure_not_expanded rm --sparse "folder1/a*" &&
+	test_must_be_empty sparse-index-err &&
 
-expecting success of 0027.110 'commit NNO files attr= aeol=crlf crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 110 - commit NNO files attr= aeol=crlf crlf=true CRLF_nul
+	# pathspec that should expand index
+	! ensure_not_expanded rm "*/a" &&
+	test_must_be_empty sparse-index-err &&
 
-expecting success of 0027.111 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 111 - setup commit NNO files
+	! ensure_not_expanded rm "**a" &&
+	test_must_be_empty sparse-index-err
 
-expecting success of 0027.112 'commit NNO files crlf=true attr=auto LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 112 - commit NNO files crlf=true attr=auto LF
+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":"20250130T021011.197948Z-H5c947e1c-P001afc43","thread":"main","time":"2025-01-30T02:10:11.199184Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250130T021011.197948Z-H5c947e1c-P001afc43","thread":"main","time":"2025-01-30T02:10:11.201570Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250130T021011.262695Z-H5c947e1c-P001afc74","thread":"main","time":"2025-01-30T02:10:11.263653Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250130T021011.262695Z-H5c947e1c-P001afc74","thread":"main","time":"2025-01-30T02:10:11.265417Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250130T021011.322121Z-H5c947e1c-P001afcb7","thread":"main","time":"2025-01-30T02:10:11.322949Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250130T021011.322121Z-H5c947e1c-P001afcb7","thread":"main","time":"2025-01-30T02:10:11.332555Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 77 - rm pathspec expands index when necessary
 
-expecting success of 0027.113 'commit NNO files attr=auto aeol=lf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 113 - commit NNO files attr=auto aeol=lf crlf=true CRLF
+expecting success of 1092.78 'sparse index is not expanded: rm': 
+	init_repos &&
 
-expecting success of 0027.114 'commit NNO files attr=auto aeol=lf crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 114 - commit NNO files attr=auto aeol=lf crlf=true CRLF_mix_LF
+	ensure_not_expanded rm deep/a &&
 
-expecting success of 0027.115 'commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 115 - commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr
+	# test in-cone wildcard
+	git -C sparse-index reset --hard &&
+	ensure_not_expanded rm deep/* &&
 
-expecting success of 0027.116 'commit NNO files attr=auto aeol=lf crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 116 - commit NNO files attr=auto aeol=lf crlf=true CRLF_nul
+	# test recursive rm
+	git -C sparse-index reset --hard &&
+	ensure_not_expanded rm -r deep
 
-expecting success of 0027.117 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 117 - setup commit NNO files
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 78 - sparse index is not expanded: rm
 
-expecting success of 0027.118 'commit NNO files crlf=true attr=auto LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 118 - commit NNO files crlf=true attr=auto LF
+expecting success of 1092.79 'grep with and --cached': 
+	init_repos &&
 
-expecting success of 0027.119 'commit NNO files attr=auto aeol=crlf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 119 - commit NNO files attr=auto aeol=crlf crlf=true CRLF
+	test_all_match git grep --cached a &&
+	test_all_match git grep --cached a -- "folder1/*"
 
-expecting success of 0027.120 'commit NNO files attr=auto aeol=crlf crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 120 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_mix_LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 79 - grep with and --cached
 
-expecting success of 0027.121 'commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 121 - commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr
+expecting success of 1092.80 'grep is not expanded': 
+	init_repos &&
 
-expecting success of 0027.122 'commit NNO files attr=auto aeol=crlf crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 122 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_nul
+	ensure_not_expanded grep a &&
+	ensure_not_expanded grep a -- deep/* &&
 
-expecting success of 0027.123 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 123 - setup commit NNO files
+	# 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 0027.124 'commit NNO files crlf=true attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 124 - commit NNO files crlf=true attr=text LF
+	# 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 0027.125 'commit NNO files attr=text aeol=lf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 125 - commit NNO files attr=text aeol=lf crlf=true CRLF
+	# 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 0027.126 'commit NNO files attr=text aeol=lf crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 126 - commit NNO files attr=text aeol=lf crlf=true CRLF_mix_LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 80 - grep is not expanded
 
-expecting success of 0027.127 'commit NNO files attr=text aeol=lf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 127 - commit NNO files attr=text aeol=lf crlf=true LF_mix_cr
+checking known breakage of 1092.81 'grep within submodules is not expanded': 
+	init_repos_as_submodules &&
 
-expecting success of 0027.128 'commit NNO files attr=text aeol=lf crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 128 - commit NNO files attr=text aeol=lf crlf=true CRLF_nul
+	# do not use ensure_not_expanded() here, becasue `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 0027.129 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 129 - setup commit NNO files
+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 advice.sparseIndexExpanded false"
+sparse-checkout/folder1/a:a
+sparse-index/folder1/a:a
+{"event":"region_enter","sid":"20250130T021015.109729Z-H5c947e1c-P001b0ea9","thread":"main","time":"2025-01-30T02:10:15.116419Z","file":"sparse-index.c","line":369,"repo":4,"nesting":2,"category":"index","label":"ensure_full_index"}
+not ok 81 - grep within submodules is not expanded # TODO known breakage
 
-expecting success of 0027.130 'commit NNO files crlf=true attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 130 - commit NNO files crlf=true attr=text LF
+expecting success of 1092.82 'grep sparse directory within submodules': 
+	init_repos_as_submodules &&
 
-expecting success of 0027.131 'commit NNO files attr=text aeol=crlf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 131 - commit NNO files attr=text aeol=crlf crlf=true CRLF
+	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 0027.132 'commit NNO files attr=text aeol=crlf crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 132 - commit NNO files attr=text aeol=crlf crlf=true CRLF_mix_LF
+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 advice.sparseIndexExpanded false"
+ok 82 - grep sparse directory within submodules
 
-expecting success of 0027.133 'commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 133 - commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr
+expecting success of 1092.83 'write-tree': 
+	init_repos &&
 
-expecting success of 0027.134 'commit NNO files attr=text aeol=crlf crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 134 - commit NNO files attr=text aeol=crlf crlf=true CRLF_nul
+	test_all_match git write-tree &&
 
-expecting success of 0027.135 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 135 - setup commit NNO files
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
 
-expecting success of 0027.136 'commit NNO files crlf=false attr=-text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 136 - commit NNO files crlf=false attr=-text LF
+	# 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 0027.137 'commit NNO files attr=-text aeol= crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 137 - commit NNO files attr=-text aeol= crlf=false CRLF
+	# 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 0027.138 'commit NNO files attr=-text aeol= crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 138 - commit NNO files attr=-text aeol= crlf=false CRLF_mix_LF
+	# 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 0027.139 'commit NNO files attr=-text aeol= crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 139 - commit NNO files attr=-text aeol= crlf=false LF_mix_cr
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 83 - write-tree
 
-expecting success of 0027.140 'commit NNO files attr=-text aeol= crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 140 - commit NNO files attr=-text aeol= crlf=false CRLF_nul
+expecting success of 1092.84 'sparse-index is not expanded: write-tree': 
+	init_repos &&
 
-expecting success of 0027.141 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 141 - setup commit NNO files
+	ensure_not_expanded write-tree &&
 
-expecting success of 0027.142 'commit NNO files crlf=false attr=-text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 142 - commit NNO files crlf=false attr=-text LF
+	echo "test1" >>sparse-index/a &&
+	git -C sparse-index update-index a &&
+	ensure_not_expanded write-tree
 
-expecting success of 0027.143 'commit NNO files attr=-text aeol=lf crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 143 - commit NNO files attr=-text aeol=lf crlf=false CRLF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 84 - sparse-index is not expanded: write-tree
 
-expecting success of 0027.144 'commit NNO files attr=-text aeol=lf crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 144 - commit NNO files attr=-text aeol=lf crlf=false CRLF_mix_LF
+expecting success of 1092.85 'diff-files with pathspec inside sparse definition': 
+	init_repos &&
 
-expecting success of 0027.145 'commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 145 - commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
 
-expecting success of 0027.146 'commit NNO files attr=-text aeol=lf crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 146 - commit NNO files attr=-text aeol=lf crlf=false CRLF_nul
+	run_on_all ../edit-contents deep/a &&
 
-expecting success of 0027.147 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 147 - setup commit NNO files
+	test_all_match git diff-files &&
 
-expecting success of 0027.148 'commit NNO files crlf=false attr=-text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 148 - commit NNO files crlf=false attr=-text LF
+	test_all_match git diff-files -- deep/a &&
 
-expecting success of 0027.149 'commit NNO files attr=-text aeol=crlf crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 149 - commit NNO files attr=-text aeol=crlf crlf=false CRLF
+	# test wildcard
+	test_all_match git diff-files -- "deep/*"
 
-expecting success of 0027.150 'commit NNO files attr=-text aeol=crlf crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 150 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_mix_LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 85 - diff-files with pathspec inside sparse definition
 
-expecting success of 0027.151 'commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 151 - commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr
+expecting success of 1092.86 'diff-files with pathspec outside sparse definition': 
+	init_repos &&
 
-expecting success of 0027.152 'commit NNO files attr=-text aeol=crlf crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 152 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_nul
+	test_sparse_match git diff-files -- folder2/a &&
 
-expecting success of 0027.153 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 153 - setup commit NNO files
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
 
-expecting success of 0027.154 'commit NNO files crlf=false attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 154 - commit NNO files crlf=false attr= LF
+	# 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 0027.155 'commit NNO files attr= aeol=lf crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 155 - commit NNO files attr= aeol=lf crlf=false CRLF
+	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 0027.156 'commit NNO files attr= aeol=lf crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 156 - commit NNO files attr= aeol=lf crlf=false CRLF_mix_LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 86 - diff-files with pathspec outside sparse definition
 
-expecting success of 0027.157 'commit NNO files attr= aeol=lf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 157 - commit NNO files attr= aeol=lf crlf=false LF_mix_cr
+expecting success of 1092.87 'sparse index is not expanded: diff-files': 
+	init_repos &&
 
-expecting success of 0027.158 'commit NNO files attr= aeol=lf crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 158 - commit NNO files attr= aeol=lf crlf=false CRLF_nul
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
 
-expecting success of 0027.159 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 159 - setup commit NNO files
+	run_on_all ../edit-contents deep/a &&
 
-expecting success of 0027.160 'commit NNO files crlf=false attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 160 - commit NNO files crlf=false attr= LF
+	ensure_not_expanded diff-files &&
+	ensure_not_expanded diff-files -- deep/a &&
+	ensure_not_expanded diff-files -- "deep/*"
 
-expecting success of 0027.161 'commit NNO files attr= aeol=crlf crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 161 - commit NNO files attr= aeol=crlf crlf=false CRLF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 87 - sparse index is not expanded: diff-files
 
-expecting success of 0027.162 'commit NNO files attr= aeol=crlf crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 162 - commit NNO files attr= aeol=crlf crlf=false CRLF_mix_LF
+expecting success of 1092.88 'diff-tree': 
+	init_repos &&
 
-expecting success of 0027.163 'commit NNO files attr= aeol=crlf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 163 - commit NNO files attr= aeol=crlf crlf=false LF_mix_cr
+	# 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 0027.164 'commit NNO files attr= aeol=crlf crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 164 - commit NNO files attr= aeol=crlf crlf=false CRLF_nul
+	# 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 0027.165 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 165 - setup commit NNO files
+	# 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 0027.166 'commit NNO files crlf=false attr=auto LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 166 - commit NNO files crlf=false attr=auto LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 88 - diff-tree
 
-expecting success of 0027.167 'commit NNO files attr=auto aeol=lf crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 167 - commit NNO files attr=auto aeol=lf crlf=false CRLF
+expecting success of 1092.89 'sparse-index is not expanded: diff-tree': 
+	init_repos &&
 
-expecting success of 0027.168 'commit NNO files attr=auto aeol=lf crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 168 - commit NNO files attr=auto aeol=lf crlf=false CRLF_mix_LF
+	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 0027.169 'commit NNO files attr=auto aeol=lf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 169 - commit NNO files attr=auto aeol=lf crlf=false LF_mix_cr
+	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 0027.170 'commit NNO files attr=auto aeol=lf crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 170 - commit NNO files attr=auto aeol=lf crlf=false CRLF_nul
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 89 - sparse-index is not expanded: diff-tree
 
-expecting success of 0027.171 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 171 - setup commit NNO files
+expecting success of 1092.90 'worktree': 
+	init_repos &&
 
-expecting success of 0027.172 'commit NNO files crlf=false attr=auto LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 172 - commit NNO files crlf=false attr=auto LF
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
 
-expecting success of 0027.173 'commit NNO files attr=auto aeol=crlf crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 173 - commit NNO files attr=auto aeol=crlf crlf=false CRLF
+	for repo in full-checkout sparse-checkout sparse-index
+	do
+		worktree=${repo}-wt &&
+		git -C $repo worktree add ../$worktree &&
 
-expecting success of 0027.174 'commit NNO files attr=auto aeol=crlf crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 174 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_mix_LF
+		# 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 0027.175 'commit NNO files attr=auto aeol=crlf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 175 - commit NNO files attr=auto aeol=crlf crlf=false LF_mix_cr
+		# 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 0027.176 'commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 176 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul
+		git -C $repo worktree remove ../$worktree || return 1
+	done &&
 
-expecting success of 0027.177 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 177 - setup commit NNO files
+	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 0027.178 'commit NNO files crlf=false attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 178 - commit NNO files crlf=false attr=text LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Preparing worktree (new branch 'full-checkout-wt')
+HEAD is now at 703fd3e initial commit
+Preparing worktree (new branch 'sparse-checkout-wt')
+HEAD is now at 703fd3e initial commit
+Preparing worktree (new branch 'sparse-index-wt')
+HEAD is now at 703fd3e initial commit
+ok 90 - worktree
 
-expecting success of 0027.179 'commit NNO files attr=text aeol=lf crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 179 - commit NNO files attr=text aeol=lf crlf=false CRLF
+expecting success of 1092.91 'worktree is not expanded': 
+	init_repos &&
 
-expecting success of 0027.180 'commit NNO files attr=text aeol=lf crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 180 - commit NNO files attr=text aeol=lf crlf=false CRLF_mix_LF
+	ensure_not_expanded worktree add .worktrees/hotfix &&
+	ensure_not_expanded worktree remove .worktrees/hotfix
 
-expecting success of 0027.181 'commit NNO files attr=text aeol=lf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 181 - commit NNO files attr=text aeol=lf crlf=false LF_mix_cr
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 91 - worktree is not expanded
 
-expecting success of 0027.182 'commit NNO files attr=text aeol=lf crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 182 - commit NNO files attr=text aeol=lf crlf=false CRLF_nul
+expecting success of 1092.92 'check-attr with pathspec inside sparse definition': 
+	init_repos &&
 
-expecting success of 0027.183 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 183 - setup commit NNO files
+	echo "a -crlf myAttr" >>.gitattributes &&
+	run_on_all cp ../.gitattributes ./deep &&
 
-expecting success of 0027.184 'commit NNO files crlf=false attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 184 - commit NNO files crlf=false attr=text LF
+	test_all_match git check-attr -a -- deep/a &&
 
-expecting success of 0027.185 'commit NNO files attr=text aeol=crlf crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 185 - commit NNO files attr=text aeol=crlf crlf=false CRLF
+	test_all_match git add deep/.gitattributes &&
+	test_all_match git check-attr -a --cached -- deep/a
 
-expecting success of 0027.186 'commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 186 - commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 92 - check-attr with pathspec inside sparse definition
 
-expecting success of 0027.187 'commit NNO files attr=text aeol=crlf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 187 - commit NNO files attr=text aeol=crlf crlf=false LF_mix_cr
+expecting success of 1092.93 'check-attr with pathspec outside sparse definition': 
+	init_repos &&
 
-expecting success of 0027.188 'commit NNO files attr=text aeol=crlf crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 188 - commit NNO files attr=text aeol=crlf crlf=false CRLF_nul
+	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 0027.189 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 189 - setup commit NNO files
+	test_all_match git check-attr -a -- folder1/a &&
 
-expecting success of 0027.190 'commit NNO files crlf=input attr=-text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 190 - commit NNO files crlf=input attr=-text LF
+	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 0027.191 'commit NNO files attr=-text aeol= crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 191 - commit NNO files attr=-text aeol= crlf=input CRLF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 93 - check-attr with pathspec outside sparse definition
 
-expecting success of 0027.192 'commit NNO files attr=-text aeol= crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 192 - commit NNO files attr=-text aeol= crlf=input CRLF_mix_LF
+checking known breakage of 1092.94 'diff --check with pathspec outside sparse definition': 
+	init_repos &&
 
-expecting success of 0027.193 'commit NNO files attr=-text aeol= crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 193 - commit NNO files attr=-text aeol= crlf=input LF_mix_cr
+	write_script edit-contents <<-\EOF &&
+	echo "a " >"$1"
+	EOF
 
-expecting success of 0027.194 'commit NNO files attr=-text aeol= crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 194 - commit NNO files attr=-text aeol= crlf=input CRLF_nul
+	test_all_match git config core.whitespace -trailing-space,-space-before-tab &&
 
-expecting success of 0027.195 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 195 - setup commit NNO files
+	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 0027.196 'commit NNO files crlf=input attr=-text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 196 - commit NNO files crlf=input attr=-text LF
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match test_must_fail git diff --check --cached -- folder1/a
 
-expecting success of 0027.197 'commit NNO files attr=-text aeol=lf crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 197 - commit NNO files attr=-text aeol=lf crlf=input CRLF
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+test_must_fail: command succeeded: git diff --check --cached -- folder1/a
+not ok 94 - diff --check with pathspec outside sparse definition # TODO known breakage
 
-expecting success of 0027.198 'commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 198 - commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF
+expecting success of 1092.95 'sparse-index is not expanded: check-attr': 
+	init_repos &&
 
-expecting success of 0027.199 'commit NNO files attr=-text aeol=lf crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 199 - commit NNO files attr=-text aeol=lf crlf=input LF_mix_cr
+	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 0027.200 'commit NNO files attr=-text aeol=lf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 200 - commit NNO files attr=-text aeol=lf crlf=input CRLF_nul
+	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 0027.201 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 201 - setup commit NNO files
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 95 - sparse-index is not expanded: check-attr
 
-expecting success of 0027.202 'commit NNO files crlf=input attr=-text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 202 - commit NNO files crlf=input attr=-text LF
+expecting success of 1092.96 'advice.sparseIndexExpanded': 
+	init_repos &&
 
-expecting success of 0027.203 'commit NNO files attr=-text aeol=crlf crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 203 - commit NNO files attr=-text aeol=crlf crlf=input CRLF
+	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 0027.204 'commit NNO files attr=-text aeol=crlf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 204 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_mix_LF
+	git -C sparse-index sparse-checkout disable 2>err &&
+	test_line_count = 0 err
 
-expecting success of 0027.205 'commit NNO files attr=-text aeol=crlf crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 205 - commit NNO files attr=-text aeol=crlf crlf=input LF_mix_cr
+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 0027.206 'commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 206 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	deep/deeper2/deepest/
 
-expecting success of 0027.207 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 207 - setup commit NNO files
+nothing added to commit but untracked files present (use "git add" to track)
+hint: The sparse index is expanding to a full index, a slow operation.
+ok 96 - advice.sparseIndexExpanded
 
-expecting success of 0027.208 'commit NNO files crlf=input attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 208 - commit NNO files crlf=input attr= LF
+expecting success of 1092.97 'cat-file -p': 
+	init_repos &&
+	echo "new content" >>full-checkout/deep/a &&
+	echo "new content" >>sparse-checkout/deep/a &&
+	echo "new content" >>sparse-index/deep/a &&
+	run_on_all git add deep/a &&
 
-expecting success of 0027.209 'commit NNO files attr= aeol=lf crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 209 - commit NNO files attr= aeol=lf crlf=input CRLF
+	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 0027.210 'commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 210 - commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF
+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":"20250130T021031.598979Z-H5c947e1c-P001b4d57","thread":"main","time":"2025-01-30T02:10:31.604204Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250130T021031.598979Z-H5c947e1c-P001b4d57","thread":"main","time":"2025-01-30T02:10:31.605045Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000841,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 97 - cat-file -p
 
-expecting success of 0027.211 'commit NNO files attr= aeol=lf crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 211 - commit NNO files attr= aeol=lf crlf=input LF_mix_cr
+expecting success of 1092.98 'cat-file --batch': 
+	init_repos &&
+	echo "new content" >>full-checkout/deep/a &&
+	echo "new content" >>sparse-checkout/deep/a &&
+	echo "new content" >>sparse-index/deep/a &&
+	run_on_all git add deep/a &&
 
-expecting success of 0027.212 'commit NNO files attr= aeol=lf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 212 - commit NNO files attr= aeol=lf crlf=input CRLF_nul
+	echo ":deep/a" >in &&
+	test_all_match git cat-file --batch <in &&
+	ensure_not_expanded cat-file --batch <in &&
 
-expecting success of 0027.213 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 213 - setup commit NNO files
+	echo ":folder1/a" >in &&
+	test_all_match git cat-file --batch <in &&
+	ensure_expanded cat-file --batch <in &&
 
-expecting success of 0027.214 'commit NNO files crlf=input attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 214 - commit NNO files crlf=input attr= LF
+	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 0027.215 'commit NNO files attr= aeol=crlf crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 215 - commit NNO files attr= aeol=crlf crlf=input CRLF
+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":"20250130T021032.670297Z-H5c947e1c-P001b507e","thread":"main","time":"2025-01-30T02:10:32.671224Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250130T021032.670297Z-H5c947e1c-P001b507e","thread":"main","time":"2025-01-30T02:10:32.677519Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.006296,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250130T021032.970022Z-H5c947e1c-P001b515d","thread":"main","time":"2025-01-30T02:10:32.971034Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250130T021032.970022Z-H5c947e1c-P001b515d","thread":"main","time":"2025-01-30T02:10:32.975918Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.004883,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 98 - cat-file --batch
 
-expecting success of 0027.216 'commit NNO files attr= aeol=crlf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 216 - commit NNO files attr= aeol=crlf crlf=input CRLF_mix_LF
+# still have 2 known breakage(s)
+# passed all remaining 96 test(s)
+1..98
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3303-notes-subtrees.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3303-notes-subtrees/.git/
+expecting success of 3303.1 'setup: create 100 commits': 
 
-expecting success of 0027.217 'commit NNO files attr= aeol=crlf crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 217 - commit NNO files attr= aeol=crlf crlf=input LF_mix_cr
+	(
+		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
 
-expecting success of 0027.218 'commit NNO files attr= aeol=crlf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 218 - commit NNO files attr= aeol=crlf crlf=input CRLF_nul
+M 644 inline file
+data <<EOF
+file in commit #$nr
+EOF
 
-expecting success of 0027.219 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 219 - setup commit NNO files
+INPUT_END
 
-expecting success of 0027.220 'commit NNO files crlf=input attr=auto LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 220 - commit NNO files crlf=input attr=auto LF
+		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
 
-expecting success of 0027.221 'commit NNO files attr=auto aeol=lf crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 221 - commit NNO files attr=auto aeol=lf crlf=input CRLF
+deleteall
 
-expecting success of 0027.222 'commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 222 - commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF
+INPUT_END
 
-expecting success of 0027.223 'commit NNO files attr=auto aeol=lf crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 223 - commit NNO files attr=auto aeol=lf crlf=input LF_mix_cr
+	) |
+	git fast-import --quiet &&
+	git config core.notesRef refs/notes/commits
 
-expecting success of 0027.224 'commit NNO files attr=auto aeol=lf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 224 - commit NNO files attr=auto aeol=lf crlf=input CRLF_nul
+ok 1 - setup: create 100 commits
 
-expecting success of 0027.225 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 225 - setup commit NNO files
+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 0027.226 'commit NNO files crlf=input attr=auto LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 226 - commit NNO files crlf=input attr=auto LF
+expecting success of 3303.3 'verify notes in 2/38-fanout': verify_notes
+ok 3 - verify notes in 2/38-fanout
 
-expecting success of 0027.227 'commit NNO files attr=auto aeol=crlf crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 227 - commit NNO files attr=auto aeol=crlf crlf=input CRLF
+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 0027.228 'commit NNO files attr=auto aeol=crlf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 228 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_mix_LF
+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 0027.229 'commit NNO files attr=auto aeol=crlf crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 229 - commit NNO files attr=auto aeol=crlf crlf=input LF_mix_cr
+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 0027.230 'commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 230 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul
+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 0027.231 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 231 - setup commit NNO files
+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 0027.232 'commit NNO files crlf=input attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 232 - commit NNO files crlf=input attr=text LF
+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 0027.233 'commit NNO files attr=text aeol=lf crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 233 - commit NNO files attr=text aeol=lf crlf=input CRLF
+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 0027.234 'commit NNO files attr=text aeol=lf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 234 - commit NNO files attr=text aeol=lf crlf=input CRLF_mix_LF
+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 0027.235 'commit NNO files attr=text aeol=lf crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 235 - commit NNO files attr=text aeol=lf crlf=input LF_mix_cr
+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 0027.236 'commit NNO files attr=text aeol=lf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 236 - commit NNO files attr=text aeol=lf crlf=input CRLF_nul
+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 0027.237 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 237 - setup commit NNO files
+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 0027.238 'commit NNO files crlf=input attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 238 - commit NNO files crlf=input attr=text LF
+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 0027.239 'commit NNO files attr=text aeol=crlf crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 239 - commit NNO files attr=text aeol=crlf crlf=input CRLF
+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 0027.240 'commit NNO files attr=text aeol=crlf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 240 - commit NNO files attr=text aeol=crlf crlf=input CRLF_mix_LF
+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 0027.241 'commit NNO files attr=text aeol=crlf crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 241 - commit NNO files attr=text aeol=crlf crlf=input LF_mix_cr
+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 0027.242 'commit NNO files attr=text aeol=crlf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 242 - commit NNO files attr=text aeol=crlf crlf=input CRLF_nul
+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 0027.243 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 243 - setup commit NNO files
+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 0027.244 'commit NNO files crlf=false attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 244 - commit NNO files crlf=false attr=text LF
+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 0027.245 'commit NNO files attr=text aeol= crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 245 - commit NNO files attr=text aeol= crlf=false CRLF
+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 0027.246 'commit NNO files attr=text aeol= crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 246 - commit NNO files attr=text aeol= crlf=false CRLF_mix_LF
+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
 
-expecting success of 0027.247 'commit NNO files attr=text aeol= crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 247 - commit NNO files attr=text aeol= crlf=false LF_mix_cr
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3509-cherry-pick-merge-df.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3509-cherry-pick-merge-df/.git/
+expecting success of 3509.1 'Initialize repository': 
+	mkdir a &&
+	>a/f &&
+	git add a &&
+	git commit -m a
 
-expecting success of 0027.248 'commit NNO files attr=text aeol= crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 248 - commit NNO files attr=text aeol= crlf=false CRLF_nul
+[main (root-commit) 8938fef] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/f
+ok 1 - Initialize repository
 
-expecting success of 0027.249 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 249 - setup commit NNO files
+expecting success of 3509.2 'Setup rename across paths each below D/F conflicts': 
+	mkdir b &&
+	test_ln_s_add ../a b/a &&
+	git commit -m b &&
 
-expecting success of 0027.250 'commit NNO files crlf=true attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 250 - commit NNO files crlf=true attr=text LF
+	git checkout -b branch &&
+	rm b/a &&
+	git mv a b/a &&
+	test_ln_s_add b/a a &&
+	git commit -m swap &&
 
-expecting success of 0027.251 'commit NNO files attr=text aeol= crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 251 - commit NNO files attr=text aeol= crlf=true CRLF
+	>f1 &&
+	git add f1 &&
+	git commit -m f1
 
-expecting success of 0027.252 'commit NNO files attr=text aeol= crlf=true CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 252 - commit NNO files attr=text aeol= crlf=true CRLF_mix_LF
+checking prerequisite: SYMLINKS
 
-expecting success of 0027.253 'commit NNO files attr=text aeol= crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 253 - commit NNO files attr=text aeol= crlf=true LF_mix_cr
+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 0027.254 'commit NNO files attr=text aeol= crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 254 - commit NNO files attr=text aeol= crlf=true CRLF_nul
+)
+prerequisite SYMLINKS ok
+[main 6c20241] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 b/a
+Switched to a new branch 'branch'
+[branch 138a745] swap
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 120000 a
+ delete mode 120000 b/a
+ rename {a => b/a}/f (100%)
+[branch b71b76f] f1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 f1
+ok 2 - Setup rename across paths each below D/F conflicts
 
-expecting success of 0027.255 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 255 - setup commit NNO files
+expecting success of 3509.3 'Cherry-pick succeeds with rename across D/F conflicts': 
+	git reset --hard &&
+	git checkout main^0 &&
+	git cherry-pick branch
 
-expecting success of 0027.256 'commit NNO files crlf=input attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 256 - commit NNO files crlf=input attr=text LF
+HEAD is now at b71b76f f1
+Note: switching to 'main^0'.
 
-expecting success of 0027.257 'commit NNO files attr=text aeol= crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 257 - commit NNO files attr=text aeol= crlf=input CRLF
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 0027.258 'commit NNO files attr=text aeol= crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 258 - commit NNO files attr=text aeol= crlf=input CRLF_mix_LF
+If you want to 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 0027.259 'commit NNO files attr=text aeol= crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 259 - commit NNO files attr=text aeol= crlf=input LF_mix_cr
+  git switch -c <new-branch-name>
 
-expecting success of 0027.260 'commit NNO files attr=text aeol= crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 260 - commit NNO files attr=text aeol= crlf=input CRLF_nul
+Or undo this operation with:
 
-expecting success of 0027.261 'commit NNO and cleanup': 
-	git commit -m "commit files on top of NNO" &&
-	rm -f *.txt &&
-	git -c core.autocrlf=false reset --hard
+  git switch -
 
-[main 35da0ca] commit files on top of NNO
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6c20241 b
+[detached HEAD 1b1aec6] f1
  Author: A U Thor <author@example.com>
- 210 files changed, 332 insertions(+), 362 deletions(-)
-HEAD is now at 35da0ca commit files on top of NNO
-ok 261 - commit NNO and cleanup
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 f1
+ok 3 - Cherry-pick succeeds with rename across D/F conflicts
 
-expecting success of 0027.262 'commit empty gitattribues': 
-	check_files_in_repo false ""      LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
-	check_files_in_repo true  ""      LF LF   LF          LF_mix_CR CRLF_nul &&
-	check_files_in_repo input ""      LF LF   LF          LF_mix_CR CRLF_nul
+expecting success of 3509.4 'Setup rename with file on one side matching directory name on other': 
+	git checkout --orphan nick-testcase &&
+	git rm -rf . &&
 
-ok 262 - commit empty gitattribues
+	>empty &&
+	git add empty &&
+	git commit -m "Empty file" &&
 
-expecting success of 0027.263 'commit text=auto': 
-	check_files_in_repo false "auto"  LF LF   LF          LF_mix_CR CRLF_nul &&
-	check_files_in_repo true  "auto"  LF LF   LF          LF_mix_CR CRLF_nul &&
-	check_files_in_repo input "auto"  LF LF   LF          LF_mix_CR CRLF_nul
+	git checkout -b simple &&
+	mv empty file &&
+	mkdir empty &&
+	mv file empty &&
+	git add empty/file &&
+	git commit -m "Empty file under empty dir" &&
 
-ok 263 - commit text=auto
+	echo content >newfile &&
+	git add newfile &&
+	git commit -m "New file"
 
-expecting success of 0027.264 'commit text': 
-	check_files_in_repo false "text"  LF LF   LF          LF_mix_CR LF_nul &&
-	check_files_in_repo true  "text"  LF LF   LF          LF_mix_CR LF_nul &&
-	check_files_in_repo input "text"  LF LF   LF          LF_mix_CR LF_nul
+Switched to a new branch 'nick-testcase'
+rm 'a/f'
+rm 'b/a'
+rm 'f1'
+[nick-testcase (root-commit) f619bd8] Empty file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty
+Switched to a new branch 'simple'
+[simple 735003f] Empty file under empty dir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename empty => empty/file (100%)
+[simple 2eb2ba1] New file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newfile
+ok 4 - Setup rename with file on one side matching directory name on other
 
-ok 264 - commit text
+expecting success of 3509.5 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)': 
+	git reset --hard &&
+	git checkout -q nick-testcase^0 &&
+	git cherry-pick --strategy=resolve simple
 
-expecting success of 0027.265 'commit -text': 
-	check_files_in_repo false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
-	check_files_in_repo true  "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
-	check_files_in_repo input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+HEAD is now at 2eb2ba1 New file
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+[detached HEAD 072269c] New file
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newfile
+ok 5 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)
 
-ok 265 - commit -text
+expecting success of 3509.6 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)': 
+	git reset --hard &&
+	git checkout -q nick-testcase^0 &&
+	git cherry-pick --strategy=recursive simple
 
-expecting success of 0027.266 'compare_files LF NNO_attr__aeol__true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 266 - compare_files LF NNO_attr__aeol__true_LF.txt
+HEAD is now at 072269c New file
+Adding empty
+[detached HEAD 072269c] New file
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newfile
+ok 6 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)
 
-expecting success of 0027.267 'compare_files CRLF NNO_attr__aeol__true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 267 - compare_files CRLF NNO_attr__aeol__true_CRLF.txt
+expecting success of 3509.7 'Setup rename with file on one side matching different dirname on other': 
+	git reset --hard &&
+	git checkout --orphan mergeme &&
+	git rm -rf . &&
 
-expecting success of 0027.268 'compare_files CRLF_mix_LF NNO_attr__aeol__true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 268 - compare_files CRLF_mix_LF NNO_attr__aeol__true_CRLF_mix_LF.txt
+	mkdir sub &&
+	mkdir othersub &&
+	echo content > sub/file &&
+	echo foo > othersub/whatever &&
+	git add -A &&
+	git commit -m "Common commit" &&
 
-expecting success of 0027.269 'compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 269 - compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt
+	git rm -rf othersub &&
+	git mv sub/file othersub &&
+	git commit -m "Commit to merge" &&
 
-expecting success of 0027.270 'compare_files CRLF_nul NNO_attr__aeol__true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 270 - compare_files CRLF_nul NNO_attr__aeol__true_CRLF_nul.txt
+	git checkout -b newhead mergeme~1 &&
+	>independent-change &&
+	git add independent-change &&
+	git commit -m "Completely unrelated change"
 
-expecting success of 0027.271 'compare_files LF NNO_attr_-text_aeol__true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 271 - compare_files LF NNO_attr_-text_aeol__true_LF.txt
+HEAD is now at 072269c New file
+Switched to a new branch 'mergeme'
+rm 'empty'
+rm 'newfile'
+[mergeme (root-commit) 220cb6a] Common commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 othersub/whatever
+ create mode 100644 sub/file
+rm 'othersub/whatever'
+[mergeme 73ee5a0] Commit to merge
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ rename sub/file => othersub (100%)
+ delete mode 100644 othersub/whatever
+Switched to a new branch 'newhead'
+[newhead dec5ebc] Completely unrelated change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 independent-change
+ok 7 - Setup rename with file on one side matching different dirname on other
 
-expecting success of 0027.272 'compare_files CRLF NNO_attr_-text_aeol__true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 272 - compare_files CRLF NNO_attr_-text_aeol__true_CRLF.txt
+expecting success of 3509.8 'Cherry-pick with rename to different D/F conflict succeeds (resolve)': 
+	git reset --hard &&
+	git checkout -q newhead^0 &&
+	git cherry-pick --strategy=resolve mergeme
 
-expecting success of 0027.273 'compare_files CRLF_mix_LF NNO_attr_-text_aeol__true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 273 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__true_CRLF_mix_LF.txt
+HEAD is now at dec5ebc Completely unrelated change
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Adding othersub
+[detached HEAD 8d9f455] Commit to merge
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 1 deletion(-)
+ rename sub/file => othersub (100%)
+ delete mode 100644 othersub/whatever
+ok 8 - Cherry-pick with rename to different D/F conflict succeeds (resolve)
 
-expecting success of 0027.274 'compare_files LF_mix_CR NNO_attr_-text_aeol__true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 274 - compare_files LF_mix_CR NNO_attr_-text_aeol__true_LF_mix_CR.txt
+expecting success of 3509.9 'Cherry-pick with rename to different D/F conflict succeeds (recursive)': 
+	git reset --hard &&
+	git checkout -q newhead^0 &&
+	git cherry-pick --strategy=recursive mergeme
 
-expecting success of 0027.275 'compare_files CRLF_nul NNO_attr_-text_aeol__true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 275 - compare_files CRLF_nul NNO_attr_-text_aeol__true_CRLF_nul.txt
+HEAD is now at 8d9f455 Commit to merge
+Removing othersub/whatever
+[detached HEAD 8d9f455] Commit to merge
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 1 deletion(-)
+ rename sub/file => othersub (100%)
+ delete mode 100644 othersub/whatever
+ok 9 - Cherry-pick with rename to different D/F conflict succeeds (recursive)
 
-expecting success of 0027.276 'compare_files LF NNO_attr_-text_aeol_lf_true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 276 - compare_files LF NNO_attr_-text_aeol_lf_true_LF.txt
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3508-cherry-pick-many-commits.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 0027.277 'compare_files CRLF NNO_attr_-text_aeol_lf_true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 277 - compare_files CRLF NNO_attr_-text_aeol_lf_true_CRLF.txt
+	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 0027.278 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 278 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt
+[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 0027.279 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 279 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt
+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 0027.280 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 280 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_true_CRLF_nul.txt
+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 0027.281 'compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 281 - compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt
+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 0027.282 'compare_files CRLF NNO_attr_-text_aeol_crlf_true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 282 - compare_files CRLF NNO_attr_-text_aeol_crlf_true_CRLF.txt
+Note: switching to 'first'.
 
-expecting success of 0027.283 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 283 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 0027.284 'compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 284 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_true_LF_mix_CR.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:
 
-expecting success of 0027.285 'compare_files CRLF_nul NNO_attr_-text_aeol_crlf_true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 285 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_true_CRLF_nul.txt
+  git switch -c <new-branch-name>
 
-expecting success of 0027.286 'compare_files LF NNO_attr_auto_aeol__true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 286 - compare_files LF NNO_attr_auto_aeol__true_LF.txt
+Or undo this operation with:
 
-expecting success of 0027.287 'compare_files CRLF NNO_attr_auto_aeol__true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 287 - compare_files CRLF NNO_attr_auto_aeol__true_CRLF.txt
+  git switch -
 
-expecting success of 0027.288 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 288 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__true_CRLF_mix_LF.txt
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 0027.289 'compare_files LF_mix_CR NNO_attr_auto_aeol__true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 289 - compare_files LF_mix_CR NNO_attr_auto_aeol__true_LF_mix_CR.txt
+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 0027.290 'compare_files CRLF_nul NNO_attr_auto_aeol__true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 290 - compare_files CRLF_nul NNO_attr_auto_aeol__true_CRLF_nul.txt
+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 0027.291 'compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 291 - compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt
+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 0027.292 'compare_files CRLF NNO_attr_auto_aeol_lf_true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 292 - compare_files CRLF NNO_attr_auto_aeol_lf_true_CRLF.txt
+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 0027.293 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 293 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
+	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 0027.294 'compare_files LF_mix_CR NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 294 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 5 - output to keep user entertained during multi-pick
 
-expecting success of 0027.295 'compare_files CRLF_nul NNO_attr_auto_aeol_lf_true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 295 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_true_CRLF_nul.txt
+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 0027.296 'compare_files LF NNO_attr_auto_aeol_crlf_true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 296 - compare_files LF NNO_attr_auto_aeol_crlf_true_LF.txt
+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 0027.297 'compare_files CRLF NNO_attr_auto_aeol_crlf_true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 297 - compare_files CRLF NNO_attr_auto_aeol_crlf_true_CRLF.txt
+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 0027.298 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 298 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt
+	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 0027.299 'compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 299 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_true_LF_mix_CR.txt
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 7 - output during multi-pick indicates merge strategy
 
-expecting success of 0027.300 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 300 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_true_CRLF_nul.txt
+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 0027.301 'compare_files LF NNO_attr_text_aeol__true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 301 - compare_files LF NNO_attr_text_aeol__true_LF.txt
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 8 - cherry-pick --ff first..fourth works
 
-expecting success of 0027.302 'compare_files LF NNO_attr_text_aeol__true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 302 - compare_files LF NNO_attr_text_aeol__true_CRLF.txt
+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 0027.303 'compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 303 - compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt
+Already on 'main'
+HEAD is now at 0c72e4f first
+ok 9 - cherry-pick -n first..fourth works
 
-expecting success of 0027.304 'compare_files LF_mix_CR NNO_attr_text_aeol__true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 304 - compare_files LF_mix_CR NNO_attr_text_aeol__true_LF_mix_CR.txt
+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 0027.305 'compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 305 - compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt
+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 0027.306 'compare_files LF NNO_attr_text_aeol_lf_true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 306 - compare_files LF NNO_attr_text_aeol_lf_true_LF.txt
+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 0027.307 'compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 307 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt
+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 0027.308 'compare_files LF NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 308 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt
+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 0027.309 'compare_files LF_mix_CR NNO_attr_text_aeol_lf_true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 309 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_true_LF_mix_CR.txt
+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 0027.310 'compare_files LF_nul NNO_attr_text_aeol_lf_true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 310 - compare_files LF_nul NNO_attr_text_aeol_lf_true_CRLF_nul.txt
+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 0027.311 'compare_files LF NNO_attr_text_aeol_crlf_true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 311 - compare_files LF NNO_attr_text_aeol_crlf_true_LF.txt
+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 0027.312 'compare_files LF NNO_attr_text_aeol_crlf_true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 312 - compare_files LF NNO_attr_text_aeol_crlf_true_CRLF.txt
+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 0027.313 'compare_files LF NNO_attr_text_aeol_crlf_true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 313 - compare_files LF NNO_attr_text_aeol_crlf_true_CRLF_mix_LF.txt
+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 0027.314 'compare_files LF_mix_CR NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 314 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3514-cherry-pick-revert-gpg.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3514-cherry-pick-revert-gpg/.git/
+checking prerequisite: GPG
 
-expecting success of 0027.315 'compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 315 - compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt
+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 0027.316 'compare_files LF NNO_attr__aeol__false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 316 - compare_files LF NNO_attr__aeol__false_LF.txt
+	# 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 0027.317 'compare_files CRLF NNO_attr__aeol__false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 317 - compare_files CRLF NNO_attr__aeol__false_CRLF.txt
+)
+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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3601-rm-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 0027.318 'compare_files CRLF_mix_LF NNO_attr__aeol__false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 318 - compare_files CRLF_mix_LF NNO_attr__aeol__false_CRLF_mix_LF.txt
+	git tag checkpoint
 
-expecting success of 0027.319 'compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 319 - compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt
+[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 0027.320 'compare_files CRLF_nul NNO_attr__aeol__false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 320 - compare_files CRLF_nul NNO_attr__aeol__false_CRLF_nul.txt
+expecting success of 3601.2 'simplest': 
+	restore_checkpoint &&
 
-expecting success of 0027.321 'compare_files LF NNO_attr_-text_aeol__false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 321 - compare_files LF NNO_attr_-text_aeol__false_LF.txt
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	EOF
 
-expecting success of 0027.322 'compare_files CRLF NNO_attr_-text_aeol__false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 322 - compare_files CRLF NNO_attr_-text_aeol__false_CRLF.txt
+	echo fileA.t | git rm --pathspec-from-file=- &&
+	verify_expect
 
-expecting success of 0027.323 'compare_files CRLF_mix_LF NNO_attr_-text_aeol__false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 323 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__false_CRLF_mix_LF.txt
+HEAD is now at d32ab08 files
+rm 'fileA.t'
+ok 2 - simplest
 
-expecting success of 0027.324 'compare_files LF_mix_CR NNO_attr_-text_aeol__false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 324 - compare_files LF_mix_CR NNO_attr_-text_aeol__false_LF_mix_CR.txt
+expecting success of 3601.3 '--pathspec-file-nul': 
+	restore_checkpoint &&
 
-expecting success of 0027.325 'compare_files CRLF_nul NNO_attr_-text_aeol__false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 325 - compare_files CRLF_nul NNO_attr_-text_aeol__false_CRLF_nul.txt
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	D  fileB.t
+	EOF
 
-expecting success of 0027.326 'compare_files LF NNO_attr_-text_aeol_lf_false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 326 - compare_files LF NNO_attr_-text_aeol_lf_false_LF.txt
+	printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul &&
+	verify_expect
 
-expecting success of 0027.327 'compare_files CRLF NNO_attr_-text_aeol_lf_false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 327 - compare_files CRLF NNO_attr_-text_aeol_lf_false_CRLF.txt
+HEAD is now at d32ab08 files
+rm 'fileA.t'
+rm 'fileB.t'
+ok 3 - --pathspec-file-nul
 
-expecting success of 0027.328 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 328 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt
+expecting success of 3601.4 'only touches what was listed': 
+	restore_checkpoint &&
 
-expecting success of 0027.329 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 329 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt
+	cat >expect <<-\EOF &&
+	D  fileB.t
+	D  fileC.t
+	EOF
 
-expecting success of 0027.330 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 330 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_false_CRLF_nul.txt
+	printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- &&
+	verify_expect
 
-expecting success of 0027.331 'compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 331 - compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt
+HEAD is now at d32ab08 files
+rm 'fileB.t'
+rm 'fileC.t'
+ok 4 - only touches what was listed
 
-expecting success of 0027.332 'compare_files CRLF NNO_attr_-text_aeol_crlf_false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 332 - compare_files CRLF NNO_attr_-text_aeol_crlf_false_CRLF.txt
+expecting success of 3601.5 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
 
-expecting success of 0027.333 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 333 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt
+	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 0027.334 'compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 334 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_false_LF_mix_CR.txt
+	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 0027.335 'compare_files CRLF_nul NNO_attr_-text_aeol_crlf_false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 335 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_false_CRLF_nul.txt
+	>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 0027.336 'compare_files LF NNO_attr_auto_aeol__false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 336 - compare_files LF NNO_attr_auto_aeol__false_LF.txt
+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 0027.337 'compare_files CRLF NNO_attr_auto_aeol__false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 337 - compare_files CRLF NNO_attr_auto_aeol__false_CRLF.txt
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3511-cherry-pick-x.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3511-cherry-pick-x/.git/
+expecting success of 3511.1 'setup': 
+	git config 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 0027.338 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 338 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__false_CRLF_mix_LF.txt
+[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 0027.339 'compare_files LF_mix_CR NNO_attr_auto_aeol__false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 339 - compare_files LF_mix_CR NNO_attr_auto_aeol__false_LF_mix_CR.txt
+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 0027.340 'compare_files CRLF_nul NNO_attr_auto_aeol__false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 340 - compare_files CRLF_nul NNO_attr_auto_aeol__false_CRLF_nul.txt
+		(cherry picked from commit $sha1)
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.341 'compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 341 - compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt
+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 0027.342 'compare_files CRLF NNO_attr_auto_aeol_lf_false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 342 - compare_files CRLF NNO_attr_auto_aeol_lf_false_CRLF.txt
+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 0027.343 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 343 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.344 'compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 344 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.345 'compare_files CRLF_nul NNO_attr_auto_aeol_lf_false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 345 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_false_CRLF_nul.txt
+  6970a53 base: commit message
 
-expecting success of 0027.346 'compare_files LF NNO_attr_auto_aeol_crlf_false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 346 - compare_files LF NNO_attr_auto_aeol_crlf_false_LF.txt
+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 0027.347 'compare_files CRLF NNO_attr_auto_aeol_crlf_false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 347 - compare_files CRLF NNO_attr_auto_aeol_crlf_false_CRLF.txt
+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 0027.348 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 348 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.349 'compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 349 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_false_LF_mix_CR.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.350 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 350 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt
+  0fda2e1 base: commit message
 
-expecting success of 0027.351 'compare_files LF NNO_attr_text_aeol__false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 351 - compare_files LF NNO_attr_text_aeol__false_LF.txt
+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 0027.352 'compare_files LF NNO_attr_text_aeol__false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 352 - compare_files LF NNO_attr_text_aeol__false_CRLF.txt
+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 0027.353 'compare_files LF NNO_attr_text_aeol__false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 353 - compare_files LF NNO_attr_text_aeol__false_CRLF_mix_LF.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.354 'compare_files LF_mix_CR NNO_attr_text_aeol__false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 354 - compare_files LF_mix_CR NNO_attr_text_aeol__false_LF_mix_CR.txt
+  0cf5261 base: commit message
 
-expecting success of 0027.355 'compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 355 - compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt
+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 0027.356 'compare_files LF NNO_attr_text_aeol_lf_false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 356 - compare_files LF NNO_attr_text_aeol_lf_false_LF.txt
+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 0027.357 'compare_files LF NNO_attr_text_aeol_lf_false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 357 - compare_files LF NNO_attr_text_aeol_lf_false_CRLF.txt
+		(cherry picked from commit $sha1)
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.358 'compare_files LF NNO_attr_text_aeol_lf_false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 358 - compare_files LF NNO_attr_text_aeol_lf_false_CRLF_mix_LF.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.359 'compare_files LF_mix_CR NNO_attr_text_aeol_lf_false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 359 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_false_LF_mix_CR.txt
+  b95a0f7 base: commit message
 
-expecting success of 0027.360 'compare_files LF_nul NNO_attr_text_aeol_lf_false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 360 - compare_files LF_nul NNO_attr_text_aeol_lf_false_CRLF_nul.txt
+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 0027.361 'compare_files LF NNO_attr_text_aeol_crlf_false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 361 - compare_files LF NNO_attr_text_aeol_crlf_false_LF.txt
+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 0027.362 'compare_files LF NNO_attr_text_aeol_crlf_false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 362 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF.txt
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.363 'compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 363 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.364 'compare_files LF_mix_CR NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 364 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt
+  6f42e54 base: commit message
 
-expecting success of 0027.365 'compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 365 - compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt
+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 0027.366 'compare_files LF NNO_attr__aeol__input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 366 - compare_files LF NNO_attr__aeol__input_LF.txt
+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 0027.367 'compare_files CRLF NNO_attr__aeol__input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 367 - compare_files CRLF NNO_attr__aeol__input_CRLF.txt
+		(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 0027.368 'compare_files CRLF_mix_LF NNO_attr__aeol__input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 368 - compare_files CRLF_mix_LF NNO_attr__aeol__input_CRLF_mix_LF.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.369 'compare_files LF_mix_CR NNO_attr__aeol__input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 369 - compare_files LF_mix_CR NNO_attr__aeol__input_LF_mix_CR.txt
+  32d2dda base: commit message
 
-expecting success of 0027.370 'compare_files CRLF_nul NNO_attr__aeol__input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 370 - compare_files CRLF_nul NNO_attr__aeol__input_CRLF_nul.txt
+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 0027.371 'compare_files LF NNO_attr_-text_aeol__input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 371 - compare_files LF NNO_attr_-text_aeol__input_LF.txt
+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 0027.372 'compare_files CRLF NNO_attr_-text_aeol__input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 372 - compare_files CRLF NNO_attr_-text_aeol__input_CRLF.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.373 'compare_files CRLF_mix_LF NNO_attr_-text_aeol__input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 373 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__input_CRLF_mix_LF.txt
+  adaaef8 base: commit message
 
-expecting success of 0027.374 'compare_files LF_mix_CR NNO_attr_-text_aeol__input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 374 - compare_files LF_mix_CR NNO_attr_-text_aeol__input_LF_mix_CR.txt
+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 0027.375 'compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 375 - compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt
+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 0027.376 'compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 376 - compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.377 'compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 377 - compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt
+  b62bd75 base: commit message
 
-expecting success of 0027.378 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 378 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt
+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 0027.379 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 379 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt
+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 0027.380 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 380 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.381 'compare_files LF NNO_attr_-text_aeol_crlf_input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 381 - compare_files LF NNO_attr_-text_aeol_crlf_input_LF.txt
+  94e740a base: commit message
 
-expecting success of 0027.382 'compare_files CRLF NNO_attr_-text_aeol_crlf_input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 382 - compare_files CRLF NNO_attr_-text_aeol_crlf_input_CRLF.txt
+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 0027.383 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 383 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt
+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 0027.384 'compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 384 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.385 'compare_files CRLF_nul NNO_attr_-text_aeol_crlf_input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 385 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_input_CRLF_nul.txt
+  a836c16 base: commit message
 
-expecting success of 0027.386 'compare_files LF NNO_attr_auto_aeol__input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 386 - compare_files LF NNO_attr_auto_aeol__input_LF.txt
+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 0027.387 'compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 387 - compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt
+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 0027.388 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 388 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt
+	printf "\n(cherry picked from commit %s)\n" $sha1 >>msg &&
+	test_cmp msg actual
 
-expecting success of 0027.389 'compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 389 - compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.390 'compare_files CRLF_nul NNO_attr_auto_aeol__input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 390 - compare_files CRLF_nul NNO_attr_auto_aeol__input_CRLF_nul.txt
+  2d6e386 base: commit message
 
-expecting success of 0027.391 'compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 391 - compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt
+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 0027.392 'compare_files CRLF NNO_attr_auto_aeol_lf_input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 392 - compare_files CRLF NNO_attr_auto_aeol_lf_input_CRLF.txt
+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 0027.393 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 393 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_input_CRLF_mix_LF.txt
+	printf "\n\n(cherry picked from commit %s)\n" $sha1 >>msg &&
+	test_cmp msg actual
 
-expecting success of 0027.394 'compare_files LF_mix_CR NNO_attr_auto_aeol_lf_input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 394 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_input_LF_mix_CR.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.395 'compare_files CRLF_nul NNO_attr_auto_aeol_lf_input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 395 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_input_CRLF_nul.txt
+  96716be title
 
-expecting success of 0027.396 'compare_files LF NNO_attr_auto_aeol_crlf_input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 396 - compare_files LF NNO_attr_auto_aeol_crlf_input_LF.txt
+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 0027.397 'compare_files CRLF NNO_attr_auto_aeol_crlf_input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 397 - compare_files CRLF NNO_attr_auto_aeol_crlf_input_CRLF.txt
+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 0027.398 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 398 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt
+	printf "\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
+	test_cmp msg actual
 
-expecting success of 0027.399 'compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 399 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.400 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 400 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt
+  8c5d63f title
 
-expecting success of 0027.401 'compare_files LF NNO_attr_text_aeol__input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 401 - compare_files LF NNO_attr_text_aeol__input_LF.txt
+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 0027.402 'compare_files LF NNO_attr_text_aeol__input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 402 - compare_files LF NNO_attr_text_aeol__input_CRLF.txt
+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 0027.403 'compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 403 - compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt
+	printf "\n\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
+	test_cmp msg actual
 
-expecting success of 0027.404 'compare_files LF_mix_CR NNO_attr_text_aeol__input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 404 - compare_files LF_mix_CR NNO_attr_text_aeol__input_LF_mix_CR.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.405 'compare_files LF_nul NNO_attr_text_aeol__input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 405 - compare_files LF_nul NNO_attr_text_aeol__input_CRLF_nul.txt
+  6671fda title
 
-expecting success of 0027.406 'compare_files LF NNO_attr_text_aeol_lf_input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 406 - compare_files LF NNO_attr_text_aeol_lf_input_LF.txt
+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 0027.407 'compare_files LF NNO_attr_text_aeol_lf_input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 407 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF.txt
+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 0027.408 'compare_files LF NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 408 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.409 'compare_files LF_mix_CR NNO_attr_text_aeol_lf_input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 409 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_input_LF_mix_CR.txt
+  19f481d title
 
-expecting success of 0027.410 'compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 410 - compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt
+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 0027.411 'compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 411 - compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt
+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 0027.412 'compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 412 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.413 'compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 413 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
+  7b5eb6d base: commit message
 
-expecting success of 0027.414 'compare_files LF_mix_CR NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 414 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt
+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 0027.415 'compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 415 - compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt
+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 0027.416 'setup config for checkout attr=-text ident= aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 416 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.417 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 417 - setup LF checkout  with -c core.eol=lf
+  b468a7b base: commit message
 
-expecting success of 0027.418 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 418 - setup CRLF checkout  with -c core.eol=lf
+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 0027.419 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 419 - setup LF_mix_CR checkout  with -c core.eol=lf
+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 0027.420 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 420 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.421 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 421 - setup LF_nul checkout  with -c core.eol=lf
+  c7c741c base: commit message
 
-expecting success of 0027.422 'ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 422 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=lf
+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 0027.423 'checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 423 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF
+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 0027.424 'checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 424 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.425 'checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 425 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+  7a2ed43 base: commit message
 
-expecting success of 0027.426 'checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 426 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+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 0027.427 'checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 427 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
+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 0027.428 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 428 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.429 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 429 - setup LF checkout  with -c core.eol=lf
+  ad2d5bc base: commit message
 
-expecting success of 0027.430 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 430 - setup CRLF checkout  with -c core.eol=lf
+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 0027.431 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 431 - setup LF_mix_CR checkout  with -c core.eol=lf
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3507-cherry-pick-conflict.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3507-cherry-pick-conflict/.git/
+expecting success of 3507.1 'setup': 
 
-expecting success of 0027.432 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 432 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+	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 advice.detachedhead false
 
-expecting success of 0027.433 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 433 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.434 'ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 434 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=lf
+[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 0027.435 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 435 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF
+expecting success of 3507.2 'failed cherry-pick does not advance HEAD': 
+	pristine_detach initial &&
 
-expecting success of 0027.436 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 436 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+	head=$(git rev-parse HEAD) &&
+	test_must_fail git cherry-pick picked &&
+	newhead=$(git rev-parse HEAD) &&
 
-expecting success of 0027.437 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 437 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+	test "$head" = "$newhead"
 
-expecting success of 0027.438 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 438 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+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 advice.mergeConflict false"
+ok 2 - failed cherry-pick does not advance HEAD
 
-expecting success of 0027.439 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 439 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+expecting success of 3507.3 'advice from failed cherry-pick': 
+	pristine_detach initial &&
 
-expecting success of 0027.440 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 440 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
+	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 advice.mergeConflict false"
+	EOF
+	test_must_fail git cherry-pick picked 2>actual &&
 
-expecting success of 0027.441 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 441 - setup LF checkout  with -c core.eol=lf
+	test_cmp expected actual
 
-expecting success of 0027.442 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 442 - setup CRLF checkout  with -c core.eol=lf
+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 0027.443 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 443 - setup LF_mix_CR checkout  with -c core.eol=lf
+expecting success of 3507.4 'advice from failed cherry-pick --no-commit': 
+	pristine_detach initial &&
 
-expecting success of 0027.444 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 444 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+	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 advice.mergeConflict false"
+	EOF
+	test_must_fail git cherry-pick --no-commit picked 2>actual &&
 
-expecting success of 0027.445 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 445 - setup LF_nul checkout  with -c core.eol=lf
+	test_cmp expected actual
 
-expecting success of 0027.446 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 446 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=lf
+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 0027.447 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 447 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
+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 0027.448 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 448 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+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 advice.mergeConflict false"
+ok 5 - failed cherry-pick sets CHERRY_PICK_HEAD
 
-expecting success of 0027.449 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 449 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+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 0027.450 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 450 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+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 0027.451 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 451 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+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 0027.452 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 452 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.453 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 453 - setup LF checkout  with -c core.eol=lf
+  ccd9cfc base
 
-expecting success of 0027.454 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 454 - setup CRLF checkout  with -c core.eol=lf
+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 0027.455 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 455 - setup LF_mix_CR checkout  with -c core.eol=lf
+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 0027.456 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 456 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+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 0027.457 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 457 - setup LF_nul checkout  with -c core.eol=lf
+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 0027.458 'ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 458 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=lf
+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 0027.459 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 459 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF
+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 0027.460 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 460 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+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 advice.mergeConflict false"
+fatal: Needed a single revision
+ok 10 - GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD
 
-expecting success of 0027.461 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 461 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+expecting success of 3507.11 'git reset clears CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-expecting success of 0027.462 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 462 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+	test_must_fail git cherry-pick picked &&
+	git reset &&
 
-expecting success of 0027.463 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 463 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-expecting success of 0027.464 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 464 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
+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 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 0027.465 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 465 - setup LF checkout  with -c core.eol=lf
+expecting success of 3507.12 'failed commit does not clear CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-expecting success of 0027.466 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 466 - setup CRLF checkout  with -c core.eol=lf
+	test_must_fail git cherry-pick picked &&
+	test_must_fail git commit &&
 
-expecting success of 0027.467 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 467 - setup LF_mix_CR checkout  with -c core.eol=lf
+	test_cmp_rev picked CHERRY_PICK_HEAD
 
-expecting success of 0027.468 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 468 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+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 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 0027.469 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 469 - setup LF_nul checkout  with -c core.eol=lf
+expecting success of 3507.13 'cancelled commit does not clear CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-expecting success of 0027.470 'ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 470 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=lf
+	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 0027.471 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 471 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
+	test_cmp_rev picked CHERRY_PICK_HEAD
 
-expecting success of 0027.472 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 472 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+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 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 0027.473 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 473 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+expecting success of 3507.14 'successful commit clears CHERRY_PICK_HEAD': 
+	pristine_detach initial &&
 
-expecting success of 0027.474 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 474 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+	test_must_fail git cherry-pick picked &&
+	echo resolved >foo &&
+	git add foo &&
+	git commit &&
 
-expecting success of 0027.475 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 475 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-expecting success of 0027.476 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 476 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
+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 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 0027.477 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 477 - setup LF checkout  with -c core.eol=lf
+expecting success of 3507.15 'partial commit of cherry-pick fails': 
+	pristine_detach initial &&
 
-expecting success of 0027.478 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 478 - setup CRLF checkout  with -c core.eol=lf
+	test_must_fail git cherry-pick picked &&
+	echo resolved >foo &&
+	git add foo &&
+	test_must_fail git commit foo 2>err &&
 
-expecting success of 0027.479 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 479 - setup LF_mix_CR checkout  with -c core.eol=lf
+	test_grep "cannot do a partial commit during a cherry-pick." err
 
-expecting success of 0027.480 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 480 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.481 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 481 - setup LF_nul checkout  with -c core.eol=lf
+  a8c44c9 picked
 
-expecting success of 0027.482 'ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 482 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=lf
+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 advice.mergeConflict false"
+fatal: cannot do a partial commit during a cherry-pick.
+ok 15 - partial commit of cherry-pick fails
 
-expecting success of 0027.483 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 483 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF
+expecting success of 3507.16 'commit --amend of cherry-pick fails': 
+	pristine_detach initial &&
 
-expecting success of 0027.484 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 484 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+	test_must_fail git cherry-pick picked &&
+	echo resolved >foo &&
+	git add foo &&
+	test_must_fail git commit --amend 2>err &&
 
-expecting success of 0027.485 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 485 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+	test_grep "in the middle of a cherry-pick -- cannot amend." err
 
-expecting success of 0027.486 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 486 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+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 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 0027.487 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 487 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+expecting success of 3507.17 'successful final commit clears cherry-pick state': 
+	pristine_detach initial &&
 
-expecting success of 0027.488 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 488 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
+	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 0027.489 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 489 - setup LF checkout  with -c core.eol=lf
+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 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 0027.490 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 490 - setup CRLF checkout  with -c core.eol=lf
+expecting success of 3507.18 'reset after final pick clears cherry-pick state': 
+	pristine_detach initial &&
 
-expecting success of 0027.491 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 491 - setup LF_mix_CR checkout  with -c core.eol=lf
+	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 0027.492 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 492 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.493 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 493 - setup LF_nul checkout  with -c core.eol=lf
+  53c8c73 picked-signed
+  ccd9cfc base
 
-expecting success of 0027.494 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 494 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=lf
+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 advice.mergeConflict false"
+Unstaged changes after reset:
+M	foo
+ok 18 - reset after final pick clears cherry-pick state
 
-expecting success of 0027.495 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 495 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF
+expecting success of 3507.19 'failed cherry-pick produces dirty index': 
+	pristine_detach initial &&
 
-expecting success of 0027.496 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 496 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+	test_must_fail git cherry-pick picked &&
 
-expecting success of 0027.497 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 497 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+	test_must_fail git update-index --refresh -q &&
+	test_must_fail git diff-index --exit-code HEAD
 
-expecting success of 0027.498 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 498 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.499 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 499 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+  ccd9cfc base
 
-expecting success of 0027.500 'setup config for checkout attr=-text ident= aeol= core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 500 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
+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 advice.mergeConflict false"
+foo: needs merge
+:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
+ok 19 - failed cherry-pick produces dirty index
 
-expecting success of 0027.501 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 501 - setup LF checkout  with -c core.eol=lf
+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 0027.502 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 502 - setup CRLF checkout  with -c core.eol=lf
+	test_must_fail git cherry-pick picked &&
+	git ls-files --stage --unmerged >actual &&
 
-expecting success of 0027.503 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 503 - setup LF_mix_CR checkout  with -c core.eol=lf
+	test_cmp expected actual
 
-expecting success of 0027.504 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 504 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+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 advice.mergeConflict false"
+ok 20 - failed cherry-pick registers participants in index
 
-expecting success of 0027.505 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 505 - setup LF_nul checkout  with -c core.eol=lf
+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 0027.506 'ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		# ------------------------ >8 ------------------------
+		# Do not modify or remove the line above.
+		# Everything below it will be ignored.
+		#
+		# Conflicts:
+		#	foo
 		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 506 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=lf
-
-expecting success of 0027.507 'checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 507 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF
-
-expecting success of 0027.508 'checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 508 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF
-
-expecting success of 0027.509 'checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 509 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.510 'checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 510 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
-
-expecting success of 0027.511 'checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 511 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
-
-expecting success of 0027.512 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 512 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
-
-expecting success of 0027.513 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 513 - setup LF checkout  with -c core.eol=lf
-
-expecting success of 0027.514 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 514 - setup CRLF checkout  with -c core.eol=lf
+	test_must_fail git cherry-pick picked &&
 
-expecting success of 0027.515 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 515 - setup LF_mix_CR checkout  with -c core.eol=lf
+	test_cmp expected .git/MERGE_MSG
 
-expecting success of 0027.516 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 516 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+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 advice.mergeConflict false"
+ok 21 - cherry-pick conflict, ensure commit.cleanup = scissors places scissors line properly
 
-expecting success of 0027.517 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 517 - setup LF_nul checkout  with -c core.eol=lf
+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 0027.518 'ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		# ------------------------ >8 ------------------------
+		# Do not modify or remove the line above.
+		# Everything below it will be ignored.
+		#
+		# Conflicts:
+		#	foo
 		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 518 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.519 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 519 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF
+	test_must_fail git cherry-pick --cleanup=scissors picked &&
 
-expecting success of 0027.520 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 520 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+	test_cmp expected .git/MERGE_MSG
 
-expecting success of 0027.521 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 521 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+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 advice.mergeConflict false"
+ok 22 - cherry-pick conflict, ensure cleanup=scissors places scissors line properly
 
-expecting success of 0027.522 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 522 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+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 0027.523 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 523 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+	test_must_fail git cherry-pick picked &&
 
-expecting success of 0027.524 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 524 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
+	test_cmp expected actual
 
-expecting success of 0027.525 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 525 - setup LF checkout  with -c core.eol=lf
+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 advice.mergeConflict false"
+ok 23 - failed cherry-pick describes conflict in work tree
 
-expecting success of 0027.526 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 526 - setup CRLF checkout  with -c core.eol=lf
+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 0027.527 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 527 - setup LF_mix_CR checkout  with -c core.eol=lf
+	test_must_fail git cherry-pick picked &&
 
-expecting success of 0027.528 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 528 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
+	test_cmp expected actual
 
-expecting success of 0027.529 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 529 - setup LF_nul checkout  with -c core.eol=lf
+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 advice.mergeConflict false"
+ok 24 - diff3 -m style
 
-expecting success of 0027.530 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 530 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=lf
+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 0027.531 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 531 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF
+	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 0027.532 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 532 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+	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 0027.533 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 533 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+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 advice.mergeConflict false"
+foo: needs merge
+:100644 100644 78981922613b2afb6025042ff6bd878ac1994e85 0000000000000000000000000000000000000000 M	foo
+ok 25 - revert also handles conflicts sanely
 
-expecting success of 0027.534 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 534 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+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 0027.535 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 535 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+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 advice.mergeConflict false"
+ok 26 - failed revert sets REVERT_HEAD
 
-expecting success of 0027.536 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 536 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
+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 0027.537 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 537 - setup LF checkout  with -c core.eol=lf
+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 0027.538 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 538 - setup CRLF checkout  with -c core.eol=lf
+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 0027.539 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 539 - setup LF_mix_CR checkout  with -c core.eol=lf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.540 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 540 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+  feb2983 Revert "base"
 
-expecting success of 0027.541 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 541 - setup LF_nul checkout  with -c core.eol=lf
+HEAD is now at dc0113b base
+fatal: Needed a single revision
+ok 28 - revert --no-commit sets REVERT_HEAD
 
-expecting success of 0027.542 'ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 542 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=lf
+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 0027.543 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 543 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF
+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 0027.544 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 544 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+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 0027.545 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 545 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+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 advice.mergeConflict false"
+fatal: Needed a single revision
+ok 30 - GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD
 
-expecting success of 0027.546 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 546 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+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 0027.547 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 547 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+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 advice.mergeConflict false"
+Unstaged changes after reset:
+M	foo
+fatal: Needed a single revision
+ok 31 - git reset clears REVERT_HEAD
 
-expecting success of 0027.548 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 548 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
+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 0027.549 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 549 - setup LF checkout  with -c core.eol=lf
+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 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 0027.550 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 550 - setup CRLF checkout  with -c core.eol=lf
+expecting success of 3507.33 'successful final commit clears revert state': 
+	pristine_detach picked-signed &&
 
-expecting success of 0027.551 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 551 - setup LF_mix_CR checkout  with -c core.eol=lf
+	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 0027.552 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 552 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+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 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 0027.553 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 553 - setup LF_nul checkout  with -c core.eol=lf
+expecting success of 3507.34 'reset after final pick clears revert state': 
+	pristine_detach picked-signed &&
 
-expecting success of 0027.554 'ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 554 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=lf
+	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 0027.555 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 555 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.556 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 556 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+  7342963 Revert "base"
+  b940b09 Revert "picked-signed"
 
-expecting success of 0027.557 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 557 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+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 advice.mergeConflict false"
+Unstaged changes after reset:
+M	foo
+ok 34 - reset after final pick clears revert state
 
-expecting success of 0027.558 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 558 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+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 0027.559 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 559 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+	test_must_fail git revert picked &&
 
-expecting success of 0027.560 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 560 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
+	test_cmp expected actual
 
-expecting success of 0027.561 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 561 - setup LF checkout  with -c core.eol=lf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.562 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 562 - setup CRLF checkout  with -c core.eol=lf
+  b940b09 Revert "picked-signed"
 
-expecting success of 0027.563 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 563 - setup LF_mix_CR checkout  with -c core.eol=lf
+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 advice.mergeConflict false"
+ok 35 - revert conflict, diff3 -m style
 
-expecting success of 0027.564 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 564 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+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 0027.565 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 565 - setup LF_nul checkout  with -c core.eol=lf
+		This reverts commit OBJID.
 
-expecting success of 0027.566 'ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		# ------------------------ >8 ------------------------
+		# Do not modify or remove the line above.
+		# Everything below it will be ignored.
+		#
+		# Conflicts:
+		#	foo
 		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 566 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=lf
-
-expecting success of 0027.567 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 567 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.568 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 568 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
-
-expecting success of 0027.569 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 569 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+	test_must_fail git revert picked &&
 
-expecting success of 0027.570 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 570 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
+	test_cmp expected actual
 
-expecting success of 0027.571 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 571 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+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 advice.mergeConflict false"
+ok 36 - revert conflict, ensure commit.cleanup = scissors places scissors line properly
 
-expecting success of 0027.572 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 572 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
+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 0027.573 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 573 - setup LF checkout  with -c core.eol=lf
+		This reverts commit OBJID.
 
-expecting success of 0027.574 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 574 - setup CRLF checkout  with -c core.eol=lf
+		# ------------------------ >8 ------------------------
+		# Do not modify or remove the line above.
+		# Everything below it will be ignored.
+		#
+		# Conflicts:
+		#	foo
+		EOF
 
-expecting success of 0027.575 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 575 - setup LF_mix_CR checkout  with -c core.eol=lf
+	test_must_fail git revert --cleanup=scissors picked &&
 
-expecting success of 0027.576 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 576 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
+	test_cmp expected actual
 
-expecting success of 0027.577 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 577 - setup LF_nul checkout  with -c core.eol=lf
+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 advice.mergeConflict false"
+ok 37 - revert conflict, ensure cleanup=scissors places scissors line properly
 
-expecting success of 0027.578 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 578 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=lf
+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 0027.579 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 579 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF
+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 advice.mergeConflict false"
+Signed-off-by: C O Mitter <committer@example.com>
+ok 38 - failed cherry-pick does not forget -s
 
-expecting success of 0027.580 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 580 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+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 0027.581 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 581 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+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 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 0027.582 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 582 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+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 0027.583 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 583 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+	git commit -a -s &&
 
-expecting success of 0027.584 'setup config for checkout attr=-text ident= aeol= core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 584 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
+	# 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 0027.585 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 585 - setup LF checkout  with -c core.eol=lf
+	cat <<-\EOF >expected &&
+	picked
 
-expecting success of 0027.586 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 586 - setup CRLF checkout  with -c core.eol=lf
+	Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 
-expecting success of 0027.587 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 587 - setup LF_mix_CR checkout  with -c core.eol=lf
+	git show -s --pretty=format:%B >actual &&
+	test_cmp expected actual
 
-expecting success of 0027.588 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 588 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.589 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 589 - setup LF_nul checkout  with -c core.eol=lf
+  ae79e40 picked-signed
 
-expecting success of 0027.590 'ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 590 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=lf
+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 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 0027.591 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 591 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF
+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 0027.592 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 592 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF
+	# 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 0027.593 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 593 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+	git commit -a &&
+	git commit --amend -s &&
 
-expecting success of 0027.594 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 594 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+	# 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 0027.595 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 595 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_nul
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.596 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 596 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
+  56f790d picked
 
-expecting success of 0027.597 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 597 - setup LF checkout  with -c core.eol=lf
+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 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 0027.598 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 598 - setup CRLF checkout  with -c core.eol=lf
+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 0027.599 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 599 - setup LF_mix_CR checkout  with -c core.eol=lf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.600 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 600 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+  91df379 picked
 
-expecting success of 0027.601 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 601 - setup LF_nul checkout  with -c core.eol=lf
+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 0027.602 'ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 602 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=lf
+    git commit --allow-empty
 
-expecting success of 0027.603 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 603 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF
+Otherwise, please use 'git cherry-pick --skip'
+ok 42 - cherry-pick preserves sparse-checkout
 
-expecting success of 0027.604 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 604 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+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 0027.605 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 605 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+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 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 0027.606 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 606 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+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 0027.607 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 607 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.608 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 608 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
+  22de78d redundant-pick
+  d9f497e picked
 
-expecting success of 0027.609 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 609 - setup LF checkout  with -c core.eol=lf
+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 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 0027.610 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 610 - setup CRLF checkout  with -c core.eol=lf
+# passed all 44 test(s)
+1..44
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3602-rm-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 0027.611 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 611 - setup LF_mix_CR checkout  with -c core.eol=lf
+	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 0027.612 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 612 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+	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 advice.updateSparsePath false"
+	EOF
 
-expecting success of 0027.613 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 613 - setup LF_nul checkout  with -c core.eol=lf
+	echo b | cat sparse_error_header - >sparse_entry_b_error &&
+	cat sparse_entry_b_error sparse_hint >b_error_and_hint
 
-expecting success of 0027.614 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 614 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=lf
+[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 0027.615 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+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
 	
-ok 615 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
+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 0027.616 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+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
 	
-ok 616 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+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 0027.617 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+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 617 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+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 0027.618 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 618 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+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 0027.619 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 619 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+	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 0027.620 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 620 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
+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 0027.621 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 621 - setup LF checkout  with -c core.eol=lf
+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 0027.622 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 622 - setup CRLF checkout  with -c core.eol=lf
+HEAD is now at ff99497 files
+rm 'sub/d'
+rm 'sub/dir/e'
+ok 6 - recursive rm --sparse removes sparse entries
 
-expecting success of 0027.623 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 623 - setup LF_mix_CR checkout  with -c core.eol=lf
+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 0027.624 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 624 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+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 0027.625 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 625 - setup LF_nul checkout  with -c core.eol=lf
+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 0027.626 'ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 626 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=lf
+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 0027.627 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 627 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF
+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 0027.628 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 628 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+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 0027.629 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 629 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+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 0027.630 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 630 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+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 0027.631 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 631 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+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 0027.632 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 632 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
+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 0027.633 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 633 - setup LF checkout  with -c core.eol=lf
+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 0027.634 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 634 - setup CRLF checkout  with -c core.eol=lf
+	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 0027.635 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 635 - setup LF_mix_CR checkout  with -c core.eol=lf
+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 0027.636 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 636 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+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 0027.637 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 637 - setup LF_nul checkout  with -c core.eol=lf
+	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 0027.638 'ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 638 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=lf
+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 0027.639 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 639 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3650-replay-basics.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3650-replay-basics/.git/
+expecting success of 3650.1 'setup': 
+	test_commit A &&
+	test_commit B &&
 
-expecting success of 0027.640 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 640 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+	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 0027.641 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 641 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+	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 0027.642 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 642 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+	git switch main &&
+	test_commit L &&
+	test_commit M &&
 
-expecting success of 0027.643 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 643 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+	git switch -c conflict B &&
+	test_commit C.conflict C.t conflict
 
-expecting success of 0027.644 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 644 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
+[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 0027.645 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 645 - setup LF checkout  with -c core.eol=lf
+expecting success of 3650.2 'setup bare': 
+	git clone --bare . bare
 
-expecting success of 0027.646 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 646 - setup CRLF checkout  with -c core.eol=lf
+Cloning into bare repository 'bare'...
+done.
+ok 2 - setup bare
 
-expecting success of 0027.647 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 647 - setup LF_mix_CR checkout  with -c core.eol=lf
+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 0027.648 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 648 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+	test_line_count = 1 result &&
 
-expecting success of 0027.649 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 649 - setup LF_nul checkout  with -c core.eol=lf
+	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 0027.650 'ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 650 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=lf
+	printf "update refs/heads/topic2 " >expect &&
+	printf "%s " $(cut -f 3 -d " " result) >>expect &&
+	git rev-parse topic2 >>expect &&
 
-expecting success of 0027.651 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 651 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF
+	test_cmp expect result
 
-expecting success of 0027.652 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 652 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+ok 3 - using replay to rebase two branches, one on top of other
 
-expecting success of 0027.653 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 653 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+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 0027.654 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 654 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 4 - using replay on bare repo to rebase two branches, one on top of other
 
-expecting success of 0027.655 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 655 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+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 0027.656 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 656 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
+ok 5 - using replay to rebase with a conflict
 
-expecting success of 0027.657 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 657 - setup LF checkout  with -c core.eol=lf
+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 0027.658 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 658 - setup CRLF checkout  with -c core.eol=lf
+ok 6 - using replay on bare repo to rebase with a conflict
 
-expecting success of 0027.659 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 659 - setup LF_mix_CR checkout  with -c core.eol=lf
+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 0027.660 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 660 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+	git replay --advance main topic1..topic2 >result &&
 
-expecting success of 0027.661 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 661 - setup LF_nul checkout  with -c core.eol=lf
+	test_line_count = 1 result &&
 
-expecting success of 0027.662 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 662 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=lf
+	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 0027.663 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 663 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF
+	printf "update refs/heads/main " >expect &&
+	printf "%s " $(cut -f 3 -d " " result) >>expect &&
+	git rev-parse main >>expect &&
 
-expecting success of 0027.664 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 664 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+	test_cmp expect result
 
-expecting success of 0027.665 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 665 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 7 - using replay to perform basic cherry-pick
 
-expecting success of 0027.666 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 666 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+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 0027.667 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 667 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+ok 8 - using replay on bare repo to perform basic cherry-pick
 
-expecting success of 0027.668 'setup config for checkout attr= ident= aeol= core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 668 - setup config for checkout attr= ident= aeol= core.autocrlf=false
+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 0027.669 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 669 - setup LF checkout  with -c core.eol=lf
+fatal: --onto and --advance are incompatible
+ok 9 - replay on bare repo fails with both --advance and --onto
 
-expecting success of 0027.670 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 670 - setup CRLF checkout  with -c core.eol=lf
+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 0027.671 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 671 - setup LF_mix_CR checkout  with -c core.eol=lf
+error: option --onto or --advance is mandatory
+usage: (EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>) <revision-range>...
 
-expecting success of 0027.672 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 672 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+    --[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 0027.673 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 673 - setup LF_nul checkout  with -c core.eol=lf
+ok 10 - replay fails when both --advance and --onto are omitted
 
-expecting success of 0027.674 'ls-files --eol attr=  aeol= core.autocrlf=false core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 674 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=lf
+expecting success of 3650.11 'using replay to also rebase a contained branch': 
+	git replay --contained --onto main main..topic3 >result &&
 
-expecting success of 0027.675 'checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
-	
-ok 675 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF
+	test_line_count = 2 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
 
-expecting success of 0027.676 'checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 676 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF
+	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 0027.677 'checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 677 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+	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 0027.678 'checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 678 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+	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 0027.679 'checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 679 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_nul
+	test_cmp expect result
 
-expecting success of 0027.680 'setup config for checkout attr= ident= aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 680 - setup config for checkout attr= ident= aeol= core.autocrlf=true
+ok 11 - using replay to also rebase a contained branch
 
-expecting success of 0027.681 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 681 - setup LF checkout  with -c core.eol=lf
+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 0027.682 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 682 - setup CRLF checkout  with -c core.eol=lf
+ok 12 - using replay on bare repo to also rebase a contained branch
 
-expecting success of 0027.683 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 683 - setup LF_mix_CR checkout  with -c core.eol=lf
+expecting success of 3650.13 'using replay to rebase multiple divergent branches': 
+	git replay --onto main ^topic1 topic2 topic4 >result &&
 
-expecting success of 0027.684 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 684 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+	test_line_count = 2 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
 
-expecting success of 0027.685 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 685 - setup LF_nul checkout  with -c core.eol=lf
+	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 0027.686 'ls-files --eol attr=  aeol= core.autocrlf=true core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 686 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=lf
+	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 0027.687 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
-	
-ok 687 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF
+	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 0027.688 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 688 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF
+	test_cmp expect result
 
-expecting success of 0027.689 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 689 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 13 - using replay to rebase multiple divergent branches
 
-expecting success of 0027.690 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 690 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+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 0027.691 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 691 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_nul
+	test_line_count = 4 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
 
-expecting success of 0027.692 'setup config for checkout attr=auto ident= aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 692 - setup config for checkout attr=auto ident= aeol= core.autocrlf=true
+	>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 0027.693 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 693 - setup LF checkout  with -c core.eol=lf
+	test_cmp expect result &&
 
-expecting success of 0027.694 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 694 - setup CRLF checkout  with -c core.eol=lf
+	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 0027.695 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 695 - setup LF_mix_CR checkout  with -c core.eol=lf
+	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 0027.696 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 696 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 14 - using replay on bare repo to rebase multiple divergent branches, including contained ones
 
-expecting success of 0027.697 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 697 - setup LF_nul checkout  with -c core.eol=lf
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3702-add-edit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3702-add-edit/.git/
+expecting success of 3702.1 'setup': 
 
-expecting success of 0027.698 'ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 698 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=lf
+	git add file &&
+	test_tick &&
+	git commit -m initial file
 
-expecting success of 0027.699 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 699 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.700 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 700 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF
+[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 0027.701 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 701 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+expecting success of 3702.2 'add -e': 
 
-expecting success of 0027.702 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 702 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+	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 0027.703 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 703 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.704 'setup config for checkout attr=text ident= aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 704 - setup config for checkout attr=text ident= aeol= core.autocrlf=true
+ok 2 - add -e
 
-expecting success of 0027.705 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 705 - setup LF checkout  with -c core.eol=lf
+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 0027.706 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 706 - setup CRLF checkout  with -c core.eol=lf
+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 0027.707 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 707 - setup LF_mix_CR checkout  with -c core.eol=lf
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3703-add-magic-pathspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3703-add-magic-pathspec/.git/
+expecting success of 3703.1 'setup': 
+	mkdir sub anothersub &&
+	: >sub/foo &&
+	: >anothersub/foo
 
-expecting success of 0027.708 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 708 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1 - setup
 
-expecting success of 0027.709 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 709 - setup LF_nul checkout  with -c core.eol=lf
+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 0027.710 'ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 710 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=lf
+ok 2 - add :/
 
-expecting success of 0027.711 'checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 711 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF
+expecting success of 3703.3 'add :/anothersub': 
+	(cd sub && git add -n :/anothersub >actual) &&
+	test_cmp expected sub/actual
 
-expecting success of 0027.712 'checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 712 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 3 - add :/anothersub
 
-expecting success of 0027.713 'checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 713 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+expecting success of 3703.4 'add :/non-existent': 
+	(cd sub && test_must_fail git add -n :/non-existent)
 
-expecting success of 0027.714 'checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 714 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+fatal: pathspec ':/non-existent' did not match any files
+ok 4 - add :/non-existent
 
-expecting success of 0027.715 'checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 715 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
+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 0027.716 'setup config for checkout attr=text ident= aeol= core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 716 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
+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 0027.717 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 717 - setup LF checkout  with -c core.eol=lf
+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 0027.718 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 718 - setup CRLF checkout  with -c core.eol=lf
+fatal: pathspec ':/bar' did not match any files
+add ':/bar'
+ok 6 - a file with the same (short) magic name exists
 
-expecting success of 0027.719 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 719 - setup LF_mix_CR checkout  with -c core.eol=lf
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3510-cherry-pick-sequence.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3510-cherry-pick-sequence/.git/
+expecting success of 3510.1 'setup': 
+	git config 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
 
-expecting success of 0027.720 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 720 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+[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 0027.721 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 721 - setup LF_nul checkout  with -c core.eol=lf
+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
 
-expecting success of 0027.722 'ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 722 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=lf
+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 advice.mergeConflict false"
+ok 2 - cherry-pick persists data on failure
 
-expecting success of 0027.723 'checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 723 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF
+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
 
-expecting success of 0027.724 'checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 724 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.725 'checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 725 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+  2fa73e8 unrelatedpick
 
-expecting success of 0027.726 'checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 726 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+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 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 0027.727 'checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 727 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_nul
+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
 
-expecting success of 0027.728 'setup config for checkout attr=auto ident= aeol= core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 728 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
+Warning: you are leaving 4 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.729 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 729 - setup LF checkout  with -c core.eol=lf
+  49d5115 anotherpick
+  4a5cd69 picked
+  28eafda base
+  7fdfeeb unrelatedpick
 
-expecting success of 0027.730 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 730 - setup CRLF checkout  with -c core.eol=lf
+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 0027.731 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 731 - setup LF_mix_CR checkout  with -c core.eol=lf
+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
 
-expecting success of 0027.732 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 732 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+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 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)
 
-expecting success of 0027.733 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 733 - setup LF_nul checkout  with -c core.eol=lf
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	msg
 
-expecting success of 0027.734 'ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=lf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 734 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=lf
+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 0027.735 'checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 735 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF
+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
 
-expecting success of 0027.736 'checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 736 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF
+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 advice.mergeConflict false"
+dropping 55c7d12676e46241f1279640f1bc977feab93361 yetanotherpick -- patch contents already upstream
+ok 6 - cherry-pick persists --empty=drop correctly
 
-expecting success of 0027.737 'checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 737 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+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^
 
-expecting success of 0027.738 'checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 738 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+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 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 0027.739 'checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 739 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_nul
+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
 
-expecting success of 0027.740 'setup config for checkout attr=-text ident= aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 740 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.741 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 741 - setup LF checkout  with -c core.eol=crlf
+  3fb2aca yetanotherpick
 
-expecting success of 0027.742 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 742 - setup CRLF checkout  with -c core.eol=crlf
+HEAD is now at df2a63d initial
+Auto-merging foo
+Skipped foo (merged same as existing)
+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)
 
-expecting success of 0027.743 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 743 - setup LF_mix_CR checkout  with -c core.eol=crlf
+nothing to commit, working tree clean
+ok 8 - revert persists opts correctly
 
-expecting success of 0027.744 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 744 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.745 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 745 - setup LF_nul checkout  with -c core.eol=crlf
+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 0027.746 'ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 746 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=crlf
+expecting success of 3510.10 'cherry-pick --skip requires cherry-pick in progress': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick --skip
 
-expecting success of 0027.747 'checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 747 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.748 'checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 748 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF
+  a222ac0 picked
+  2b8ae83 unrelatedpick
+  86ee3fa base
 
-expecting success of 0027.749 'checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 749 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+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 0027.750 'checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 750 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+expecting success of 3510.11 'revert --skip requires revert in progress': 
+	pristine_detach initial &&
+	test_must_fail git revert --skip
 
-expecting success of 0027.751 'checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 751 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+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 0027.752 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 752 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
+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
 
-expecting success of 0027.753 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 753 - setup LF checkout  with -c core.eol=crlf
+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 advice.mergeConflict false"
+error: no revert in progress
+fatal: revert failed
+ok 12 - cherry-pick --skip to skip commit
 
-expecting success of 0027.754 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 754 - setup CRLF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.755 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 755 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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 advice.mergeConflict false"
+error: no cherry-pick in progress
+fatal: cherry-pick failed
+ok 13 - revert --skip to skip commit
 
-expecting success of 0027.756 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 756 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.757 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 757 - setup LF_nul checkout  with -c core.eol=crlf
+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)
 
-expecting success of 0027.758 'ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 758 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=crlf
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
 
-expecting success of 0027.759 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 759 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF
+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 0027.760 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 760 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+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
 
-expecting success of 0027.761 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 761 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+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 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 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 0027.762 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 762 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+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
 
-expecting success of 0027.763 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 763 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.764 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 764 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
+  61f8ec3 yetanotherpick
+  612ff5e anotherpick
+  c738c4d unrelatedpick
 
-expecting success of 0027.765 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 765 - setup LF checkout  with -c core.eol=crlf
+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 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 0027.766 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 766 - setup CRLF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.767 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 767 - setup LF_mix_CR checkout  with -c core.eol=crlf
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.768 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 768 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+  43fe10f picked
+  c738c4d unrelatedpick
 
-expecting success of 0027.769 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 769 - setup LF_nul checkout  with -c core.eol=crlf
+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 advice.mergeConflict false"
+ok 17 - selectively advise --skip while launching another sequence
 
-expecting success of 0027.770 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 770 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf
+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
 
-expecting success of 0027.771 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 771 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+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 advice.mergeConflict false"
+ok 18 - allow skipping commit but not abort for a new history
 
-expecting success of 0027.772 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 772 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+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
 
-expecting success of 0027.773 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 773 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+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 0027.774 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 774 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+expecting success of 3510.20 '--quit does not complain when no cherry-pick is in progress': 
+	pristine_detach initial &&
+	git cherry-pick --quit
 
-expecting success of 0027.775 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 775 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.776 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 776 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
+  f847cb0 base
+  44a5ca1 untrack unrelated
 
-expecting success of 0027.777 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 777 - setup LF checkout  with -c core.eol=crlf
+HEAD is now at df2a63d initial
+ok 20 - --quit does not complain when no cherry-pick is in progress
 
-expecting success of 0027.778 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 778 - setup CRLF checkout  with -c core.eol=crlf
+expecting success of 3510.21 '--abort requires cherry-pick in progress': 
+	pristine_detach initial &&
+	test_must_fail git cherry-pick --abort
 
-expecting success of 0027.779 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 779 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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 0027.780 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 780 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
-
-expecting success of 0027.781 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 781 - setup LF_nul checkout  with -c core.eol=crlf
-
-expecting success of 0027.782 'ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 782 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=crlf
-
-expecting success of 0027.783 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 783 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF
+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
 
-expecting success of 0027.784 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 784 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+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 advice.mergeConflict false"
+ok 22 - --quit cleans up sequencer state
 
-expecting success of 0027.785 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 785 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+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
 
-expecting success of 0027.786 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 786 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.787 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 787 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+  c738c4d unrelatedpick
 
-expecting success of 0027.788 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 788 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
+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 advice.mergeConflict false"
+foo: needs merge
+ok 23 - --quit keeps HEAD and conflicted index intact
 
-expecting success of 0027.789 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 789 - setup LF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.790 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 790 - setup CRLF checkout  with -c core.eol=crlf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.791 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 791 - setup LF_mix_CR checkout  with -c core.eol=crlf
+  c738c4d unrelatedpick
 
-expecting success of 0027.792 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 792 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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 advice.mergeConflict false"
+ok 24 - --abort to cancel multiple cherry-pick
 
-expecting success of 0027.793 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 793 - setup LF_nul checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.794 'ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 794 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=crlf
+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 advice.mergeConflict false"
+ok 25 - --abort to cancel single cherry-pick
 
-expecting success of 0027.795 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 795 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+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
 
-expecting success of 0027.796 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 796 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+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 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 0027.797 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 797 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+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
 
-expecting success of 0027.798 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 798 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+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 advice.mergeConflict false"
+ok 27 - cherry-pick --abort to cancel multiple revert
 
-expecting success of 0027.799 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 799 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+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
 
-expecting success of 0027.800 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 800 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
+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 advice.mergeConflict false"
+ok 28 - revert --abort works, too
 
-expecting success of 0027.801 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 801 - setup LF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.802 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 802 - setup CRLF checkout  with -c core.eol=crlf
+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 advice.mergeConflict false"
+ok 29 - --abort to cancel single revert
 
-expecting success of 0027.803 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 803 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.804 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 804 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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 advice.mergeConflict false"
+ok 30 - --abort keeps unrelated change, easy case
 
-expecting success of 0027.805 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 805 - setup LF_nul checkout  with -c core.eol=crlf
+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 &&
 
-expecting success of 0027.806 'ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 806 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=crlf
+	git checkout unrelated &&
+	git cherry-pick --abort &&
+	test_cmp_rev initial HEAD
 
-expecting success of 0027.807 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 807 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF
+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 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 0027.808 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 808 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+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
 
-expecting success of 0027.809 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 809 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+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 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 0027.810 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 810 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+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
 
-expecting success of 0027.811 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 811 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.812 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 812 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
+  9781982 picked
+  c738c4d unrelatedpick
 
-expecting success of 0027.813 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 813 - setup LF checkout  with -c core.eol=crlf
+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 advice.mergeConflict false"
+ok 33 - --abort after last commit in sequence
 
-expecting success of 0027.814 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 814 - setup CRLF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.815 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 815 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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 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 0027.816 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 816 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.817 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 817 - setup LF_nul checkout  with -c core.eol=crlf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.818 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 818 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf
+  c738c4d unrelatedpick
 
-expecting success of 0027.819 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 819 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+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 0027.820 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 820 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+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
 
-expecting success of 0027.821 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 821 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+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 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 0027.822 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 822 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+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 &&
 
-expecting success of 0027.823 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 823 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+	test_cmp expect foo &&
+	test_cmp_rev initial HEAD^ &&
+	git diff --exit-code HEAD &&
+	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 
-expecting success of 0027.824 'setup config for checkout attr=-text ident= aeol= core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 824 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.825 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 825 - setup LF checkout  with -c core.eol=crlf
+  c738c4d unrelatedpick
 
-expecting success of 0027.826 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 826 - setup CRLF checkout  with -c core.eol=crlf
+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 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 0027.827 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 827 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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 &&
 
-expecting success of 0027.828 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 828 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+	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
 
-expecting success of 0027.829 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 829 - setup LF_nul checkout  with -c core.eol=crlf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.830 'ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 830 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=crlf
+  9aabd79 picked
 
-expecting success of 0027.831 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 831 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF
+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 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 0027.832 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 832 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
+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
 
-expecting success of 0027.833 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 833 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.834 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 834 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+  267eac8 Revert "picked"
 
-expecting success of 0027.835 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 835 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+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 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 0027.836 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 836 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
+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
 
-expecting success of 0027.837 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 837 - setup LF checkout  with -c core.eol=crlf
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.838 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 838 - setup CRLF checkout  with -c core.eol=crlf
+  3b1768d anotherpick
+  43fe10f picked
+  c738c4d unrelatedpick
 
-expecting success of 0027.839 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 839 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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 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 0027.840 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 840 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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 &&
 
-expecting success of 0027.841 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 841 - setup LF_nul checkout  with -c core.eol=crlf
+	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
 
-expecting success of 0027.842 'ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 842 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=crlf
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.843 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 843 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF
+  3b1768d anotherpick
+  43fe10f picked
+  c738c4d unrelatedpick
 
-expecting success of 0027.844 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 844 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+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 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)
 
-expecting success of 0027.845 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 845 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	msg
 
-expecting success of 0027.846 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 846 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+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 0027.847 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 847 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+expecting success of 3510.42 'follow advice and skip nil patch': 
+	pristine_detach conflicting &&
+	test_must_fail git cherry-pick initial..picked &&
 
-expecting success of 0027.848 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 848 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
+	git checkout HEAD -- unrelated &&
+	test_must_fail git cherry-pick --continue &&
+	git reset &&
+	git cherry-pick --continue &&
 
-expecting success of 0027.849 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 849 - setup LF checkout  with -c core.eol=crlf
+	git rev-list initial..HEAD >commits &&
+	test_line_count = 3 commits
 
-expecting success of 0027.850 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 850 - setup CRLF checkout  with -c core.eol=crlf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.851 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 851 - setup LF_mix_CR checkout  with -c core.eol=crlf
+  838794c base
 
-expecting success of 0027.852 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 852 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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 advice.mergeConflict false"
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success of 0027.853 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 853 - setup LF_nul checkout  with -c core.eol=crlf
+    git commit --allow-empty
 
-expecting success of 0027.854 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 854 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf
+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)
 
-expecting success of 0027.855 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 855 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+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 0027.856 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 856 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+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
 
-expecting success of 0027.857 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 857 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.858 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 858 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+  fef14ec picked
+  838794c base
 
-expecting success of 0027.859 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 859 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+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 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 0027.860 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 860 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
+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
 
-expecting success of 0027.861 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 861 - setup LF checkout  with -c core.eol=crlf
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.862 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 862 - setup CRLF checkout  with -c core.eol=crlf
+  3834c90 anotherpick
+  4d735ac picked
+  a731ebf unrelatedpick
 
-expecting success of 0027.863 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 863 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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 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 0027.864 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 864 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.865 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 865 - setup LF_nul checkout  with -c core.eol=crlf
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.866 'ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 866 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=crlf
+  775318b picked
 
-expecting success of 0027.867 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 867 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF
+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 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
 
-expecting success of 0027.868 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 868 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+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
 
-expecting success of 0027.869 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 869 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.870 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 870 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+  d310f74 anotherpick
+  775318b picked
 
-expecting success of 0027.871 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 871 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+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 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
 
-expecting success of 0027.872 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 872 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
+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 &&
 
-expecting success of 0027.873 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 873 - setup LF checkout  with -c core.eol=crlf
+	git diff --exit-code HEAD &&
+	test_cmp_rev initial HEAD^^ &&
+	git cat-file commit HEAD^ >msg &&
+	! grep Signed-off-by: msg
 
-expecting success of 0027.874 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 874 - setup CRLF checkout  with -c core.eol=crlf
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.875 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 875 - setup LF_mix_CR checkout  with -c core.eol=crlf
+  cf7cfba anotherpick
+  f7bab3d picked
+  9b2cda6 unrelatedpick
 
-expecting success of 0027.876 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 876 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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 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
 
-expecting success of 0027.877 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 877 - setup LF_nul checkout  with -c core.eol=crlf
+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 &&
 
-expecting success of 0027.878 'ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 878 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=crlf
+	git diff --exit-code HEAD &&
+	test_cmp_rev initial HEAD^ &&
+	git cat-file commit HEAD >msg &&
+	! grep Signed-off-by: msg
 
-expecting success of 0027.879 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 879 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.880 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 880 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+  d9a8514 anotherpick
+  c80a680 picked
 
-expecting success of 0027.881 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 881 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+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 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 0027.882 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 882 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+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
 
-expecting success of 0027.883 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 883 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 0027.884 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 884 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
+  c80a680 picked
 
-expecting success of 0027.885 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 885 - setup LF checkout  with -c core.eol=crlf
+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 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 0027.886 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 886 - setup CRLF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.887 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 887 - setup LF_mix_CR checkout  with -c core.eol=crlf
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.888 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 888 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+  9781982 picked
+  c738c4d unrelatedpick
 
-expecting success of 0027.889 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 889 - setup LF_nul checkout  with -c core.eol=crlf
+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 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 0027.890 'ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 890 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=crlf
+expecting success of 3510.51 'empty commit set (no commits to walk)': 
+	pristine_detach initial &&
+	test_expect_code 128 git cherry-pick base..base
 
-expecting success of 0027.891 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 891 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.892 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 892 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+  9781982 picked
+  c738c4d unrelatedpick
 
-expecting success of 0027.893 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 893 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+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 0027.894 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 894 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+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
 
-expecting success of 0027.895 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 895 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+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 0027.896 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 896 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
+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
 
-expecting success of 0027.897 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 897 - setup LF checkout  with -c core.eol=crlf
+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 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 0027.898 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 898 - setup CRLF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.899 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 899 - setup LF_mix_CR checkout  with -c core.eol=crlf
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.900 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 900 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+  9781982 picked
+  c738c4d unrelatedpick
 
-expecting success of 0027.901 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 901 - setup LF_nul checkout  with -c core.eol=crlf
+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 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 0027.902 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 902 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf
+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
 
-expecting success of 0027.903 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 903 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-expecting success of 0027.904 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 904 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+  3b1768d anotherpick
+  43fe10f picked
+  c738c4d unrelatedpick
 
-expecting success of 0027.905 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 905 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+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 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
 
-expecting success of 0027.906 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 906 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+# still have 3 known breakage(s)
+# passed all remaining 52 test(s)
+1..55
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3700-add.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/.git/
+expecting success of 3700.1 'Test of git add': 
+	touch foo && git add foo
 
-expecting success of 0027.907 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 907 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1 - Test of git add
 
-expecting success of 0027.908 'setup config for checkout attr=-text ident= aeol= core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 908 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
+expecting success of 3700.2 'Test with no pathspecs': 
+	cat >expect <<-EOF &&
+	Nothing specified, nothing added.
+	hint: Maybe you wanted to say ${SQ}git add .${SQ}?
+	hint: Disable this message with "git config advice.addEmptyPathspec false"
+	EOF
+	git add 2>actual &&
+	test_cmp expect actual
 
-expecting success of 0027.909 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 909 - setup LF checkout  with -c core.eol=crlf
+ok 2 - Test with no pathspecs
 
-expecting success of 0027.910 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 910 - setup CRLF checkout  with -c core.eol=crlf
+expecting success of 3700.3 'Post-check that foo is in the index': 
+	git ls-files foo | grep foo
 
-expecting success of 0027.911 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 911 - setup LF_mix_CR checkout  with -c core.eol=crlf
+foo
+ok 3 - Post-check that foo is in the index
 
-expecting success of 0027.912 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 912 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 3700.4 'Test that "git add -- -q" works': 
+	touch -- -q && git add -- -q
 
-expecting success of 0027.913 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 913 - setup LF_nul checkout  with -c core.eol=crlf
+ok 4 - Test that "git add -- -q" works
 
-expecting success of 0027.914 'ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 914 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=crlf
+expecting success of 3700.5 'git add: core.fsyncmethod=batch': 
+	test_create_unique_files 2 4 files_base_dir1 &&
+	GIT_TEST_FSYNC=1 git -c core.fsync=loose-object -c core.fsyncmethod=batch add -- ./files_base_dir1/ &&
+	git ls-files --stage files_base_dir1/ |
+	test_parse_ls_files_stage_oids >added_files_oids &&
 
-expecting success of 0027.915 'checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 915 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF
+	# We created 2 subdirs with 4 files each (8 files total) above
+	test_line_count = 8 added_files_oids &&
+	git cat-file --batch-check='%(objectname)' <added_files_oids >added_files_actual &&
+	test_cmp added_files_oids added_files_actual
 
-expecting success of 0027.916 'checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 916 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 5 - git add: core.fsyncmethod=batch
 
-expecting success of 0027.917 'checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 917 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+expecting success of 3700.6 'git update-index: core.fsyncmethod=batch': 
+	test_create_unique_files 2 4 files_base_dir2 &&
+	find files_base_dir2 ! -type d -print | xargs git -c core.fsync=loose-object -c core.fsyncmethod=batch update-index --add -- &&
+	git ls-files --stage files_base_dir2 |
+	test_parse_ls_files_stage_oids >added_files2_oids &&
 
-expecting success of 0027.918 'checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 918 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+	# We created 2 subdirs with 4 files each (8 files total) above
+	test_line_count = 8 added_files2_oids &&
+	git cat-file --batch-check='%(objectname)' <added_files2_oids >added_files2_actual &&
+	test_cmp added_files2_oids added_files2_actual
 
-expecting success of 0027.919 'checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 919 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 6 - git update-index: core.fsyncmethod=batch
 
-expecting success of 0027.920 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 920 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
+expecting success of 3700.7 'git add: Test that executable bit is not used if core.filemode=0': git config core.filemode 0 &&
+	 echo foo >xfoo1 &&
+	 chmod 755 xfoo1 &&
+	 git add xfoo1 &&
+	 test_mode_in_index 100644 xfoo1
+pass
+ok 7 - git add: Test that executable bit is not used if core.filemode=0
 
-expecting success of 0027.921 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 921 - setup LF checkout  with -c core.eol=crlf
+expecting success of 3700.8 'git add: filemode=0 should not get confused by symlink': 
+	rm -f xfoo1 &&
+	test_ln_s_add foo xfoo1 &&
+	test_mode_in_index 120000 xfoo1
 
-expecting success of 0027.922 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 922 - setup CRLF checkout  with -c core.eol=crlf
+checking prerequisite: SYMLINKS
 
-expecting success of 0027.923 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 923 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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 0027.924 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 924 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+)
+prerequisite SYMLINKS ok
+pass
+ok 8 - git add: filemode=0 should not get confused by symlink
 
-expecting success of 0027.925 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 925 - setup LF_nul checkout  with -c core.eol=crlf
+expecting success of 3700.9 'git update-index --add: Test that executable bit is not used...': git config core.filemode 0 &&
+	 echo foo >xfoo2 &&
+	 chmod 755 xfoo2 &&
+	 git update-index --add xfoo2 &&
+	 test_mode_in_index 100644 xfoo2
+pass
+ok 9 - git update-index --add: Test that executable bit is not used...
 
-expecting success of 0027.926 'ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 926 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=crlf
+expecting success of 3700.10 'git add: filemode=0 should not get confused by symlink': 
+	rm -f xfoo2 &&
+	test_ln_s_add foo xfoo2 &&
+	test_mode_in_index 120000 xfoo2
 
-expecting success of 0027.927 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 927 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF
+pass
+ok 10 - git add: filemode=0 should not get confused by symlink
 
-expecting success of 0027.928 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 928 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+expecting success of 3700.11 'git update-index --add: Test that executable bit is not used...': git config core.filemode 0 &&
+	 test_ln_s_add xfoo2 xfoo3 &&	# runs git update-index --add
+	 test_mode_in_index 120000 xfoo3
+pass
+ok 11 - git update-index --add: Test that executable bit is not used...
 
-expecting success of 0027.929 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 929 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+expecting success of 3700.12 '.gitignore test setup': 
+	echo "*.ig" >.gitignore &&
+	mkdir c.if d.ig &&
+	>a.ig && >b.if &&
+	>c.if/c.if && >c.if/c.ig &&
+	>d.ig/d.if && >d.ig/d.ig
 
-expecting success of 0027.930 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 930 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 12 - .gitignore test setup
 
-expecting success of 0027.931 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 931 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+expecting success of 3700.13 '.gitignore is honored': 
+	git add . &&
+	git ls-files >files &&
+	sed -n "/\\.ig/p" <files >actual &&
+	test_must_be_empty actual
 
-expecting success of 0027.932 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 932 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
+ok 13 - .gitignore is honored
 
-expecting success of 0027.933 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 933 - setup LF checkout  with -c core.eol=crlf
+expecting success of 3700.14 'error out when attempting to add ignored ones without -f': 
+	test_must_fail git add a.?? &&
+	git ls-files >files &&
+	sed -n "/\\.ig/p" <files >actual &&
+	test_must_be_empty actual
 
-expecting success of 0027.934 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 934 - setup CRLF checkout  with -c core.eol=crlf
+The following paths are ignored by one of your .gitignore files:
+a.ig
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+ok 14 - error out when attempting to add ignored ones without -f
 
-expecting success of 0027.935 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 935 - setup LF_mix_CR checkout  with -c core.eol=crlf
+expecting success of 3700.15 'error out when attempting to add ignored ones without -f': 
+	test_must_fail git add d.?? &&
+	git ls-files >files &&
+	sed -n "/\\.ig/p" <files >actual &&
+	test_must_be_empty actual
 
-expecting success of 0027.936 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 936 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+The following paths are ignored by one of your .gitignore files:
+d.ig
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+ok 15 - error out when attempting to add ignored ones without -f
 
-expecting success of 0027.937 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 937 - setup LF_nul checkout  with -c core.eol=crlf
+expecting success of 3700.16 'error out when attempting to add ignored ones but add others': 
+	touch a.if &&
+	test_must_fail git add a.?? &&
+	git ls-files >files &&
+	sed -n "/\\.ig/p" <files >actual &&
+	test_must_be_empty actual &&
+	grep a.if files
 
-expecting success of 0027.938 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 938 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf
+The following paths are ignored by one of your .gitignore files:
+a.ig
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+a.if
+ok 16 - error out when attempting to add ignored ones but add others
 
-expecting success of 0027.939 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 939 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+expecting success of 3700.17 'add ignored ones with -f': 
+	git add -f a.?? &&
+	git ls-files --error-unmatch a.ig
 
-expecting success of 0027.940 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 940 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+a.ig
+ok 17 - add ignored ones with -f
 
-expecting success of 0027.941 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 941 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+expecting success of 3700.18 'add ignored ones with -f': 
+	git add -f d.??/* &&
+	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
 
-expecting success of 0027.942 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 942 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+d.ig/d.if
+d.ig/d.ig
+ok 18 - add ignored ones with -f
 
-expecting success of 0027.943 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 943 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+expecting success of 3700.19 'add ignored ones with -f': 
+	rm -f .git/index &&
+	git add -f d.?? &&
+	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
 
-expecting success of 0027.944 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 944 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
+d.ig/d.if
+d.ig/d.ig
+ok 19 - add ignored ones with -f
 
-expecting success of 0027.945 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 945 - setup LF checkout  with -c core.eol=crlf
+expecting success of 3700.20 '.gitignore with subdirectory': 
 
-expecting success of 0027.946 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 946 - setup CRLF checkout  with -c core.eol=crlf
+	rm -f .git/index &&
+	mkdir -p sub/dir &&
+	echo "!dir/a.*" >sub/.gitignore &&
+	>sub/a.ig &&
+	>sub/dir/a.ig &&
+	git add sub/dir &&
+	git ls-files --error-unmatch sub/dir/a.ig &&
+	rm -f .git/index &&
+	(
+		cd sub/dir &&
+		git add .
+	) &&
+	git ls-files --error-unmatch sub/dir/a.ig
 
-expecting success of 0027.947 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 947 - setup LF_mix_CR checkout  with -c core.eol=crlf
+sub/dir/a.ig
+sub/dir/a.ig
+ok 20 - .gitignore with subdirectory
 
-expecting success of 0027.948 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 948 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 3700.21 'check correct prefix detection': 
+	rm -f .git/index &&
+	git add 1/2/a 1/3/b 1/2/c
 
-expecting success of 0027.949 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 949 - setup LF_nul checkout  with -c core.eol=crlf
+ok 21 - check correct prefix detection
 
-expecting success of 0027.950 'ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 950 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=crlf
+expecting success of 3700.22 'git add with filemode=0, symlinks=0, and unmerged entries': 
+	for s in 1 2 3
+	do
+		echo $s > stage$s &&
+		echo "100755 $(git hash-object -w stage$s) $s	file" &&
+		echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s	symlink" || return 1
+	done | 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$"
 
-expecting success of 0027.951 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 951 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF
+100755 3e757656cf36eca53338e520d134963a44f793f8 0	file
+120000 3e757656cf36eca53338e520d134963a44f793f8 0	symlink
+ok 22 - git add with filemode=0, symlinks=0, and unmerged entries
 
-expecting success of 0027.952 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 952 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+expecting success of 3700.23 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1': 
+	git rm --cached -f file symlink &&
+	(
+		echo "100644 $(git hash-object -w stage1) 1	file" &&
+		echo "100755 $(git hash-object -w stage2) 2	file" &&
+		echo "100644 $(printf 1 | git hash-object -w -t blob --stdin) 1	symlink" &&
+		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$"
 
-expecting success of 0027.953 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 953 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+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 0027.954 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 954 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+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)"
 
-expecting success of 0027.955 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 955 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+[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 0027.956 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 956 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
+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 &&
 
-expecting success of 0027.957 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 957 - setup LF checkout  with -c core.eol=crlf
+	git diff-files --name-only >actual &&
+	! grep bar actual &&
+	grep baz actual
 
-expecting success of 0027.958 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 958 - setup CRLF checkout  with -c core.eol=crlf
+HEAD is now at 0254e3c commit all
+rm 'foo'
+baz
+ok 25 - git add --refresh with pathspec
 
-expecting success of 0027.959 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 959 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.960 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 960 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 26 - git add --refresh correctly reports no match error
 
-expecting success of 0027.961 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 961 - setup LF_nul checkout  with -c core.eol=crlf
+checking prerequisite: SANITY
 
-expecting success of 0027.962 'ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 962 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=crlf
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-expecting success of 0027.963 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 963 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+	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 0027.964 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 964 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-expecting success of 0027.965 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 965 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-expecting success of 0027.966 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 966 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+)
+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 )
 
-expecting success of 0027.967 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 967 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+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 0027.968 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 968 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
+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
 
-expecting success of 0027.969 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 969 - setup LF checkout  with -c core.eol=crlf
+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 0027.970 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 970 - setup CRLF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.971 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 971 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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 0027.972 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 972 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+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 )
 
-expecting success of 0027.973 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 973 - setup LF_nul checkout  with -c core.eol=crlf
+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 0027.974 'ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 974 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=crlf
+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
 
-expecting success of 0027.975 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 975 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF
+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 0027.976 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 976 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+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 )
 
-expecting success of 0027.977 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 977 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+HEAD is now at 0254e3c commit all
+fo[ou]bar
+ok 32 - git add 'fo\[ou\]bar' ignores foobar
 
-expecting success of 0027.978 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 978 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+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
 
-expecting success of 0027.979 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 979 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+HEAD is now at 0254e3c commit all
+ok 33 - git add to resolve conflicts on otherwise ignored path
 
-expecting success of 0027.980 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 980 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
+expecting success of 3700.34 '"add non-existent" should fail': 
+	test_must_fail git add non-existent &&
+	! (git ls-files | grep "non-existent")
 
-expecting success of 0027.981 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 981 - setup LF checkout  with -c core.eol=crlf
+fatal: pathspec 'non-existent' did not match any files
+ok 34 - "add non-existent" should fail
 
-expecting success of 0027.982 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 982 - setup CRLF checkout  with -c core.eol=crlf
+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
+	)
 
-expecting success of 0027.983 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 983 - setup LF_mix_CR checkout  with -c core.eol=crlf
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/empty/.git/
+ok 35 - git add -A on empty repo does not error out
 
-expecting success of 0027.984 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 984 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 3700.36 '"git add ." in empty repo': 
+	rm -fr empty &&
+	git init empty &&
+	(
+		cd empty &&
+		git add .
+	)
 
-expecting success of 0027.985 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 985 - setup LF_nul checkout  with -c core.eol=crlf
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/empty/.git/
+ok 36 - "git add ." in empty repo
 
-expecting success of 0027.986 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+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 advice.addEmbeddedRepo false"
+		warning: adding embedded git repository: inner2
 		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
 		test_cmp expect actual
-	
-ok 986 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf
-
-expecting success of 0027.987 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 987 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+	)
 
-expecting success of 0027.988 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 988 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/outer/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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 0027.989 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 989 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+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 0027.990 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 990 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/empty/.git/
+ok 38 - error on a repository with no commits
 
-expecting success of 0027.991 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 991 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+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 0027.992 'setup config for checkout attr= ident= aeol= core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 992 - setup config for checkout attr= ident= aeol= core.autocrlf=false
+ok 39 - git add --dry-run of existing changed file
 
-expecting success of 0027.993 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 993 - setup LF checkout  with -c core.eol=crlf
+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 0027.994 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 994 - setup CRLF checkout  with -c core.eol=crlf
+ok 40 - git add --dry-run of non-existing file
 
-expecting success of 0027.995 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 995 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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 0027.996 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 996 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 41 - git add --dry-run of an existing file output
 
-expecting success of 0027.997 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 997 - setup LF_nul checkout  with -c core.eol=crlf
+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 0027.998 'ls-files --eol attr=  aeol= core.autocrlf=false core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 998 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=crlf
+ok 42 - git add --dry-run --ignore-missing of non-existing file
 
-expecting success of 0027.999 'checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
-	
-ok 999 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF
+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 0027.1000 'checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1000 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 43 - git add --dry-run --ignore-missing of non-existing file output
 
-expecting success of 0027.1001 'checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1001 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+expecting success of 3700.44 'git add --dry-run --interactive should fail': 
+	test_must_fail git add --dry-run --interactive
 
-expecting success of 0027.1002 'checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1002 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+fatal: options '--dry-run' and '--interactive/--patch' cannot be used together
+ok 44 - git add --dry-run --interactive should fail
 
-expecting success of 0027.1003 'checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1003 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+expecting success of 3700.45 'git add empty string should fail': 
+	test_must_fail git add ""
 
-expecting success of 0027.1004 'setup config for checkout attr= ident= aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1004 - setup config for checkout attr= ident= aeol= core.autocrlf=true
+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 0027.1005 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1005 - setup LF checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.1006 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1006 - setup CRLF checkout  with -c core.eol=crlf
+pass
+pass
+ok 46 - git add --chmod=[+-]x stages correctly
 
-expecting success of 0027.1007 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1007 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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
 
-expecting success of 0027.1008 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1008 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+pass
+ok 47 - git add --chmod=+x with symlinks
 
-expecting success of 0027.1009 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1009 - setup LF_nul checkout  with -c core.eol=crlf
+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 0027.1010 'ls-files --eol attr=  aeol= core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1010 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=crlf
+HEAD is now at 0254e3c commit all
+pass
+pass
+ok 48 - git add --chmod=[+-]x changes index with already added file
 
-expecting success of 0027.1011 'checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
-	
-ok 1011 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF
+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 0027.1012 'checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1012 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 49 - git add --chmod=[+-]x does not change the working tree
 
-expecting success of 0027.1013 'checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1013 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+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 0027.1014 'checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1014 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+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 0027.1015 'checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1015 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+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 0027.1016 'setup config for checkout attr=auto ident= aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1016 - setup config for checkout attr=auto ident= aeol= core.autocrlf=true
+HEAD is now at 0254e3c commit all
+pass
+ok 51 - git add --chmod honors --dry-run
 
-expecting success of 0027.1017 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1017 - setup LF checkout  with -c core.eol=crlf
+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 0027.1018 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1018 - setup CRLF checkout  with -c core.eol=crlf
+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 0027.1019 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1019 - setup LF_mix_CR checkout  with -c core.eol=crlf
+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 0027.1020 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1020 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+fatal: pathspec 'nonexistent' did not match any files
+ok 53 - git add --chmod --dry-run reports error for unmatched pathspec
 
-expecting success of 0027.1021 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1021 - setup LF_nul checkout  with -c core.eol=crlf
+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 0027.1022 'ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1022 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=crlf
+Nothing specified, nothing added.
+hint: Maybe you wanted to say 'git add .'?
+hint: Disable this message with "git config advice.addEmptyPathspec false"
+pass
+pass
+ok 54 - no file status change if no pathspec is given
 
-expecting success of 0027.1023 'checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1023 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF
+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
+	)
 
-expecting success of 0027.1024 'checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1024 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF
+Nothing specified, nothing added.
+hint: Maybe you wanted to say 'git add .'?
+hint: Disable this message with "git config advice.addEmptyPathspec false"
+pass
+pass
+ok 55 - no file status change if no pathspec is given in subdir
 
-expecting success of 0027.1025 'checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1025 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+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
+	)
 
-expecting success of 0027.1026 'checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1026 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/repo/.git/
+ok 56 - all statuses changed in folder if . is given
 
-expecting success of 0027.1027 'checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1027 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+checking prerequisite: CASE_INSENSITIVE_FS
 
-expecting success of 0027.1028 'setup config for checkout attr=text ident= aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1028 - setup config for checkout attr=text ident= aeol= core.autocrlf=true
+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 0027.1029 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1029 - setup LF checkout  with -c core.eol=crlf
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 57 # skip path is case-insensitive (missing CASE_INSENSITIVE_FS)
 
-expecting success of 0027.1030 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1030 - setup CRLF checkout  with -c core.eol=crlf
+# passed all 57 test(s)
+1..57
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t0027-auto-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t0027-auto-crlf/.git/
+expecting success of 0027.1 'ls-files --eol -o Text/Binary': 
+	test_when_finished "rm expect actual TeBi_*" &&
+	STRT=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA &&
+	STR=$STRT$STRT$STRT$STRT &&
+	printf "${STR}BBB\001" >TeBi_127_S &&
+	printf "${STR}BBBB\001">TeBi_128_S &&
+	printf "${STR}BBB\032" >TeBi_127_E &&
+	printf "\032${STR}BBB" >TeBi_E_127 &&
+	printf "${STR}BBBB\000">TeBi_128_N &&
+	printf "${STR}BBB\012">TeBi_128_L &&
+	printf "${STR}BBB\015">TeBi_127_C &&
+	printf "${STR}BB\015\012" >TeBi_126_CL &&
+	printf "${STR}BB\015\012\015" >TeBi_126_CLC &&
+	sort <<-\EOF >expect &&
+	i/ w/-text TeBi_127_S
+	i/ w/none TeBi_128_S
+	i/ w/none TeBi_127_E
+	i/ w/-text TeBi_E_127
+	i/ w/-text TeBi_128_N
+	i/ w/lf TeBi_128_L
+	i/ w/-text TeBi_127_C
+	i/ w/crlf TeBi_126_CL
+	i/ w/-text TeBi_126_CLC
+	EOF
+	git ls-files --eol -o >tmp &&
+	sed -n -e "/TeBi_/{s!attr/[	]*!!g
+	s!	! !g
+	s!  *! !g
+	p
+	}" tmp | sort >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.1031 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1031 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1 - ls-files --eol -o Text/Binary
 
-expecting success of 0027.1032 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1032 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 0027.2 'setup main': 
+	echo >.gitattributes &&
+	git checkout -b main &&
+	git add .gitattributes &&
+	git commit -m "add .gitattributes" . &&
+	printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\nLINETWO\nLINETHREE"     >LF &&
+	printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONE\r\nLINETWO\r\nLINETHREE" >CRLF &&
+	printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\r\nLINETWO\nLINETHREE"   >CRLF_mix_LF &&
+	printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\nLINETWO\rLINETHREE"     >LF_mix_CR &&
+	printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONE\r\nLINETWO\rLINETHREE"   >CRLF_mix_CR &&
+	printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONEQ\r\nLINETWO\r\nLINETHREE" | q_to_nul >CRLF_nul &&
+	printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONEQ\nLINETWO\nLINETHREE" | q_to_nul >LF_nul &&
+	create_NNO_MIX_files &&
+	git -c core.autocrlf=false add NNO_*.txt MIX_*.txt &&
+	git commit -m "mixed line endings" &&
+	test_tick
 
-expecting success of 0027.1033 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1033 - setup LF_nul checkout  with -c core.eol=crlf
+Switched to a new branch 'main'
+[main (root-commit) 92d411f] add .gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 .gitattributes
+[main 28e6523] mixed line endings
+ Author: A U Thor <author@example.com>
+ 360 files changed, 1260 insertions(+)
+ create mode 100644 MIX_attr_-text_aeol__false_CRLF.txt
+ create mode 100644 MIX_attr_-text_aeol__false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_-text_aeol__false_CRLF_nul.txt
+ create mode 100644 MIX_attr_-text_aeol__false_LF.txt
+ create mode 100644 MIX_attr_-text_aeol__false_LF_mix_CR.txt
+ create mode 100644 MIX_attr_-text_aeol__input_CRLF.txt
+ create mode 100644 MIX_attr_-text_aeol__input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_-text_aeol__input_CRLF_nul.txt
+ create mode 100644 MIX_attr_-text_aeol__input_LF.txt
+ create mode 100644 MIX_attr_-text_aeol__input_LF_mix_CR.txt
+ create mode 100644 MIX_attr_-text_aeol__true_CRLF.txt
+ create mode 100644 MIX_attr_-text_aeol__true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_-text_aeol__true_CRLF_nul.txt
+ create mode 100644 MIX_attr_-text_aeol__true_LF.txt
+ create mode 100644 MIX_attr_-text_aeol__true_LF_mix_CR.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_false_CRLF.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_false_CRLF_nul.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_false_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_false_LF_mix_CR.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_input_CRLF.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_input_CRLF_nul.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_input_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_input_LF_mix_CR.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_true_CRLF.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_true_CRLF_nul.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_true_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_crlf_true_LF_mix_CR.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_false_CRLF.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_false_CRLF_nul.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_false_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_false_LF_mix_CR.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_input_CRLF.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_input_CRLF_nul.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_input_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_input_LF_mix_CR.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_true_CRLF.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_true_CRLF_nul.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_true_LF.txt
+ create mode 100644 MIX_attr_-text_aeol_lf_true_LF_mix_CR.txt
+ create mode 100644 MIX_attr__aeol__false_CRLF.txt
+ create mode 100644 MIX_attr__aeol__false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr__aeol__false_CRLF_nul.txt
+ create mode 100644 MIX_attr__aeol__false_LF.txt
+ create mode 100644 MIX_attr__aeol__false_LF_mix_CR.txt
+ create mode 100644 MIX_attr__aeol__input_CRLF.txt
+ create mode 100644 MIX_attr__aeol__input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr__aeol__input_CRLF_nul.txt
+ create mode 100644 MIX_attr__aeol__input_LF.txt
+ create mode 100644 MIX_attr__aeol__input_LF_mix_CR.txt
+ create mode 100644 MIX_attr__aeol__true_CRLF.txt
+ create mode 100644 MIX_attr__aeol__true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr__aeol__true_CRLF_nul.txt
+ create mode 100644 MIX_attr__aeol__true_LF.txt
+ create mode 100644 MIX_attr__aeol__true_LF_mix_CR.txt
+ create mode 100644 MIX_attr__aeol_crlf_false_CRLF.txt
+ create mode 100644 MIX_attr__aeol_crlf_false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr__aeol_crlf_false_CRLF_nul.txt
+ create mode 100644 MIX_attr__aeol_crlf_false_LF.txt
+ create mode 100644 MIX_attr__aeol_crlf_false_LF_mix_CR.txt
+ create mode 100644 MIX_attr__aeol_crlf_input_CRLF.txt
+ create mode 100644 MIX_attr__aeol_crlf_input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr__aeol_crlf_input_CRLF_nul.txt
+ create mode 100644 MIX_attr__aeol_crlf_input_LF.txt
+ create mode 100644 MIX_attr__aeol_crlf_input_LF_mix_CR.txt
+ create mode 100644 MIX_attr__aeol_crlf_true_CRLF.txt
+ create mode 100644 MIX_attr__aeol_crlf_true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr__aeol_crlf_true_CRLF_nul.txt
+ create mode 100644 MIX_attr__aeol_crlf_true_LF.txt
+ create mode 100644 MIX_attr__aeol_crlf_true_LF_mix_CR.txt
+ create mode 100644 MIX_attr__aeol_lf_false_CRLF.txt
+ create mode 100644 MIX_attr__aeol_lf_false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr__aeol_lf_false_CRLF_nul.txt
+ create mode 100644 MIX_attr__aeol_lf_false_LF.txt
+ create mode 100644 MIX_attr__aeol_lf_false_LF_mix_CR.txt
+ create mode 100644 MIX_attr__aeol_lf_input_CRLF.txt
+ create mode 100644 MIX_attr__aeol_lf_input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr__aeol_lf_input_CRLF_nul.txt
+ create mode 100644 MIX_attr__aeol_lf_input_LF.txt
+ create mode 100644 MIX_attr__aeol_lf_input_LF_mix_CR.txt
+ create mode 100644 MIX_attr__aeol_lf_true_CRLF.txt
+ create mode 100644 MIX_attr__aeol_lf_true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr__aeol_lf_true_CRLF_nul.txt
+ create mode 100644 MIX_attr__aeol_lf_true_LF.txt
+ create mode 100644 MIX_attr__aeol_lf_true_LF_mix_CR.txt
+ create mode 100644 MIX_attr_auto_aeol__false_CRLF.txt
+ create mode 100644 MIX_attr_auto_aeol__false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_auto_aeol__false_CRLF_nul.txt
+ create mode 100644 MIX_attr_auto_aeol__false_LF.txt
+ create mode 100644 MIX_attr_auto_aeol__false_LF_mix_CR.txt
+ create mode 100644 MIX_attr_auto_aeol__input_CRLF.txt
+ create mode 100644 MIX_attr_auto_aeol__input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_auto_aeol__input_CRLF_nul.txt
+ create mode 100644 MIX_attr_auto_aeol__input_LF.txt
+ create mode 100644 MIX_attr_auto_aeol__input_LF_mix_CR.txt
+ create mode 100644 MIX_attr_auto_aeol__true_CRLF.txt
+ create mode 100644 MIX_attr_auto_aeol__true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_auto_aeol__true_CRLF_nul.txt
+ create mode 100644 MIX_attr_auto_aeol__true_LF.txt
+ create mode 100644 MIX_attr_auto_aeol__true_LF_mix_CR.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_false_CRLF.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_false_CRLF_nul.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_false_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_false_LF_mix_CR.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_input_CRLF.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_input_CRLF_nul.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_input_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_input_LF_mix_CR.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_true_CRLF.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_true_CRLF_nul.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_true_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_crlf_true_LF_mix_CR.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_false_CRLF.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_false_CRLF_nul.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_false_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_false_LF_mix_CR.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_input_CRLF.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_input_CRLF_nul.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_input_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_input_LF_mix_CR.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_true_CRLF.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_true_CRLF_nul.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_true_LF.txt
+ create mode 100644 MIX_attr_auto_aeol_lf_true_LF_mix_CR.txt
+ create mode 100644 MIX_attr_text_aeol__false_CRLF.txt
+ create mode 100644 MIX_attr_text_aeol__false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_text_aeol__false_CRLF_nul.txt
+ create mode 100644 MIX_attr_text_aeol__false_LF.txt
+ create mode 100644 MIX_attr_text_aeol__false_LF_mix_CR.txt
+ create mode 100644 MIX_attr_text_aeol__input_CRLF.txt
+ create mode 100644 MIX_attr_text_aeol__input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_text_aeol__input_CRLF_nul.txt
+ create mode 100644 MIX_attr_text_aeol__input_LF.txt
+ create mode 100644 MIX_attr_text_aeol__input_LF_mix_CR.txt
+ create mode 100644 MIX_attr_text_aeol__true_CRLF.txt
+ create mode 100644 MIX_attr_text_aeol__true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_text_aeol__true_CRLF_nul.txt
+ create mode 100644 MIX_attr_text_aeol__true_LF.txt
+ create mode 100644 MIX_attr_text_aeol__true_LF_mix_CR.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_false_CRLF.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_false_CRLF_nul.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_false_LF.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_false_LF_mix_CR.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_input_CRLF.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_input_CRLF_nul.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_input_LF.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_input_LF_mix_CR.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_true_CRLF.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_true_CRLF_nul.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_true_LF.txt
+ create mode 100644 MIX_attr_text_aeol_crlf_true_LF_mix_CR.txt
+ create mode 100644 MIX_attr_text_aeol_lf_false_CRLF.txt
+ create mode 100644 MIX_attr_text_aeol_lf_false_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_text_aeol_lf_false_CRLF_nul.txt
+ create mode 100644 MIX_attr_text_aeol_lf_false_LF.txt
+ create mode 100644 MIX_attr_text_aeol_lf_false_LF_mix_CR.txt
+ create mode 100644 MIX_attr_text_aeol_lf_input_CRLF.txt
+ create mode 100644 MIX_attr_text_aeol_lf_input_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_text_aeol_lf_input_CRLF_nul.txt
+ create mode 100644 MIX_attr_text_aeol_lf_input_LF.txt
+ create mode 100644 MIX_attr_text_aeol_lf_input_LF_mix_CR.txt
+ create mode 100644 MIX_attr_text_aeol_lf_true_CRLF.txt
+ create mode 100644 MIX_attr_text_aeol_lf_true_CRLF_mix_LF.txt
+ create mode 100644 MIX_attr_text_aeol_lf_true_CRLF_nul.txt
+ create mode 100644 MIX_attr_text_aeol_lf_true_LF.txt
+ create mode 100644 MIX_attr_text_aeol_lf_true_LF_mix_CR.txt
+ create mode 100644 NNO_attr_-text_aeol__false_CRLF.txt
+ create mode 100644 NNO_attr_-text_aeol__false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_-text_aeol__false_CRLF_nul.txt
+ create mode 100644 NNO_attr_-text_aeol__false_LF.txt
+ create mode 100644 NNO_attr_-text_aeol__false_LF_mix_CR.txt
+ create mode 100644 NNO_attr_-text_aeol__input_CRLF.txt
+ create mode 100644 NNO_attr_-text_aeol__input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_-text_aeol__input_CRLF_nul.txt
+ create mode 100644 NNO_attr_-text_aeol__input_LF.txt
+ create mode 100644 NNO_attr_-text_aeol__input_LF_mix_CR.txt
+ create mode 100644 NNO_attr_-text_aeol__true_CRLF.txt
+ create mode 100644 NNO_attr_-text_aeol__true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_-text_aeol__true_CRLF_nul.txt
+ create mode 100644 NNO_attr_-text_aeol__true_LF.txt
+ create mode 100644 NNO_attr_-text_aeol__true_LF_mix_CR.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_false_CRLF.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_false_CRLF_nul.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_false_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_false_LF_mix_CR.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_input_CRLF.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_input_CRLF_nul.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_input_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_true_CRLF.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_true_CRLF_nul.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_true_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_crlf_true_LF_mix_CR.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_false_CRLF.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_false_CRLF_nul.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_false_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_input_CRLF.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_input_CRLF_nul.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_input_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_true_CRLF.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_true_CRLF_nul.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_true_LF.txt
+ create mode 100644 NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt
+ create mode 100644 NNO_attr__aeol__false_CRLF.txt
+ create mode 100644 NNO_attr__aeol__false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr__aeol__false_CRLF_nul.txt
+ create mode 100644 NNO_attr__aeol__false_LF.txt
+ create mode 100644 NNO_attr__aeol__false_LF_mix_CR.txt
+ create mode 100644 NNO_attr__aeol__input_CRLF.txt
+ create mode 100644 NNO_attr__aeol__input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr__aeol__input_CRLF_nul.txt
+ create mode 100644 NNO_attr__aeol__input_LF.txt
+ create mode 100644 NNO_attr__aeol__input_LF_mix_CR.txt
+ create mode 100644 NNO_attr__aeol__true_CRLF.txt
+ create mode 100644 NNO_attr__aeol__true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr__aeol__true_CRLF_nul.txt
+ create mode 100644 NNO_attr__aeol__true_LF.txt
+ create mode 100644 NNO_attr__aeol__true_LF_mix_CR.txt
+ create mode 100644 NNO_attr__aeol_crlf_false_CRLF.txt
+ create mode 100644 NNO_attr__aeol_crlf_false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr__aeol_crlf_false_CRLF_nul.txt
+ create mode 100644 NNO_attr__aeol_crlf_false_LF.txt
+ create mode 100644 NNO_attr__aeol_crlf_false_LF_mix_CR.txt
+ create mode 100644 NNO_attr__aeol_crlf_input_CRLF.txt
+ create mode 100644 NNO_attr__aeol_crlf_input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr__aeol_crlf_input_CRLF_nul.txt
+ create mode 100644 NNO_attr__aeol_crlf_input_LF.txt
+ create mode 100644 NNO_attr__aeol_crlf_input_LF_mix_CR.txt
+ create mode 100644 NNO_attr__aeol_crlf_true_CRLF.txt
+ create mode 100644 NNO_attr__aeol_crlf_true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr__aeol_crlf_true_CRLF_nul.txt
+ create mode 100644 NNO_attr__aeol_crlf_true_LF.txt
+ create mode 100644 NNO_attr__aeol_crlf_true_LF_mix_CR.txt
+ create mode 100644 NNO_attr__aeol_lf_false_CRLF.txt
+ create mode 100644 NNO_attr__aeol_lf_false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr__aeol_lf_false_CRLF_nul.txt
+ create mode 100644 NNO_attr__aeol_lf_false_LF.txt
+ create mode 100644 NNO_attr__aeol_lf_false_LF_mix_CR.txt
+ create mode 100644 NNO_attr__aeol_lf_input_CRLF.txt
+ create mode 100644 NNO_attr__aeol_lf_input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr__aeol_lf_input_CRLF_nul.txt
+ create mode 100644 NNO_attr__aeol_lf_input_LF.txt
+ create mode 100644 NNO_attr__aeol_lf_input_LF_mix_CR.txt
+ create mode 100644 NNO_attr__aeol_lf_true_CRLF.txt
+ create mode 100644 NNO_attr__aeol_lf_true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr__aeol_lf_true_CRLF_nul.txt
+ create mode 100644 NNO_attr__aeol_lf_true_LF.txt
+ create mode 100644 NNO_attr__aeol_lf_true_LF_mix_CR.txt
+ create mode 100644 NNO_attr_auto_aeol__false_CRLF.txt
+ create mode 100644 NNO_attr_auto_aeol__false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_auto_aeol__false_CRLF_nul.txt
+ create mode 100644 NNO_attr_auto_aeol__false_LF.txt
+ create mode 100644 NNO_attr_auto_aeol__false_LF_mix_CR.txt
+ create mode 100644 NNO_attr_auto_aeol__input_CRLF.txt
+ create mode 100644 NNO_attr_auto_aeol__input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_auto_aeol__input_CRLF_nul.txt
+ create mode 100644 NNO_attr_auto_aeol__input_LF.txt
+ create mode 100644 NNO_attr_auto_aeol__input_LF_mix_CR.txt
+ create mode 100644 NNO_attr_auto_aeol__true_CRLF.txt
+ create mode 100644 NNO_attr_auto_aeol__true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_auto_aeol__true_CRLF_nul.txt
+ create mode 100644 NNO_attr_auto_aeol__true_LF.txt
+ create mode 100644 NNO_attr_auto_aeol__true_LF_mix_CR.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_false_CRLF.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_false_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_false_LF_mix_CR.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_input_CRLF.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_input_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_true_CRLF.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_true_CRLF_nul.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_true_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_crlf_true_LF_mix_CR.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_false_CRLF.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_false_CRLF_nul.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_false_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_input_CRLF.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_input_CRLF_nul.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_input_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_input_LF_mix_CR.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_true_CRLF.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_true_CRLF_nul.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_true_LF.txt
+ create mode 100644 NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt
+ create mode 100644 NNO_attr_text_aeol__false_CRLF.txt
+ create mode 100644 NNO_attr_text_aeol__false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_text_aeol__false_CRLF_nul.txt
+ create mode 100644 NNO_attr_text_aeol__false_LF.txt
+ create mode 100644 NNO_attr_text_aeol__false_LF_mix_CR.txt
+ create mode 100644 NNO_attr_text_aeol__input_CRLF.txt
+ create mode 100644 NNO_attr_text_aeol__input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_text_aeol__input_CRLF_nul.txt
+ create mode 100644 NNO_attr_text_aeol__input_LF.txt
+ create mode 100644 NNO_attr_text_aeol__input_LF_mix_CR.txt
+ create mode 100644 NNO_attr_text_aeol__true_CRLF.txt
+ create mode 100644 NNO_attr_text_aeol__true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_text_aeol__true_CRLF_nul.txt
+ create mode 100644 NNO_attr_text_aeol__true_LF.txt
+ create mode 100644 NNO_attr_text_aeol__true_LF_mix_CR.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_false_CRLF.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_false_CRLF_nul.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_false_LF.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_input_CRLF.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_input_CRLF_nul.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_input_LF.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_true_CRLF.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_true_CRLF_nul.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_true_LF.txt
+ create mode 100644 NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt
+ create mode 100644 NNO_attr_text_aeol_lf_false_CRLF.txt
+ create mode 100644 NNO_attr_text_aeol_lf_false_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_text_aeol_lf_false_CRLF_nul.txt
+ create mode 100644 NNO_attr_text_aeol_lf_false_LF.txt
+ create mode 100644 NNO_attr_text_aeol_lf_false_LF_mix_CR.txt
+ create mode 100644 NNO_attr_text_aeol_lf_input_CRLF.txt
+ create mode 100644 NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_text_aeol_lf_input_CRLF_nul.txt
+ create mode 100644 NNO_attr_text_aeol_lf_input_LF.txt
+ create mode 100644 NNO_attr_text_aeol_lf_input_LF_mix_CR.txt
+ create mode 100644 NNO_attr_text_aeol_lf_true_CRLF.txt
+ create mode 100644 NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt
+ create mode 100644 NNO_attr_text_aeol_lf_true_CRLF_nul.txt
+ create mode 100644 NNO_attr_text_aeol_lf_true_LF.txt
+ create mode 100644 NNO_attr_text_aeol_lf_true_LF_mix_CR.txt
+ok 2 - setup main
 
-expecting success of 0027.1034 'ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1034 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=crlf
+expecting success of 0027.3 'commit files empty attr': 
+	commit_check_warn false ""     ""        ""        ""        ""        "" &&
+	commit_check_warn true  ""     "LF_CRLF" ""        "LF_CRLF" ""        "" &&
+	commit_check_warn input ""     ""        "CRLF_LF" "CRLF_LF" ""        ""
 
-expecting success of 0027.1035 'checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1035 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF
+[main c62ad5d] core.autocrlf false
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_false_attr__CRLF.txt
+ create mode 100644 crlf_false_attr__CRLF_mix_LF.txt
+ create mode 100644 crlf_false_attr__CRLF_nul.txt
+ create mode 100644 crlf_false_attr__LF.txt
+ create mode 100644 crlf_false_attr__LF_mix_CR.txt
+ create mode 100644 crlf_false_attr__LF_nul.txt
+[main d70a676] core.autocrlf true
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_true_attr__CRLF.txt
+ create mode 100644 crlf_true_attr__CRLF_mix_LF.txt
+ create mode 100644 crlf_true_attr__CRLF_nul.txt
+ create mode 100644 crlf_true_attr__LF.txt
+ create mode 100644 crlf_true_attr__LF_mix_CR.txt
+ create mode 100644 crlf_true_attr__LF_nul.txt
+[main a106c40] core.autocrlf input
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_input_attr__CRLF.txt
+ create mode 100644 crlf_input_attr__CRLF_mix_LF.txt
+ create mode 100644 crlf_input_attr__CRLF_nul.txt
+ create mode 100644 crlf_input_attr__LF.txt
+ create mode 100644 crlf_input_attr__LF_mix_CR.txt
+ create mode 100644 crlf_input_attr__LF_nul.txt
+ok 3 - commit files empty attr
 
-expecting success of 0027.1036 'checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1036 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF
+expecting success of 0027.4 'commit files attr=auto': 
+	commit_check_warn false "auto" "$WILC"   "$WICL"   "$WAMIX"  ""        "" &&
+	commit_check_warn true  "auto" "LF_CRLF" ""        "LF_CRLF" ""        "" &&
+	commit_check_warn input "auto" ""        "CRLF_LF" "CRLF_LF" ""        ""
 
-expecting success of 0027.1037 'checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1037 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+[main 68bab31] core.autocrlf false
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_false_attr_auto_CRLF.txt
+ create mode 100644 crlf_false_attr_auto_CRLF_mix_LF.txt
+ create mode 100644 crlf_false_attr_auto_CRLF_nul.txt
+ create mode 100644 crlf_false_attr_auto_LF.txt
+ create mode 100644 crlf_false_attr_auto_LF_mix_CR.txt
+ create mode 100644 crlf_false_attr_auto_LF_nul.txt
+[main efc8d5d] core.autocrlf true
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_true_attr_auto_CRLF.txt
+ create mode 100644 crlf_true_attr_auto_CRLF_mix_LF.txt
+ create mode 100644 crlf_true_attr_auto_CRLF_nul.txt
+ create mode 100644 crlf_true_attr_auto_LF.txt
+ create mode 100644 crlf_true_attr_auto_LF_mix_CR.txt
+ create mode 100644 crlf_true_attr_auto_LF_nul.txt
+[main 21fb1d0] core.autocrlf input
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_input_attr_auto_CRLF.txt
+ create mode 100644 crlf_input_attr_auto_CRLF_mix_LF.txt
+ create mode 100644 crlf_input_attr_auto_CRLF_nul.txt
+ create mode 100644 crlf_input_attr_auto_LF.txt
+ create mode 100644 crlf_input_attr_auto_LF_mix_CR.txt
+ create mode 100644 crlf_input_attr_auto_LF_nul.txt
+ok 4 - commit files attr=auto
 
-expecting success of 0027.1038 'checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1038 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+expecting success of 0027.5 'commit files attr=text': 
+	commit_check_warn false "text" "$WILC"   "$WICL"   "$WAMIX"  "$WILC"   "$WICL"   &&
+	commit_check_warn true  "text" "LF_CRLF" ""        "LF_CRLF" "LF_CRLF" ""        &&
+	commit_check_warn input "text" ""        "CRLF_LF" "CRLF_LF" ""        "CRLF_LF"
 
-expecting success of 0027.1039 'checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1039 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+[main 16b2963] core.autocrlf false
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_false_attr_text_CRLF.txt
+ create mode 100644 crlf_false_attr_text_CRLF_mix_LF.txt
+ create mode 100644 crlf_false_attr_text_CRLF_nul.txt
+ create mode 100644 crlf_false_attr_text_LF.txt
+ create mode 100644 crlf_false_attr_text_LF_mix_CR.txt
+ create mode 100644 crlf_false_attr_text_LF_nul.txt
+[main 006c230] core.autocrlf true
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_true_attr_text_CRLF.txt
+ create mode 100644 crlf_true_attr_text_CRLF_mix_LF.txt
+ create mode 100644 crlf_true_attr_text_CRLF_nul.txt
+ create mode 100644 crlf_true_attr_text_LF.txt
+ create mode 100644 crlf_true_attr_text_LF_mix_CR.txt
+ create mode 100644 crlf_true_attr_text_LF_nul.txt
+[main 00481a2] core.autocrlf input
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_input_attr_text_CRLF.txt
+ create mode 100644 crlf_input_attr_text_CRLF_mix_LF.txt
+ create mode 100644 crlf_input_attr_text_CRLF_nul.txt
+ create mode 100644 crlf_input_attr_text_LF.txt
+ create mode 100644 crlf_input_attr_text_LF_mix_CR.txt
+ create mode 100644 crlf_input_attr_text_LF_nul.txt
+ok 5 - commit files attr=text
 
-expecting success of 0027.1040 'setup config for checkout attr=text ident= aeol= core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1040 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
+expecting success of 0027.6 'commit files attr=-text': 
+	commit_check_warn false "-text" ""       ""        ""        ""        "" &&
+	commit_check_warn true  "-text" ""       ""        ""        ""        "" &&
+	commit_check_warn input "-text" ""       ""        ""        ""        ""
 
-expecting success of 0027.1041 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1041 - setup LF checkout  with -c core.eol=crlf
+[main 88d9dda] core.autocrlf false
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_false_attr_-text_CRLF.txt
+ create mode 100644 crlf_false_attr_-text_CRLF_mix_LF.txt
+ create mode 100644 crlf_false_attr_-text_CRLF_nul.txt
+ create mode 100644 crlf_false_attr_-text_LF.txt
+ create mode 100644 crlf_false_attr_-text_LF_mix_CR.txt
+ create mode 100644 crlf_false_attr_-text_LF_nul.txt
+[main 1456133] core.autocrlf true
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_true_attr_-text_CRLF.txt
+ create mode 100644 crlf_true_attr_-text_CRLF_mix_LF.txt
+ create mode 100644 crlf_true_attr_-text_CRLF_nul.txt
+ create mode 100644 crlf_true_attr_-text_LF.txt
+ create mode 100644 crlf_true_attr_-text_LF_mix_CR.txt
+ create mode 100644 crlf_true_attr_-text_LF_nul.txt
+[main 08b2ac8] core.autocrlf input
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_input_attr_-text_CRLF.txt
+ create mode 100644 crlf_input_attr_-text_CRLF_mix_LF.txt
+ create mode 100644 crlf_input_attr_-text_CRLF_nul.txt
+ create mode 100644 crlf_input_attr_-text_LF.txt
+ create mode 100644 crlf_input_attr_-text_LF_mix_CR.txt
+ create mode 100644 crlf_input_attr_-text_LF_nul.txt
+ok 6 - commit files attr=-text
 
-expecting success of 0027.1042 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1042 - setup CRLF checkout  with -c core.eol=crlf
+expecting success of 0027.7 'commit files attr=lf': 
+	commit_check_warn false "lf"    ""       "CRLF_LF" "CRLF_LF"  ""       "CRLF_LF" &&
+	commit_check_warn true  "lf"    ""       "CRLF_LF" "CRLF_LF"  ""       "CRLF_LF" &&
+	commit_check_warn input "lf"    ""       "CRLF_LF" "CRLF_LF"  ""       "CRLF_LF"
 
-expecting success of 0027.1043 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1043 - setup LF_mix_CR checkout  with -c core.eol=crlf
+[main f130974] core.autocrlf false
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_false_attr_lf_CRLF.txt
+ create mode 100644 crlf_false_attr_lf_CRLF_mix_LF.txt
+ create mode 100644 crlf_false_attr_lf_CRLF_nul.txt
+ create mode 100644 crlf_false_attr_lf_LF.txt
+ create mode 100644 crlf_false_attr_lf_LF_mix_CR.txt
+ create mode 100644 crlf_false_attr_lf_LF_nul.txt
+[main 0b69747] core.autocrlf true
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_true_attr_lf_CRLF.txt
+ create mode 100644 crlf_true_attr_lf_CRLF_mix_LF.txt
+ create mode 100644 crlf_true_attr_lf_CRLF_nul.txt
+ create mode 100644 crlf_true_attr_lf_LF.txt
+ create mode 100644 crlf_true_attr_lf_LF_mix_CR.txt
+ create mode 100644 crlf_true_attr_lf_LF_nul.txt
+[main 7d87167] core.autocrlf input
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_input_attr_lf_CRLF.txt
+ create mode 100644 crlf_input_attr_lf_CRLF_mix_LF.txt
+ create mode 100644 crlf_input_attr_lf_CRLF_nul.txt
+ create mode 100644 crlf_input_attr_lf_LF.txt
+ create mode 100644 crlf_input_attr_lf_LF_mix_CR.txt
+ create mode 100644 crlf_input_attr_lf_LF_nul.txt
+ok 7 - commit files attr=lf
 
-expecting success of 0027.1044 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1044 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 0027.8 'commit files attr=crlf': 
+	commit_check_warn false "crlf" "LF_CRLF" ""        "LF_CRLF" "LF_CRLF" "" &&
+	commit_check_warn true  "crlf" "LF_CRLF" ""        "LF_CRLF" "LF_CRLF" "" &&
+	commit_check_warn input "crlf" "LF_CRLF" ""        "LF_CRLF" "LF_CRLF" ""
 
-expecting success of 0027.1045 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1045 - setup LF_nul checkout  with -c core.eol=crlf
+[main 753280e] core.autocrlf false
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_false_attr_crlf_CRLF.txt
+ create mode 100644 crlf_false_attr_crlf_CRLF_mix_LF.txt
+ create mode 100644 crlf_false_attr_crlf_CRLF_nul.txt
+ create mode 100644 crlf_false_attr_crlf_LF.txt
+ create mode 100644 crlf_false_attr_crlf_LF_mix_CR.txt
+ create mode 100644 crlf_false_attr_crlf_LF_nul.txt
+[main abec00d] core.autocrlf true
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_true_attr_crlf_CRLF.txt
+ create mode 100644 crlf_true_attr_crlf_CRLF_mix_LF.txt
+ create mode 100644 crlf_true_attr_crlf_CRLF_nul.txt
+ create mode 100644 crlf_true_attr_crlf_LF.txt
+ create mode 100644 crlf_true_attr_crlf_LF_mix_CR.txt
+ create mode 100644 crlf_true_attr_crlf_LF_nul.txt
+[main 4e045e6] core.autocrlf input
+ Author: A U Thor <author@example.com>
+ 6 files changed, 15 insertions(+)
+ create mode 100644 crlf_input_attr_crlf_CRLF.txt
+ create mode 100644 crlf_input_attr_crlf_CRLF_mix_LF.txt
+ create mode 100644 crlf_input_attr_crlf_CRLF_nul.txt
+ create mode 100644 crlf_input_attr_crlf_LF.txt
+ create mode 100644 crlf_input_attr_crlf_LF_mix_CR.txt
+ create mode 100644 crlf_input_attr_crlf_LF_nul.txt
+ok 8 - commit files attr=crlf
 
-expecting success of 0027.1046 'ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
+expecting success of 0027.9 'setup commit file with mixed EOL': 
+		#Commit file with CLRF_mix_LF on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp CRLF_mix_LF $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
 	
-ok 1046 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=crlf
+ok 9 - setup commit file with mixed EOL
 
-expecting success of 0027.1047 'checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.10 'commit file with mixed EOL onto LF crlf=false attr=': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1047 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 10 - commit file with mixed EOL onto LF crlf=false attr=
 
-expecting success of 0027.1048 'checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.11 'commit file with mixed EOL onto CLRF attr= aeol= crlf=false': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1048 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 11 - commit file with mixed EOL onto CLRF attr= aeol= crlf=false
 
-expecting success of 0027.1049 'checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.12 'commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=false': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1049 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 12 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=false
 
-expecting success of 0027.1050 'checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.13 'commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=false ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1050 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 13 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=false 
 
-expecting success of 0027.1051 'checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.14 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=false': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1051 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 14 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=false
 
-expecting success of 0027.1052 'setup config for checkout attr=auto ident= aeol= core.autocrlf=input': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
+expecting success of 0027.15 'setup commit file with mixed EOL': 
+		#Commit file with CLRF_mix_LF on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp CRLF_mix_LF $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
 	
-ok 1052 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
-
-expecting success of 0027.1053 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1053 - setup LF checkout  with -c core.eol=crlf
-
-expecting success of 0027.1054 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1054 - setup CRLF checkout  with -c core.eol=crlf
+ok 15 - setup commit file with mixed EOL
 
-expecting success of 0027.1055 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1055 - setup LF_mix_CR checkout  with -c core.eol=crlf
+expecting success of 0027.16 'commit file with mixed EOL onto LF crlf=true attr=': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 16 - commit file with mixed EOL onto LF crlf=true attr=
 
-expecting success of 0027.1056 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1056 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 0027.17 'commit file with mixed EOL onto CLRF attr= aeol= crlf=true': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 17 - commit file with mixed EOL onto CLRF attr= aeol= crlf=true
 
-expecting success of 0027.1057 'setup LF_nul checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1057 - setup LF_nul checkout  with -c core.eol=crlf
+expecting success of 0027.18 'commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=true': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 18 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=true
 
-expecting success of 0027.1058 'ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
+expecting success of 0027.19 'commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=true ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1058 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=crlf
+ok 19 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=true 
 
-expecting success of 0027.1059 'checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.20 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=true': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1059 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 20 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=true
 
-expecting success of 0027.1060 'checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.21 'setup commit file with mixed EOL': 
+		#Commit file with CLRF_mix_LF on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp CRLF_mix_LF $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
 	
-ok 1060 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 21 - setup commit file with mixed EOL
 
-expecting success of 0027.1061 'checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.22 'commit file with mixed EOL onto LF crlf=input attr=': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1061 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 22 - commit file with mixed EOL onto LF crlf=input attr=
 
-expecting success of 0027.1062 'checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.23 'commit file with mixed EOL onto CLRF attr= aeol= crlf=input': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1062 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 23 - commit file with mixed EOL onto CLRF attr= aeol= crlf=input
 
-expecting success of 0027.1063 'checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.24 'commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=input': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1063 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 24 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=input
 
-expecting success of 0027.1064 'setup config for checkout attr=-text ident= aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
+expecting success of 0027.25 'commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=input ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1064 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
+ok 25 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=input 
 
-expecting success of 0027.1065 'setup LF checkout  with -c core.eol=native': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1065 - setup LF checkout  with -c core.eol=native
+expecting success of 0027.26 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=input': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 26 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=input
 
-expecting success of 0027.1066 'setup CRLF checkout  with -c core.eol=native': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1066 - setup CRLF checkout  with -c core.eol=native
+expecting success of 0027.27 'setup commit file with mixed EOL': 
+		#Commit file with CLRF_mix_LF on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp CRLF_mix_LF $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 27 - setup commit file with mixed EOL
 
-expecting success of 0027.1067 'setup LF_mix_CR checkout  with -c core.eol=native': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1067 - setup LF_mix_CR checkout  with -c core.eol=native
+expecting success of 0027.28 'commit file with mixed EOL onto LF crlf=false attr=auto': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 28 - commit file with mixed EOL onto LF crlf=false attr=auto
 
-expecting success of 0027.1068 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1068 - setup CRLF_mix_LF checkout  with -c core.eol=native
+expecting success of 0027.29 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 29 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false
 
-expecting success of 0027.1069 'setup LF_nul checkout  with -c core.eol=native': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1069 - setup LF_nul checkout  with -c core.eol=native
+expecting success of 0027.30 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=false': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 30 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=false
 
-expecting success of 0027.1070 'ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=native': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
+expecting success of 0027.31 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=false ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1070 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=native
+ok 31 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=false 
 
-expecting success of 0027.1071 'checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.32 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=false': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1071 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF
+ok 32 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=false
 
-expecting success of 0027.1072 'checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.33 'setup commit file with mixed EOL': 
+		#Commit file with CLRF_mix_LF on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp CRLF_mix_LF $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
 	
-ok 1072 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 33 - setup commit file with mixed EOL
 
-expecting success of 0027.1073 'checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.34 'commit file with mixed EOL onto LF crlf=true attr=auto': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1073 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 34 - commit file with mixed EOL onto LF crlf=true attr=auto
 
-expecting success of 0027.1074 'checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.35 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=true': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1074 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 35 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=true
 
-expecting success of 0027.1075 'checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.36 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=true': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1075 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 36 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=true
 
-expecting success of 0027.1076 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
+expecting success of 0027.37 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1076 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
+ok 37 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true 
 
-expecting success of 0027.1077 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.38 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=true': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 38 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=true
+
+expecting success of 0027.39 'setup commit file with mixed EOL': 
+		#Commit file with CLRF_mix_LF on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp CRLF_mix_LF $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 39 - setup commit file with mixed EOL
+
+expecting success of 0027.40 'commit file with mixed EOL onto LF crlf=input attr=auto': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 40 - commit file with mixed EOL onto LF crlf=input attr=auto
+
+expecting success of 0027.41 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=input': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 41 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=input
+
+expecting success of 0027.42 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=input': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 42 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=input
+
+expecting success of 0027.43 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 43 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input 
+
+expecting success of 0027.44 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=input': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 44 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=input
+
+expecting success of 0027.45 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 45 - setup commit NNO files
+
+expecting success of 0027.46 'commit NNO files crlf=false attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 46 - commit NNO files crlf=false attr= LF
+
+expecting success of 0027.47 'commit NNO files attr= aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 47 - commit NNO files attr= aeol= crlf=false CRLF
+
+expecting success of 0027.48 'commit NNO files attr= aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 48 - commit NNO files attr= aeol= crlf=false CRLF_mix_LF
+
+expecting success of 0027.49 'commit NNO files attr= aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 49 - commit NNO files attr= aeol= crlf=false LF_mix_cr
+
+expecting success of 0027.50 'commit NNO files attr= aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 50 - commit NNO files attr= aeol= crlf=false CRLF_nul
+
+expecting success of 0027.51 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 51 - setup commit NNO files
+
+expecting success of 0027.52 'commit NNO files crlf=true attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 52 - commit NNO files crlf=true attr= LF
+
+expecting success of 0027.53 'commit NNO files attr= aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 53 - commit NNO files attr= aeol= crlf=true CRLF
+
+expecting success of 0027.54 'commit NNO files attr= aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 54 - commit NNO files attr= aeol= crlf=true CRLF_mix_LF
+
+expecting success of 0027.55 'commit NNO files attr= aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 55 - commit NNO files attr= aeol= crlf=true LF_mix_cr
+
+expecting success of 0027.56 'commit NNO files attr= aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 56 - commit NNO files attr= aeol= crlf=true CRLF_nul
+
+expecting success of 0027.57 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 57 - setup commit NNO files
+
+expecting success of 0027.58 'commit NNO files crlf=input attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 58 - commit NNO files crlf=input attr= LF
+
+expecting success of 0027.59 'commit NNO files attr= aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 59 - commit NNO files attr= aeol= crlf=input CRLF
+
+expecting success of 0027.60 'commit NNO files attr= aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 60 - commit NNO files attr= aeol= crlf=input CRLF_mix_LF
+
+expecting success of 0027.61 'commit NNO files attr= aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 61 - commit NNO files attr= aeol= crlf=input LF_mix_cr
+
+expecting success of 0027.62 'commit NNO files attr= aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 62 - commit NNO files attr= aeol= crlf=input CRLF_nul
+
+expecting success of 0027.63 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 63 - setup commit NNO files
+
+expecting success of 0027.64 'commit NNO files crlf=false attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 64 - commit NNO files crlf=false attr=auto LF
+
+expecting success of 0027.65 'commit NNO files attr=auto aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 65 - commit NNO files attr=auto aeol= crlf=false CRLF
+
+expecting success of 0027.66 'commit NNO files attr=auto aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 66 - commit NNO files attr=auto aeol= crlf=false CRLF_mix_LF
+
+expecting success of 0027.67 'commit NNO files attr=auto aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 67 - commit NNO files attr=auto aeol= crlf=false LF_mix_cr
+
+expecting success of 0027.68 'commit NNO files attr=auto aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 68 - commit NNO files attr=auto aeol= crlf=false CRLF_nul
+
+expecting success of 0027.69 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 69 - setup commit NNO files
+
+expecting success of 0027.70 'commit NNO files crlf=true attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 70 - commit NNO files crlf=true attr=auto LF
+
+expecting success of 0027.71 'commit NNO files attr=auto aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 71 - commit NNO files attr=auto aeol= crlf=true CRLF
+
+expecting success of 0027.72 'commit NNO files attr=auto aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 72 - commit NNO files attr=auto aeol= crlf=true CRLF_mix_LF
+
+expecting success of 0027.73 'commit NNO files attr=auto aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 73 - commit NNO files attr=auto aeol= crlf=true LF_mix_cr
+
+expecting success of 0027.74 'commit NNO files attr=auto aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 74 - commit NNO files attr=auto aeol= crlf=true CRLF_nul
+
+expecting success of 0027.75 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 75 - setup commit NNO files
+
+expecting success of 0027.76 'commit NNO files crlf=input attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 76 - commit NNO files crlf=input attr=auto LF
+
+expecting success of 0027.77 'commit NNO files attr=auto aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 77 - commit NNO files attr=auto aeol= crlf=input CRLF
+
+expecting success of 0027.78 'commit NNO files attr=auto aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 78 - commit NNO files attr=auto aeol= crlf=input CRLF_mix_LF
+
+expecting success of 0027.79 'commit NNO files attr=auto aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 79 - commit NNO files attr=auto aeol= crlf=input LF_mix_cr
+
+expecting success of 0027.80 'commit NNO files attr=auto aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 80 - commit NNO files attr=auto aeol= crlf=input CRLF_nul
+
+expecting success of 0027.81 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 81 - setup commit NNO files
+
+expecting success of 0027.82 'commit NNO files crlf=true attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 82 - commit NNO files crlf=true attr=-text LF
+
+expecting success of 0027.83 'commit NNO files attr=-text aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 83 - commit NNO files attr=-text aeol= crlf=true CRLF
+
+expecting success of 0027.84 'commit NNO files attr=-text aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 84 - commit NNO files attr=-text aeol= crlf=true CRLF_mix_LF
+
+expecting success of 0027.85 'commit NNO files attr=-text aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 85 - commit NNO files attr=-text aeol= crlf=true LF_mix_cr
+
+expecting success of 0027.86 'commit NNO files attr=-text aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 86 - commit NNO files attr=-text aeol= crlf=true CRLF_nul
+
+expecting success of 0027.87 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 87 - setup commit NNO files
+
+expecting success of 0027.88 'commit NNO files crlf=true attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 88 - commit NNO files crlf=true attr=-text LF
+
+expecting success of 0027.89 'commit NNO files attr=-text aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 89 - commit NNO files attr=-text aeol=lf crlf=true CRLF
+
+expecting success of 0027.90 'commit NNO files attr=-text aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 90 - commit NNO files attr=-text aeol=lf crlf=true CRLF_mix_LF
+
+expecting success of 0027.91 'commit NNO files attr=-text aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 91 - commit NNO files attr=-text aeol=lf crlf=true LF_mix_cr
+
+expecting success of 0027.92 'commit NNO files attr=-text aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 92 - commit NNO files attr=-text aeol=lf crlf=true CRLF_nul
+
+expecting success of 0027.93 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 93 - setup commit NNO files
+
+expecting success of 0027.94 'commit NNO files crlf=true attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 94 - commit NNO files crlf=true attr=-text LF
+
+expecting success of 0027.95 'commit NNO files attr=-text aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 95 - commit NNO files attr=-text aeol=crlf crlf=true CRLF
+
+expecting success of 0027.96 'commit NNO files attr=-text aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 96 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_mix_LF
+
+expecting success of 0027.97 'commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 97 - commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr
+
+expecting success of 0027.98 'commit NNO files attr=-text aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 98 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_nul
+
+expecting success of 0027.99 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 99 - setup commit NNO files
+
+expecting success of 0027.100 'commit NNO files crlf=true attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 100 - commit NNO files crlf=true attr= LF
+
+expecting success of 0027.101 'commit NNO files attr= aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 101 - commit NNO files attr= aeol=lf crlf=true CRLF
+
+expecting success of 0027.102 'commit NNO files attr= aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 102 - commit NNO files attr= aeol=lf crlf=true CRLF_mix_LF
+
+expecting success of 0027.103 'commit NNO files attr= aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 103 - commit NNO files attr= aeol=lf crlf=true LF_mix_cr
+
+expecting success of 0027.104 'commit NNO files attr= aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 104 - commit NNO files attr= aeol=lf crlf=true CRLF_nul
+
+expecting success of 0027.105 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 105 - setup commit NNO files
+
+expecting success of 0027.106 'commit NNO files crlf=true attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 106 - commit NNO files crlf=true attr= LF
+
+expecting success of 0027.107 'commit NNO files attr= aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 107 - commit NNO files attr= aeol=crlf crlf=true CRLF
+
+expecting success of 0027.108 'commit NNO files attr= aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 108 - commit NNO files attr= aeol=crlf crlf=true CRLF_mix_LF
+
+expecting success of 0027.109 'commit NNO files attr= aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 109 - commit NNO files attr= aeol=crlf crlf=true LF_mix_cr
+
+expecting success of 0027.110 'commit NNO files attr= aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 110 - commit NNO files attr= aeol=crlf crlf=true CRLF_nul
+
+expecting success of 0027.111 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 111 - setup commit NNO files
+
+expecting success of 0027.112 'commit NNO files crlf=true attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 112 - commit NNO files crlf=true attr=auto LF
+
+expecting success of 0027.113 'commit NNO files attr=auto aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 113 - commit NNO files attr=auto aeol=lf crlf=true CRLF
+
+expecting success of 0027.114 'commit NNO files attr=auto aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 114 - commit NNO files attr=auto aeol=lf crlf=true CRLF_mix_LF
+
+expecting success of 0027.115 'commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 115 - commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr
+
+expecting success of 0027.116 'commit NNO files attr=auto aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 116 - commit NNO files attr=auto aeol=lf crlf=true CRLF_nul
+
+expecting success of 0027.117 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 117 - setup commit NNO files
+
+expecting success of 0027.118 'commit NNO files crlf=true attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 118 - commit NNO files crlf=true attr=auto LF
+
+expecting success of 0027.119 'commit NNO files attr=auto aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 119 - commit NNO files attr=auto aeol=crlf crlf=true CRLF
+
+expecting success of 0027.120 'commit NNO files attr=auto aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 120 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_mix_LF
+
+expecting success of 0027.121 'commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 121 - commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr
+
+expecting success of 0027.122 'commit NNO files attr=auto aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 122 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_nul
+
+expecting success of 0027.123 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 123 - setup commit NNO files
+
+expecting success of 0027.124 'commit NNO files crlf=true attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 124 - commit NNO files crlf=true attr=text LF
+
+expecting success of 0027.125 'commit NNO files attr=text aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 125 - commit NNO files attr=text aeol=lf crlf=true CRLF
+
+expecting success of 0027.126 'commit NNO files attr=text aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 126 - commit NNO files attr=text aeol=lf crlf=true CRLF_mix_LF
+
+expecting success of 0027.127 'commit NNO files attr=text aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 127 - commit NNO files attr=text aeol=lf crlf=true LF_mix_cr
+
+expecting success of 0027.128 'commit NNO files attr=text aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 128 - commit NNO files attr=text aeol=lf crlf=true CRLF_nul
+
+expecting success of 0027.129 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 129 - setup commit NNO files
+
+expecting success of 0027.130 'commit NNO files crlf=true attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 130 - commit NNO files crlf=true attr=text LF
+
+expecting success of 0027.131 'commit NNO files attr=text aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 131 - commit NNO files attr=text aeol=crlf crlf=true CRLF
+
+expecting success of 0027.132 'commit NNO files attr=text aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 132 - commit NNO files attr=text aeol=crlf crlf=true CRLF_mix_LF
+
+expecting success of 0027.133 'commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 133 - commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr
+
+expecting success of 0027.134 'commit NNO files attr=text aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 134 - commit NNO files attr=text aeol=crlf crlf=true CRLF_nul
+
+expecting success of 0027.135 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 135 - setup commit NNO files
+
+expecting success of 0027.136 'commit NNO files crlf=false attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 136 - commit NNO files crlf=false attr=-text LF
+
+expecting success of 0027.137 'commit NNO files attr=-text aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 137 - commit NNO files attr=-text aeol= crlf=false CRLF
+
+expecting success of 0027.138 'commit NNO files attr=-text aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 138 - commit NNO files attr=-text aeol= crlf=false CRLF_mix_LF
+
+expecting success of 0027.139 'commit NNO files attr=-text aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 139 - commit NNO files attr=-text aeol= crlf=false LF_mix_cr
+
+expecting success of 0027.140 'commit NNO files attr=-text aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 140 - commit NNO files attr=-text aeol= crlf=false CRLF_nul
+
+expecting success of 0027.141 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 141 - setup commit NNO files
+
+expecting success of 0027.142 'commit NNO files crlf=false attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 142 - commit NNO files crlf=false attr=-text LF
+
+expecting success of 0027.143 'commit NNO files attr=-text aeol=lf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 143 - commit NNO files attr=-text aeol=lf crlf=false CRLF
+
+expecting success of 0027.144 'commit NNO files attr=-text aeol=lf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 144 - commit NNO files attr=-text aeol=lf crlf=false CRLF_mix_LF
+
+expecting success of 0027.145 'commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 145 - commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr
+
+expecting success of 0027.146 'commit NNO files attr=-text aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 146 - commit NNO files attr=-text aeol=lf crlf=false CRLF_nul
+
+expecting success of 0027.147 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 147 - setup commit NNO files
+
+expecting success of 0027.148 'commit NNO files crlf=false attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 148 - commit NNO files crlf=false attr=-text LF
+
+expecting success of 0027.149 'commit NNO files attr=-text aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 149 - commit NNO files attr=-text aeol=crlf crlf=false CRLF
+
+expecting success of 0027.150 'commit NNO files attr=-text aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 150 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_mix_LF
+
+expecting success of 0027.151 'commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 151 - commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr
+
+expecting success of 0027.152 'commit NNO files attr=-text aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 152 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_nul
+
+expecting success of 0027.153 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 153 - setup commit NNO files
+
+expecting success of 0027.154 'commit NNO files crlf=false attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 154 - commit NNO files crlf=false attr= LF
+
+expecting success of 0027.155 'commit NNO files attr= aeol=lf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 155 - commit NNO files attr= aeol=lf crlf=false CRLF
+
+expecting success of 0027.156 'commit NNO files attr= aeol=lf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 156 - commit NNO files attr= aeol=lf crlf=false CRLF_mix_LF
+
+expecting success of 0027.157 'commit NNO files attr= aeol=lf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 157 - commit NNO files attr= aeol=lf crlf=false LF_mix_cr
+
+expecting success of 0027.158 'commit NNO files attr= aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 158 - commit NNO files attr= aeol=lf crlf=false CRLF_nul
+
+expecting success of 0027.159 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 159 - setup commit NNO files
+
+expecting success of 0027.160 'commit NNO files crlf=false attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 160 - commit NNO files crlf=false attr= LF
+
+expecting success of 0027.161 'commit NNO files attr= aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 161 - commit NNO files attr= aeol=crlf crlf=false CRLF
+
+expecting success of 0027.162 'commit NNO files attr= aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 162 - commit NNO files attr= aeol=crlf crlf=false CRLF_mix_LF
+
+expecting success of 0027.163 'commit NNO files attr= aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 163 - commit NNO files attr= aeol=crlf crlf=false LF_mix_cr
+
+expecting success of 0027.164 'commit NNO files attr= aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 164 - commit NNO files attr= aeol=crlf crlf=false CRLF_nul
+
+expecting success of 0027.165 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 165 - setup commit NNO files
+
+expecting success of 0027.166 'commit NNO files crlf=false attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 166 - commit NNO files crlf=false attr=auto LF
+
+expecting success of 0027.167 'commit NNO files attr=auto aeol=lf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 167 - commit NNO files attr=auto aeol=lf crlf=false CRLF
+
+expecting success of 0027.168 'commit NNO files attr=auto aeol=lf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 168 - commit NNO files attr=auto aeol=lf crlf=false CRLF_mix_LF
+
+expecting success of 0027.169 'commit NNO files attr=auto aeol=lf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 169 - commit NNO files attr=auto aeol=lf crlf=false LF_mix_cr
+
+expecting success of 0027.170 'commit NNO files attr=auto aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 170 - commit NNO files attr=auto aeol=lf crlf=false CRLF_nul
+
+expecting success of 0027.171 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 171 - setup commit NNO files
+
+expecting success of 0027.172 'commit NNO files crlf=false attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 172 - commit NNO files crlf=false attr=auto LF
+
+expecting success of 0027.173 'commit NNO files attr=auto aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 173 - commit NNO files attr=auto aeol=crlf crlf=false CRLF
+
+expecting success of 0027.174 'commit NNO files attr=auto aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 174 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_mix_LF
+
+expecting success of 0027.175 'commit NNO files attr=auto aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 175 - commit NNO files attr=auto aeol=crlf crlf=false LF_mix_cr
+
+expecting success of 0027.176 'commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 176 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul
+
+expecting success of 0027.177 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 177 - setup commit NNO files
+
+expecting success of 0027.178 'commit NNO files crlf=false attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 178 - commit NNO files crlf=false attr=text LF
+
+expecting success of 0027.179 'commit NNO files attr=text aeol=lf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 179 - commit NNO files attr=text aeol=lf crlf=false CRLF
+
+expecting success of 0027.180 'commit NNO files attr=text aeol=lf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 180 - commit NNO files attr=text aeol=lf crlf=false CRLF_mix_LF
+
+expecting success of 0027.181 'commit NNO files attr=text aeol=lf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 181 - commit NNO files attr=text aeol=lf crlf=false LF_mix_cr
+
+expecting success of 0027.182 'commit NNO files attr=text aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 182 - commit NNO files attr=text aeol=lf crlf=false CRLF_nul
+
+expecting success of 0027.183 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 183 - setup commit NNO files
+
+expecting success of 0027.184 'commit NNO files crlf=false attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 184 - commit NNO files crlf=false attr=text LF
+
+expecting success of 0027.185 'commit NNO files attr=text aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 185 - commit NNO files attr=text aeol=crlf crlf=false CRLF
+
+expecting success of 0027.186 'commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 186 - commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF
+
+expecting success of 0027.187 'commit NNO files attr=text aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 187 - commit NNO files attr=text aeol=crlf crlf=false LF_mix_cr
+
+expecting success of 0027.188 'commit NNO files attr=text aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 188 - commit NNO files attr=text aeol=crlf crlf=false CRLF_nul
+
+expecting success of 0027.189 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 189 - setup commit NNO files
+
+expecting success of 0027.190 'commit NNO files crlf=input attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 190 - commit NNO files crlf=input attr=-text LF
+
+expecting success of 0027.191 'commit NNO files attr=-text aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 191 - commit NNO files attr=-text aeol= crlf=input CRLF
+
+expecting success of 0027.192 'commit NNO files attr=-text aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 192 - commit NNO files attr=-text aeol= crlf=input CRLF_mix_LF
+
+expecting success of 0027.193 'commit NNO files attr=-text aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 193 - commit NNO files attr=-text aeol= crlf=input LF_mix_cr
+
+expecting success of 0027.194 'commit NNO files attr=-text aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 194 - commit NNO files attr=-text aeol= crlf=input CRLF_nul
+
+expecting success of 0027.195 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 195 - setup commit NNO files
+
+expecting success of 0027.196 'commit NNO files crlf=input attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 196 - commit NNO files crlf=input attr=-text LF
+
+expecting success of 0027.197 'commit NNO files attr=-text aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 197 - commit NNO files attr=-text aeol=lf crlf=input CRLF
+
+expecting success of 0027.198 'commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 198 - commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF
+
+expecting success of 0027.199 'commit NNO files attr=-text aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 199 - commit NNO files attr=-text aeol=lf crlf=input LF_mix_cr
+
+expecting success of 0027.200 'commit NNO files attr=-text aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 200 - commit NNO files attr=-text aeol=lf crlf=input CRLF_nul
+
+expecting success of 0027.201 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 201 - setup commit NNO files
+
+expecting success of 0027.202 'commit NNO files crlf=input attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 202 - commit NNO files crlf=input attr=-text LF
+
+expecting success of 0027.203 'commit NNO files attr=-text aeol=crlf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 203 - commit NNO files attr=-text aeol=crlf crlf=input CRLF
+
+expecting success of 0027.204 'commit NNO files attr=-text aeol=crlf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 204 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_mix_LF
+
+expecting success of 0027.205 'commit NNO files attr=-text aeol=crlf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 205 - commit NNO files attr=-text aeol=crlf crlf=input LF_mix_cr
+
+expecting success of 0027.206 'commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 206 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul
+
+expecting success of 0027.207 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 207 - setup commit NNO files
+
+expecting success of 0027.208 'commit NNO files crlf=input attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 208 - commit NNO files crlf=input attr= LF
+
+expecting success of 0027.209 'commit NNO files attr= aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 209 - commit NNO files attr= aeol=lf crlf=input CRLF
+
+expecting success of 0027.210 'commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 210 - commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF
+
+expecting success of 0027.211 'commit NNO files attr= aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 211 - commit NNO files attr= aeol=lf crlf=input LF_mix_cr
+
+expecting success of 0027.212 'commit NNO files attr= aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 212 - commit NNO files attr= aeol=lf crlf=input CRLF_nul
+
+expecting success of 0027.213 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 213 - setup commit NNO files
+
+expecting success of 0027.214 'commit NNO files crlf=input attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 214 - commit NNO files crlf=input attr= LF
+
+expecting success of 0027.215 'commit NNO files attr= aeol=crlf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 215 - commit NNO files attr= aeol=crlf crlf=input CRLF
+
+expecting success of 0027.216 'commit NNO files attr= aeol=crlf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 216 - commit NNO files attr= aeol=crlf crlf=input CRLF_mix_LF
+
+expecting success of 0027.217 'commit NNO files attr= aeol=crlf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 217 - commit NNO files attr= aeol=crlf crlf=input LF_mix_cr
+
+expecting success of 0027.218 'commit NNO files attr= aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 218 - commit NNO files attr= aeol=crlf crlf=input CRLF_nul
+
+expecting success of 0027.219 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 219 - setup commit NNO files
+
+expecting success of 0027.220 'commit NNO files crlf=input attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 220 - commit NNO files crlf=input attr=auto LF
+
+expecting success of 0027.221 'commit NNO files attr=auto aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 221 - commit NNO files attr=auto aeol=lf crlf=input CRLF
+
+expecting success of 0027.222 'commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 222 - commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF
+
+expecting success of 0027.223 'commit NNO files attr=auto aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 223 - commit NNO files attr=auto aeol=lf crlf=input LF_mix_cr
+
+expecting success of 0027.224 'commit NNO files attr=auto aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 224 - commit NNO files attr=auto aeol=lf crlf=input CRLF_nul
+
+expecting success of 0027.225 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 225 - setup commit NNO files
+
+expecting success of 0027.226 'commit NNO files crlf=input attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 226 - commit NNO files crlf=input attr=auto LF
+
+expecting success of 0027.227 'commit NNO files attr=auto aeol=crlf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 227 - commit NNO files attr=auto aeol=crlf crlf=input CRLF
+
+expecting success of 0027.228 'commit NNO files attr=auto aeol=crlf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 228 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_mix_LF
+
+expecting success of 0027.229 'commit NNO files attr=auto aeol=crlf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 229 - commit NNO files attr=auto aeol=crlf crlf=input LF_mix_cr
+
+expecting success of 0027.230 'commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 230 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul
+
+expecting success of 0027.231 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 231 - setup commit NNO files
+
+expecting success of 0027.232 'commit NNO files crlf=input attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 232 - commit NNO files crlf=input attr=text LF
+
+expecting success of 0027.233 'commit NNO files attr=text aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 233 - commit NNO files attr=text aeol=lf crlf=input CRLF
+
+expecting success of 0027.234 'commit NNO files attr=text aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 234 - commit NNO files attr=text aeol=lf crlf=input CRLF_mix_LF
+
+expecting success of 0027.235 'commit NNO files attr=text aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 235 - commit NNO files attr=text aeol=lf crlf=input LF_mix_cr
+
+expecting success of 0027.236 'commit NNO files attr=text aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 236 - commit NNO files attr=text aeol=lf crlf=input CRLF_nul
+
+expecting success of 0027.237 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 237 - setup commit NNO files
+
+expecting success of 0027.238 'commit NNO files crlf=input attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 238 - commit NNO files crlf=input attr=text LF
+
+expecting success of 0027.239 'commit NNO files attr=text aeol=crlf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 239 - commit NNO files attr=text aeol=crlf crlf=input CRLF
+
+expecting success of 0027.240 'commit NNO files attr=text aeol=crlf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 240 - commit NNO files attr=text aeol=crlf crlf=input CRLF_mix_LF
+
+expecting success of 0027.241 'commit NNO files attr=text aeol=crlf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 241 - commit NNO files attr=text aeol=crlf crlf=input LF_mix_cr
+
+expecting success of 0027.242 'commit NNO files attr=text aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 242 - commit NNO files attr=text aeol=crlf crlf=input CRLF_nul
+
+expecting success of 0027.243 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 243 - setup commit NNO files
+
+expecting success of 0027.244 'commit NNO files crlf=false attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 244 - commit NNO files crlf=false attr=text LF
+
+expecting success of 0027.245 'commit NNO files attr=text aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 245 - commit NNO files attr=text aeol= crlf=false CRLF
+
+expecting success of 0027.246 'commit NNO files attr=text aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 246 - commit NNO files attr=text aeol= crlf=false CRLF_mix_LF
+
+expecting success of 0027.247 'commit NNO files attr=text aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 247 - commit NNO files attr=text aeol= crlf=false LF_mix_cr
+
+expecting success of 0027.248 'commit NNO files attr=text aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 248 - commit NNO files attr=text aeol= crlf=false CRLF_nul
+
+expecting success of 0027.249 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 249 - setup commit NNO files
+
+expecting success of 0027.250 'commit NNO files crlf=true attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 250 - commit NNO files crlf=true attr=text LF
+
+expecting success of 0027.251 'commit NNO files attr=text aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 251 - commit NNO files attr=text aeol= crlf=true CRLF
+
+expecting success of 0027.252 'commit NNO files attr=text aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 252 - commit NNO files attr=text aeol= crlf=true CRLF_mix_LF
+
+expecting success of 0027.253 'commit NNO files attr=text aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 253 - commit NNO files attr=text aeol= crlf=true LF_mix_cr
+
+expecting success of 0027.254 'commit NNO files attr=text aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 254 - commit NNO files attr=text aeol= crlf=true CRLF_nul
+
+expecting success of 0027.255 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 255 - setup commit NNO files
+
+expecting success of 0027.256 'commit NNO files crlf=input attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 256 - commit NNO files crlf=input attr=text LF
+
+expecting success of 0027.257 'commit NNO files attr=text aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 257 - commit NNO files attr=text aeol= crlf=input CRLF
+
+expecting success of 0027.258 'commit NNO files attr=text aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 258 - commit NNO files attr=text aeol= crlf=input CRLF_mix_LF
+
+expecting success of 0027.259 'commit NNO files attr=text aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 259 - commit NNO files attr=text aeol= crlf=input LF_mix_cr
+
+expecting success of 0027.260 'commit NNO files attr=text aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 260 - commit NNO files attr=text aeol= crlf=input CRLF_nul
+
+expecting success of 0027.261 'commit NNO and cleanup': 
+	git commit -m "commit files on top of NNO" &&
+	rm -f *.txt &&
+	git -c core.autocrlf=false reset --hard
+
+[main 35da0ca] commit files on top of NNO
+ Author: A U Thor <author@example.com>
+ 210 files changed, 332 insertions(+), 362 deletions(-)
+HEAD is now at 35da0ca commit files on top of NNO
+ok 261 - commit NNO and cleanup
+
+expecting success of 0027.262 'commit empty gitattribues': 
+	check_files_in_repo false ""      LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
+	check_files_in_repo true  ""      LF LF   LF          LF_mix_CR CRLF_nul &&
+	check_files_in_repo input ""      LF LF   LF          LF_mix_CR CRLF_nul
+
+ok 262 - commit empty gitattribues
+
+expecting success of 0027.263 'commit text=auto': 
+	check_files_in_repo false "auto"  LF LF   LF          LF_mix_CR CRLF_nul &&
+	check_files_in_repo true  "auto"  LF LF   LF          LF_mix_CR CRLF_nul &&
+	check_files_in_repo input "auto"  LF LF   LF          LF_mix_CR CRLF_nul
+
+ok 263 - commit text=auto
+
+expecting success of 0027.264 'commit text': 
+	check_files_in_repo false "text"  LF LF   LF          LF_mix_CR LF_nul &&
+	check_files_in_repo true  "text"  LF LF   LF          LF_mix_CR LF_nul &&
+	check_files_in_repo input "text"  LF LF   LF          LF_mix_CR LF_nul
+
+ok 264 - commit text
+
+expecting success of 0027.265 'commit -text': 
+	check_files_in_repo false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
+	check_files_in_repo true  "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
+	check_files_in_repo input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+
+ok 265 - commit -text
+
+expecting success of 0027.266 'compare_files LF NNO_attr__aeol__true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 266 - compare_files LF NNO_attr__aeol__true_LF.txt
+
+expecting success of 0027.267 'compare_files CRLF NNO_attr__aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 267 - compare_files CRLF NNO_attr__aeol__true_CRLF.txt
+
+expecting success of 0027.268 'compare_files CRLF_mix_LF NNO_attr__aeol__true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 268 - compare_files CRLF_mix_LF NNO_attr__aeol__true_CRLF_mix_LF.txt
+
+expecting success of 0027.269 'compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 269 - compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt
+
+expecting success of 0027.270 'compare_files CRLF_nul NNO_attr__aeol__true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 270 - compare_files CRLF_nul NNO_attr__aeol__true_CRLF_nul.txt
+
+expecting success of 0027.271 'compare_files LF NNO_attr_-text_aeol__true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 271 - compare_files LF NNO_attr_-text_aeol__true_LF.txt
+
+expecting success of 0027.272 'compare_files CRLF NNO_attr_-text_aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 272 - compare_files CRLF NNO_attr_-text_aeol__true_CRLF.txt
+
+expecting success of 0027.273 'compare_files CRLF_mix_LF NNO_attr_-text_aeol__true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 273 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__true_CRLF_mix_LF.txt
+
+expecting success of 0027.274 'compare_files LF_mix_CR NNO_attr_-text_aeol__true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 274 - compare_files LF_mix_CR NNO_attr_-text_aeol__true_LF_mix_CR.txt
+
+expecting success of 0027.275 'compare_files CRLF_nul NNO_attr_-text_aeol__true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 275 - compare_files CRLF_nul NNO_attr_-text_aeol__true_CRLF_nul.txt
+
+expecting success of 0027.276 'compare_files LF NNO_attr_-text_aeol_lf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 276 - compare_files LF NNO_attr_-text_aeol_lf_true_LF.txt
+
+expecting success of 0027.277 'compare_files CRLF NNO_attr_-text_aeol_lf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 277 - compare_files CRLF NNO_attr_-text_aeol_lf_true_CRLF.txt
+
+expecting success of 0027.278 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 278 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.279 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 279 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt
+
+expecting success of 0027.280 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 280 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_true_CRLF_nul.txt
+
+expecting success of 0027.281 'compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 281 - compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt
+
+expecting success of 0027.282 'compare_files CRLF NNO_attr_-text_aeol_crlf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 282 - compare_files CRLF NNO_attr_-text_aeol_crlf_true_CRLF.txt
+
+expecting success of 0027.283 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 283 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.284 'compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 284 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_true_LF_mix_CR.txt
+
+expecting success of 0027.285 'compare_files CRLF_nul NNO_attr_-text_aeol_crlf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 285 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_true_CRLF_nul.txt
+
+expecting success of 0027.286 'compare_files LF NNO_attr_auto_aeol__true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 286 - compare_files LF NNO_attr_auto_aeol__true_LF.txt
+
+expecting success of 0027.287 'compare_files CRLF NNO_attr_auto_aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 287 - compare_files CRLF NNO_attr_auto_aeol__true_CRLF.txt
+
+expecting success of 0027.288 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 288 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__true_CRLF_mix_LF.txt
+
+expecting success of 0027.289 'compare_files LF_mix_CR NNO_attr_auto_aeol__true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 289 - compare_files LF_mix_CR NNO_attr_auto_aeol__true_LF_mix_CR.txt
+
+expecting success of 0027.290 'compare_files CRLF_nul NNO_attr_auto_aeol__true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 290 - compare_files CRLF_nul NNO_attr_auto_aeol__true_CRLF_nul.txt
+
+expecting success of 0027.291 'compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 291 - compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt
+
+expecting success of 0027.292 'compare_files CRLF NNO_attr_auto_aeol_lf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 292 - compare_files CRLF NNO_attr_auto_aeol_lf_true_CRLF.txt
+
+expecting success of 0027.293 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 293 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.294 'compare_files LF_mix_CR NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 294 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt
+
+expecting success of 0027.295 'compare_files CRLF_nul NNO_attr_auto_aeol_lf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 295 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_true_CRLF_nul.txt
+
+expecting success of 0027.296 'compare_files LF NNO_attr_auto_aeol_crlf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 296 - compare_files LF NNO_attr_auto_aeol_crlf_true_LF.txt
+
+expecting success of 0027.297 'compare_files CRLF NNO_attr_auto_aeol_crlf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 297 - compare_files CRLF NNO_attr_auto_aeol_crlf_true_CRLF.txt
+
+expecting success of 0027.298 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 298 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.299 'compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 299 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_true_LF_mix_CR.txt
+
+expecting success of 0027.300 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 300 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_true_CRLF_nul.txt
+
+expecting success of 0027.301 'compare_files LF NNO_attr_text_aeol__true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 301 - compare_files LF NNO_attr_text_aeol__true_LF.txt
+
+expecting success of 0027.302 'compare_files LF NNO_attr_text_aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 302 - compare_files LF NNO_attr_text_aeol__true_CRLF.txt
+
+expecting success of 0027.303 'compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 303 - compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt
+
+expecting success of 0027.304 'compare_files LF_mix_CR NNO_attr_text_aeol__true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 304 - compare_files LF_mix_CR NNO_attr_text_aeol__true_LF_mix_CR.txt
+
+expecting success of 0027.305 'compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 305 - compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt
+
+expecting success of 0027.306 'compare_files LF NNO_attr_text_aeol_lf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 306 - compare_files LF NNO_attr_text_aeol_lf_true_LF.txt
+
+expecting success of 0027.307 'compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 307 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt
+
+expecting success of 0027.308 'compare_files LF NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 308 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.309 'compare_files LF_mix_CR NNO_attr_text_aeol_lf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 309 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_true_LF_mix_CR.txt
+
+expecting success of 0027.310 'compare_files LF_nul NNO_attr_text_aeol_lf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 310 - compare_files LF_nul NNO_attr_text_aeol_lf_true_CRLF_nul.txt
+
+expecting success of 0027.311 'compare_files LF NNO_attr_text_aeol_crlf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 311 - compare_files LF NNO_attr_text_aeol_crlf_true_LF.txt
+
+expecting success of 0027.312 'compare_files LF NNO_attr_text_aeol_crlf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 312 - compare_files LF NNO_attr_text_aeol_crlf_true_CRLF.txt
+
+expecting success of 0027.313 'compare_files LF NNO_attr_text_aeol_crlf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 313 - compare_files LF NNO_attr_text_aeol_crlf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.314 'compare_files LF_mix_CR NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 314 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt
+
+expecting success of 0027.315 'compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 315 - compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt
+
+expecting success of 0027.316 'compare_files LF NNO_attr__aeol__false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 316 - compare_files LF NNO_attr__aeol__false_LF.txt
+
+expecting success of 0027.317 'compare_files CRLF NNO_attr__aeol__false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 317 - compare_files CRLF NNO_attr__aeol__false_CRLF.txt
+
+expecting success of 0027.318 'compare_files CRLF_mix_LF NNO_attr__aeol__false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 318 - compare_files CRLF_mix_LF NNO_attr__aeol__false_CRLF_mix_LF.txt
+
+expecting success of 0027.319 'compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 319 - compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt
+
+expecting success of 0027.320 'compare_files CRLF_nul NNO_attr__aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 320 - compare_files CRLF_nul NNO_attr__aeol__false_CRLF_nul.txt
+
+expecting success of 0027.321 'compare_files LF NNO_attr_-text_aeol__false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 321 - compare_files LF NNO_attr_-text_aeol__false_LF.txt
+
+expecting success of 0027.322 'compare_files CRLF NNO_attr_-text_aeol__false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 322 - compare_files CRLF NNO_attr_-text_aeol__false_CRLF.txt
+
+expecting success of 0027.323 'compare_files CRLF_mix_LF NNO_attr_-text_aeol__false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 323 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__false_CRLF_mix_LF.txt
+
+expecting success of 0027.324 'compare_files LF_mix_CR NNO_attr_-text_aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 324 - compare_files LF_mix_CR NNO_attr_-text_aeol__false_LF_mix_CR.txt
+
+expecting success of 0027.325 'compare_files CRLF_nul NNO_attr_-text_aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 325 - compare_files CRLF_nul NNO_attr_-text_aeol__false_CRLF_nul.txt
+
+expecting success of 0027.326 'compare_files LF NNO_attr_-text_aeol_lf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 326 - compare_files LF NNO_attr_-text_aeol_lf_false_LF.txt
+
+expecting success of 0027.327 'compare_files CRLF NNO_attr_-text_aeol_lf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 327 - compare_files CRLF NNO_attr_-text_aeol_lf_false_CRLF.txt
+
+expecting success of 0027.328 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 328 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.329 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 329 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt
+
+expecting success of 0027.330 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 330 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_false_CRLF_nul.txt
+
+expecting success of 0027.331 'compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 331 - compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt
+
+expecting success of 0027.332 'compare_files CRLF NNO_attr_-text_aeol_crlf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 332 - compare_files CRLF NNO_attr_-text_aeol_crlf_false_CRLF.txt
+
+expecting success of 0027.333 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 333 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.334 'compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 334 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_false_LF_mix_CR.txt
+
+expecting success of 0027.335 'compare_files CRLF_nul NNO_attr_-text_aeol_crlf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 335 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_false_CRLF_nul.txt
+
+expecting success of 0027.336 'compare_files LF NNO_attr_auto_aeol__false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 336 - compare_files LF NNO_attr_auto_aeol__false_LF.txt
+
+expecting success of 0027.337 'compare_files CRLF NNO_attr_auto_aeol__false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 337 - compare_files CRLF NNO_attr_auto_aeol__false_CRLF.txt
+
+expecting success of 0027.338 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 338 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__false_CRLF_mix_LF.txt
+
+expecting success of 0027.339 'compare_files LF_mix_CR NNO_attr_auto_aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 339 - compare_files LF_mix_CR NNO_attr_auto_aeol__false_LF_mix_CR.txt
+
+expecting success of 0027.340 'compare_files CRLF_nul NNO_attr_auto_aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 340 - compare_files CRLF_nul NNO_attr_auto_aeol__false_CRLF_nul.txt
+
+expecting success of 0027.341 'compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 341 - compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt
+
+expecting success of 0027.342 'compare_files CRLF NNO_attr_auto_aeol_lf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 342 - compare_files CRLF NNO_attr_auto_aeol_lf_false_CRLF.txt
+
+expecting success of 0027.343 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 343 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.344 'compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 344 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt
+
+expecting success of 0027.345 'compare_files CRLF_nul NNO_attr_auto_aeol_lf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 345 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_false_CRLF_nul.txt
+
+expecting success of 0027.346 'compare_files LF NNO_attr_auto_aeol_crlf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 346 - compare_files LF NNO_attr_auto_aeol_crlf_false_LF.txt
+
+expecting success of 0027.347 'compare_files CRLF NNO_attr_auto_aeol_crlf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 347 - compare_files CRLF NNO_attr_auto_aeol_crlf_false_CRLF.txt
+
+expecting success of 0027.348 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 348 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.349 'compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 349 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_false_LF_mix_CR.txt
+
+expecting success of 0027.350 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 350 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt
+
+expecting success of 0027.351 'compare_files LF NNO_attr_text_aeol__false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 351 - compare_files LF NNO_attr_text_aeol__false_LF.txt
+
+expecting success of 0027.352 'compare_files LF NNO_attr_text_aeol__false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 352 - compare_files LF NNO_attr_text_aeol__false_CRLF.txt
+
+expecting success of 0027.353 'compare_files LF NNO_attr_text_aeol__false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 353 - compare_files LF NNO_attr_text_aeol__false_CRLF_mix_LF.txt
+
+expecting success of 0027.354 'compare_files LF_mix_CR NNO_attr_text_aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 354 - compare_files LF_mix_CR NNO_attr_text_aeol__false_LF_mix_CR.txt
+
+expecting success of 0027.355 'compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 355 - compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt
+
+expecting success of 0027.356 'compare_files LF NNO_attr_text_aeol_lf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 356 - compare_files LF NNO_attr_text_aeol_lf_false_LF.txt
+
+expecting success of 0027.357 'compare_files LF NNO_attr_text_aeol_lf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 357 - compare_files LF NNO_attr_text_aeol_lf_false_CRLF.txt
+
+expecting success of 0027.358 'compare_files LF NNO_attr_text_aeol_lf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 358 - compare_files LF NNO_attr_text_aeol_lf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.359 'compare_files LF_mix_CR NNO_attr_text_aeol_lf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 359 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_false_LF_mix_CR.txt
+
+expecting success of 0027.360 'compare_files LF_nul NNO_attr_text_aeol_lf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 360 - compare_files LF_nul NNO_attr_text_aeol_lf_false_CRLF_nul.txt
+
+expecting success of 0027.361 'compare_files LF NNO_attr_text_aeol_crlf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 361 - compare_files LF NNO_attr_text_aeol_crlf_false_LF.txt
+
+expecting success of 0027.362 'compare_files LF NNO_attr_text_aeol_crlf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 362 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF.txt
+
+expecting success of 0027.363 'compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 363 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.364 'compare_files LF_mix_CR NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 364 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt
+
+expecting success of 0027.365 'compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 365 - compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt
+
+expecting success of 0027.366 'compare_files LF NNO_attr__aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 366 - compare_files LF NNO_attr__aeol__input_LF.txt
+
+expecting success of 0027.367 'compare_files CRLF NNO_attr__aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 367 - compare_files CRLF NNO_attr__aeol__input_CRLF.txt
+
+expecting success of 0027.368 'compare_files CRLF_mix_LF NNO_attr__aeol__input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 368 - compare_files CRLF_mix_LF NNO_attr__aeol__input_CRLF_mix_LF.txt
+
+expecting success of 0027.369 'compare_files LF_mix_CR NNO_attr__aeol__input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 369 - compare_files LF_mix_CR NNO_attr__aeol__input_LF_mix_CR.txt
+
+expecting success of 0027.370 'compare_files CRLF_nul NNO_attr__aeol__input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 370 - compare_files CRLF_nul NNO_attr__aeol__input_CRLF_nul.txt
+
+expecting success of 0027.371 'compare_files LF NNO_attr_-text_aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 371 - compare_files LF NNO_attr_-text_aeol__input_LF.txt
+
+expecting success of 0027.372 'compare_files CRLF NNO_attr_-text_aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 372 - compare_files CRLF NNO_attr_-text_aeol__input_CRLF.txt
+
+expecting success of 0027.373 'compare_files CRLF_mix_LF NNO_attr_-text_aeol__input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 373 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__input_CRLF_mix_LF.txt
+
+expecting success of 0027.374 'compare_files LF_mix_CR NNO_attr_-text_aeol__input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 374 - compare_files LF_mix_CR NNO_attr_-text_aeol__input_LF_mix_CR.txt
+
+expecting success of 0027.375 'compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 375 - compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt
+
+expecting success of 0027.376 'compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 376 - compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt
+
+expecting success of 0027.377 'compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 377 - compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt
+
+expecting success of 0027.378 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 378 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.379 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 379 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt
+
+expecting success of 0027.380 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 380 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt
+
+expecting success of 0027.381 'compare_files LF NNO_attr_-text_aeol_crlf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 381 - compare_files LF NNO_attr_-text_aeol_crlf_input_LF.txt
+
+expecting success of 0027.382 'compare_files CRLF NNO_attr_-text_aeol_crlf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 382 - compare_files CRLF NNO_attr_-text_aeol_crlf_input_CRLF.txt
+
+expecting success of 0027.383 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 383 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.384 'compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 384 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt
+
+expecting success of 0027.385 'compare_files CRLF_nul NNO_attr_-text_aeol_crlf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 385 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_input_CRLF_nul.txt
+
+expecting success of 0027.386 'compare_files LF NNO_attr_auto_aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 386 - compare_files LF NNO_attr_auto_aeol__input_LF.txt
+
+expecting success of 0027.387 'compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 387 - compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt
+
+expecting success of 0027.388 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 388 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt
+
+expecting success of 0027.389 'compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 389 - compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt
+
+expecting success of 0027.390 'compare_files CRLF_nul NNO_attr_auto_aeol__input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 390 - compare_files CRLF_nul NNO_attr_auto_aeol__input_CRLF_nul.txt
+
+expecting success of 0027.391 'compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 391 - compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt
+
+expecting success of 0027.392 'compare_files CRLF NNO_attr_auto_aeol_lf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 392 - compare_files CRLF NNO_attr_auto_aeol_lf_input_CRLF.txt
+
+expecting success of 0027.393 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 393 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.394 'compare_files LF_mix_CR NNO_attr_auto_aeol_lf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 394 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_input_LF_mix_CR.txt
+
+expecting success of 0027.395 'compare_files CRLF_nul NNO_attr_auto_aeol_lf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 395 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_input_CRLF_nul.txt
+
+expecting success of 0027.396 'compare_files LF NNO_attr_auto_aeol_crlf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 396 - compare_files LF NNO_attr_auto_aeol_crlf_input_LF.txt
+
+expecting success of 0027.397 'compare_files CRLF NNO_attr_auto_aeol_crlf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 397 - compare_files CRLF NNO_attr_auto_aeol_crlf_input_CRLF.txt
+
+expecting success of 0027.398 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 398 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.399 'compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 399 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt
+
+expecting success of 0027.400 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 400 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt
+
+expecting success of 0027.401 'compare_files LF NNO_attr_text_aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 401 - compare_files LF NNO_attr_text_aeol__input_LF.txt
+
+expecting success of 0027.402 'compare_files LF NNO_attr_text_aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 402 - compare_files LF NNO_attr_text_aeol__input_CRLF.txt
+
+expecting success of 0027.403 'compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 403 - compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt
+
+expecting success of 0027.404 'compare_files LF_mix_CR NNO_attr_text_aeol__input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 404 - compare_files LF_mix_CR NNO_attr_text_aeol__input_LF_mix_CR.txt
+
+expecting success of 0027.405 'compare_files LF_nul NNO_attr_text_aeol__input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 405 - compare_files LF_nul NNO_attr_text_aeol__input_CRLF_nul.txt
+
+expecting success of 0027.406 'compare_files LF NNO_attr_text_aeol_lf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 406 - compare_files LF NNO_attr_text_aeol_lf_input_LF.txt
+
+expecting success of 0027.407 'compare_files LF NNO_attr_text_aeol_lf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 407 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF.txt
+
+expecting success of 0027.408 'compare_files LF NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 408 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.409 'compare_files LF_mix_CR NNO_attr_text_aeol_lf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 409 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_input_LF_mix_CR.txt
+
+expecting success of 0027.410 'compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 410 - compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt
+
+expecting success of 0027.411 'compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 411 - compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt
+
+expecting success of 0027.412 'compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 412 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt
+
+expecting success of 0027.413 'compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 413 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.414 'compare_files LF_mix_CR NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 414 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt
+
+expecting success of 0027.415 'compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 415 - compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt
+
+expecting success of 0027.416 'setup config for checkout attr=-text ident= aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 416 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
+
+expecting success of 0027.417 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1077 - setup LF checkout  with -c core.eol=native
+ok 417 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1078 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.418 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1078 - setup CRLF checkout  with -c core.eol=native
+ok 418 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1079 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.419 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1079 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 419 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1080 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.420 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1080 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 420 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1081 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.421 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1081 - setup LF_nul checkout  with -c core.eol=native
+ok 421 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1082 'ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=native': 
+expecting success of 0027.422 'ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -179409,70 +176013,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1082 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=native
+ok 422 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=lf
 
-expecting success of 0027.1083 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.423 'checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1083 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 423 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1084 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.424 'checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1084 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 424 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1085 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.425 'checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1085 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 425 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1086 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.426 'checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1086 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 426 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1087 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.427 'checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1087 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+ok 427 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1088 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true': 
+expecting success of 0027.428 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1088 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
+ok 428 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1089 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.429 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1089 - setup LF checkout  with -c core.eol=native
+ok 429 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1090 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.430 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1090 - setup CRLF checkout  with -c core.eol=native
+ok 430 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1091 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.431 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1091 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 431 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1092 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.432 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1092 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 432 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1093 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.433 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1093 - setup LF_nul checkout  with -c core.eol=native
+ok 433 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1094 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=native': 
+expecting success of 0027.434 'ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -179487,70 +176091,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1094 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=native
+ok 434 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.1095 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.435 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1095 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 435 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1096 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.436 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1096 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 436 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1097 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.437 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1097 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 437 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1098 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.438 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1098 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 438 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1099 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.439 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1099 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+ok 439 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1100 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=true': 
+expecting success of 0027.440 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1100 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
+ok 440 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1101 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.441 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1101 - setup LF checkout  with -c core.eol=native
+ok 441 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1102 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.442 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1102 - setup CRLF checkout  with -c core.eol=native
+ok 442 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1103 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.443 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1103 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 443 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1104 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.444 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1104 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 444 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1105 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.445 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1105 - setup LF_nul checkout  with -c core.eol=native
+ok 445 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1106 'ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=native': 
+expecting success of 0027.446 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -179565,70 +176169,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1106 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=native
+ok 446 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.1107 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.447 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1107 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 447 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1108 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.448 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1108 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 448 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1109 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.449 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1109 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 449 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1110 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.450 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1110 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 450 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1111 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.451 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1111 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+ok 451 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1112 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true': 
+expecting success of 0027.452 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1112 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
+ok 452 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1113 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.453 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1113 - setup LF checkout  with -c core.eol=native
+ok 453 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1114 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.454 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1114 - setup CRLF checkout  with -c core.eol=native
+ok 454 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1115 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.455 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1115 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 455 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1116 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.456 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1116 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 456 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1117 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.457 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1117 - setup LF_nul checkout  with -c core.eol=native
+ok 457 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1118 'ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=native': 
+expecting success of 0027.458 'ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -179643,70 +176247,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1118 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=native
+ok 458 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.1119 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.459 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1119 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 459 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1120 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.460 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1120 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 460 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1121 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.461 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1121 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 461 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1122 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.462 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1122 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 462 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1123 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.463 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1123 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+ok 463 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1124 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true': 
+expecting success of 0027.464 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1124 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
+ok 464 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1125 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.465 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1125 - setup LF checkout  with -c core.eol=native
+ok 465 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1126 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.466 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1126 - setup CRLF checkout  with -c core.eol=native
+ok 466 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1127 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.467 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1127 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 467 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1128 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.468 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1128 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 468 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1129 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.469 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1129 - setup LF_nul checkout  with -c core.eol=native
+ok 469 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1130 'ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=native': 
+expecting success of 0027.470 'ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -179721,70 +176325,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1130 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=native
+ok 470 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.1131 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.471 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1131 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 471 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1132 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.472 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1132 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 472 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1133 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.473 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1133 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 473 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1134 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.474 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1134 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 474 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1135 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.475 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1135 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+ok 475 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1136 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true': 
+expecting success of 0027.476 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1136 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
+ok 476 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1137 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.477 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1137 - setup LF checkout  with -c core.eol=native
+ok 477 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1138 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.478 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1138 - setup CRLF checkout  with -c core.eol=native
+ok 478 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1139 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.479 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1139 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 479 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1140 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.480 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1140 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 480 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1141 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.481 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1141 - setup LF_nul checkout  with -c core.eol=native
+ok 481 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1142 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=native': 
+expecting success of 0027.482 'ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -179799,70 +176403,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1142 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=native
+ok 482 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.1143 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.483 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1143 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 483 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1144 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.484 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1144 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 484 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1145 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.485 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1145 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 485 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1146 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.486 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1146 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 486 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1147 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.487 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1147 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+ok 487 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1148 'setup config for checkout attr=-text ident= aeol= core.autocrlf=false': 
+expecting success of 0027.488 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1148 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
+ok 488 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1149 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.489 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1149 - setup LF checkout  with -c core.eol=native
+ok 489 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1150 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.490 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1150 - setup CRLF checkout  with -c core.eol=native
+ok 490 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1151 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.491 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1151 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 491 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1152 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.492 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1152 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 492 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1153 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.493 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1153 - setup LF_nul checkout  with -c core.eol=native
+ok 493 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1154 'ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=native': 
+expecting success of 0027.494 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -179877,70 +176481,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1154 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=native
+ok 494 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.1155 'checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.495 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1155 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF
+ok 495 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1156 'checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.496 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1156 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 496 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1157 'checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.497 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1157 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 497 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1158 'checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.498 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1158 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 498 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1159 'checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.499 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1159 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 499 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1160 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false': 
+expecting success of 0027.500 'setup config for checkout attr=-text ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1160 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
+ok 500 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.1161 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.501 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1161 - setup LF checkout  with -c core.eol=native
+ok 501 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1162 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.502 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1162 - setup CRLF checkout  with -c core.eol=native
+ok 502 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1163 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.503 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1163 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 503 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1164 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.504 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1164 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 504 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1165 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.505 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1165 - setup LF_nul checkout  with -c core.eol=native
+ok 505 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1166 'ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=native': 
+expecting success of 0027.506 'ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -179955,70 +176559,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1166 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=native
+ok 506 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=lf
 
-expecting success of 0027.1167 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.507 'checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1167 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF
+ok 507 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1168 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.508 'checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1168 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 508 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1169 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.509 'checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1169 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 509 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1170 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.510 'checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1170 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 510 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1171 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.511 'checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1171 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+ok 511 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1172 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false': 
+expecting success of 0027.512 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1172 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
+ok 512 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1173 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.513 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1173 - setup LF checkout  with -c core.eol=native
+ok 513 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1174 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.514 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1174 - setup CRLF checkout  with -c core.eol=native
+ok 514 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1175 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.515 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1175 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 515 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1176 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.516 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1176 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 516 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1177 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.517 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1177 - setup LF_nul checkout  with -c core.eol=native
+ok 517 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1178 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=native': 
+expecting success of 0027.518 'ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180033,70 +176637,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1178 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=native
+ok 518 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.1179 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.519 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1179 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 519 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1180 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.520 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1180 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 520 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1181 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.521 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1181 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 521 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1182 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.522 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1182 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 522 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1183 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.523 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1183 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+ok 523 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1184 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=false': 
+expecting success of 0027.524 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1184 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
+ok 524 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1185 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.525 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1185 - setup LF checkout  with -c core.eol=native
+ok 525 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1186 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.526 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1186 - setup CRLF checkout  with -c core.eol=native
+ok 526 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1187 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.527 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1187 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 527 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1188 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.528 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1188 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 528 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1189 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.529 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1189 - setup LF_nul checkout  with -c core.eol=native
+ok 529 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1190 'ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=native': 
+expecting success of 0027.530 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180111,70 +176715,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1190 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=native
+ok 530 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.1191 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.531 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1191 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF
+ok 531 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1192 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.532 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1192 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 532 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1193 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.533 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1193 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 533 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1194 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.534 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1194 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 534 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1195 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.535 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1195 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+ok 535 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1196 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false': 
+expecting success of 0027.536 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1196 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
+ok 536 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1197 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.537 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1197 - setup LF checkout  with -c core.eol=native
+ok 537 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1198 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.538 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1198 - setup CRLF checkout  with -c core.eol=native
+ok 538 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1199 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.539 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1199 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 539 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1200 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.540 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1200 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 540 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1201 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.541 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1201 - setup LF_nul checkout  with -c core.eol=native
+ok 541 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1202 'ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=native': 
+expecting success of 0027.542 'ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180189,70 +176793,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1202 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=native
+ok 542 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.1203 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.543 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1203 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 543 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1204 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.544 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1204 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 544 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1205 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.545 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1205 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 545 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1206 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.546 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1206 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 546 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1207 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.547 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1207 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+ok 547 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1208 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false': 
+expecting success of 0027.548 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1208 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
+ok 548 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1209 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.549 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1209 - setup LF checkout  with -c core.eol=native
+ok 549 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1210 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.550 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1210 - setup CRLF checkout  with -c core.eol=native
+ok 550 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1211 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.551 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1211 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 551 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1212 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.552 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1212 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 552 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1213 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.553 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1213 - setup LF_nul checkout  with -c core.eol=native
+ok 553 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1214 'ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=native': 
+expecting success of 0027.554 'ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180267,70 +176871,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1214 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=native
+ok 554 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.1215 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.555 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1215 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF
+ok 555 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1216 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.556 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1216 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 556 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1217 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.557 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1217 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 557 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1218 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.558 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1218 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 558 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1219 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.559 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1219 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+ok 559 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1220 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false': 
+expecting success of 0027.560 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1220 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
+ok 560 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1221 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.561 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1221 - setup LF checkout  with -c core.eol=native
+ok 561 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1222 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.562 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1222 - setup CRLF checkout  with -c core.eol=native
+ok 562 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1223 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.563 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1223 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 563 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1224 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.564 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1224 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 564 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1225 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.565 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1225 - setup LF_nul checkout  with -c core.eol=native
+ok 565 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1226 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=native': 
+expecting success of 0027.566 'ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180345,70 +176949,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1226 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=native
+ok 566 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.1227 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.567 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1227 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 567 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1228 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.568 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1228 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 568 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1229 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.569 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1229 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 569 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1230 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.570 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1230 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 570 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1231 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.571 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1231 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+ok 571 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1232 'setup config for checkout attr=-text ident= aeol= core.autocrlf=input': 
+expecting success of 0027.572 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1232 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
+ok 572 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1233 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.573 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1233 - setup LF checkout  with -c core.eol=native
+ok 573 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1234 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.574 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1234 - setup CRLF checkout  with -c core.eol=native
+ok 574 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1235 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.575 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1235 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 575 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1236 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.576 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1236 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 576 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1237 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.577 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1237 - setup LF_nul checkout  with -c core.eol=native
+ok 577 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1238 'ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=native': 
+expecting success of 0027.578 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180423,70 +177027,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1238 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=native
+ok 578 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.1239 'checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.579 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1239 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF
+ok 579 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1240 'checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.580 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1240 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 580 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1241 'checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.581 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1241 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 581 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1242 'checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.582 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1242 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 582 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1243 'checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.583 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1243 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_nul
+ok 583 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1244 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input': 
+expecting success of 0027.584 'setup config for checkout attr=-text ident= aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1244 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
+ok 584 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.1245 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.585 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1245 - setup LF checkout  with -c core.eol=native
+ok 585 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1246 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.586 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1246 - setup CRLF checkout  with -c core.eol=native
+ok 586 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1247 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.587 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1247 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 587 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1248 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.588 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1248 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 588 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1249 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.589 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1249 - setup LF_nul checkout  with -c core.eol=native
+ok 589 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1250 'ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=native': 
+expecting success of 0027.590 'ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180501,70 +177105,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1250 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=native
+ok 590 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=lf
 
-expecting success of 0027.1251 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.591 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1251 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 591 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.1252 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.592 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1252 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 592 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.1253 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.593 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1253 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 593 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1254 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.594 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1254 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 594 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1255 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.595 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1255 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+ok 595 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.1256 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input': 
+expecting success of 0027.596 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1256 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
+ok 596 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.1257 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.597 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1257 - setup LF checkout  with -c core.eol=native
+ok 597 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1258 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.598 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1258 - setup CRLF checkout  with -c core.eol=native
+ok 598 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1259 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.599 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1259 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 599 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1260 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.600 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1260 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 600 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1261 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.601 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1261 - setup LF_nul checkout  with -c core.eol=native
+ok 601 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1262 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=native': 
+expecting success of 0027.602 'ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180579,70 +177183,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1262 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=native
+ok 602 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.1263 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.603 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1263 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 603 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.1264 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.604 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1264 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 604 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.1265 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.605 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1265 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 605 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1266 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.606 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1266 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 606 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1267 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.607 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1267 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+ok 607 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.1268 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=input': 
+expecting success of 0027.608 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1268 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
+ok 608 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.1269 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.609 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1269 - setup LF checkout  with -c core.eol=native
+ok 609 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1270 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.610 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1270 - setup CRLF checkout  with -c core.eol=native
+ok 610 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1271 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.611 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1271 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 611 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1272 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.612 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1272 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 612 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1273 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.613 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1273 - setup LF_nul checkout  with -c core.eol=native
+ok 613 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1274 'ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=native': 
+expecting success of 0027.614 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180657,70 +177261,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1274 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=native
+ok 614 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.1275 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.615 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1275 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 615 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.1276 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.616 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1276 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 616 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.1277 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.617 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1277 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 617 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1278 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.618 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1278 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 618 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1279 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.619 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1279 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+ok 619 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.1280 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input': 
+expecting success of 0027.620 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1280 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
+ok 620 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.1281 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.621 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1281 - setup LF checkout  with -c core.eol=native
+ok 621 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1282 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.622 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1282 - setup CRLF checkout  with -c core.eol=native
+ok 622 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1283 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.623 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1283 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 623 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1284 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.624 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1284 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 624 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1285 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.625 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1285 - setup LF_nul checkout  with -c core.eol=native
+ok 625 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1286 'ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=native': 
+expecting success of 0027.626 'ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180735,70 +177339,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1286 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=native
+ok 626 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.1287 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.627 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1287 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 627 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.1288 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.628 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1288 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 628 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.1289 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.629 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1289 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 629 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1290 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.630 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1290 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 630 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1291 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.631 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1291 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+ok 631 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.1292 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input': 
+expecting success of 0027.632 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1292 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
+ok 632 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.1293 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.633 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1293 - setup LF checkout  with -c core.eol=native
+ok 633 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1294 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.634 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1294 - setup CRLF checkout  with -c core.eol=native
+ok 634 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1295 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.635 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1295 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 635 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1296 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.636 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1296 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 636 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1297 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.637 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1297 - setup LF_nul checkout  with -c core.eol=native
+ok 637 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1298 'ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=native': 
+expecting success of 0027.638 'ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180813,70 +177417,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1298 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=native
+ok 638 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.1299 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.639 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1299 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 639 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.1300 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.640 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1300 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 640 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.1301 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.641 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1301 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 641 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1302 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.642 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1302 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 642 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1303 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.643 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1303 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+ok 643 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.1304 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input': 
+expecting success of 0027.644 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1304 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
+ok 644 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.1305 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.645 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1305 - setup LF checkout  with -c core.eol=native
+ok 645 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1306 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.646 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1306 - setup CRLF checkout  with -c core.eol=native
+ok 646 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1307 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.647 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1307 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 647 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1308 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.648 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1308 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 648 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1309 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.649 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1309 - setup LF_nul checkout  with -c core.eol=native
+ok 649 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1310 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=native': 
+expecting success of 0027.650 'ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180891,70 +177495,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1310 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=native
+ok 650 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.1311 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.651 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1311 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 651 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.1312 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.652 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1312 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 652 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.1313 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.653 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1313 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 653 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1314 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.654 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1314 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 654 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1315 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.655 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1315 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+ok 655 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.1316 'setup config for checkout attr= ident= aeol= core.autocrlf=false': 
+expecting success of 0027.656 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1316 - setup config for checkout attr= ident= aeol= core.autocrlf=false
+ok 656 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.1317 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.657 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1317 - setup LF checkout  with -c core.eol=native
+ok 657 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1318 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.658 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1318 - setup CRLF checkout  with -c core.eol=native
+ok 658 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1319 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.659 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1319 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 659 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1320 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.660 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1320 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 660 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1321 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.661 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1321 - setup LF_nul checkout  with -c core.eol=native
+ok 661 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1322 'ls-files --eol attr=  aeol= core.autocrlf=false core.eol=native': 
+expecting success of 0027.662 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -180969,70 +177573,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1322 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=native
+ok 662 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.1323 'checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+expecting success of 0027.663 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1323 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF
+ok 663 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.1324 'checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.664 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1324 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 664 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.1325 'checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.665 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1325 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 665 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1326 'checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.666 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1326 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 666 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1327 'checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.667 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1327 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 667 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.1328 'setup config for checkout attr= ident= aeol= core.autocrlf=true': 
+expecting success of 0027.668 'setup config for checkout attr= ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1328 - setup config for checkout attr= ident= aeol= core.autocrlf=true
+ok 668 - setup config for checkout attr= ident= aeol= core.autocrlf=false
 
-expecting success of 0027.1329 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.669 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1329 - setup LF checkout  with -c core.eol=native
+ok 669 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1330 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.670 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1330 - setup CRLF checkout  with -c core.eol=native
+ok 670 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1331 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.671 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1331 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 671 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1332 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.672 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1332 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 672 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1333 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.673 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1333 - setup LF_nul checkout  with -c core.eol=native
+ok 673 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1334 'ls-files --eol attr=  aeol= core.autocrlf=true core.eol=native': 
+expecting success of 0027.674 'ls-files --eol attr=  aeol= core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181047,70 +177651,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1334 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=native
+ok 674 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=lf
 
-expecting success of 0027.1335 'checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.675 'checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
 	
-ok 1335 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF
+ok 675 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1336 'checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.676 'checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1336 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 676 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1337 'checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.677 'checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1337 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 677 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1338 'checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.678 'checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1338 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 678 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1339 'checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.679 'checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1339 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 679 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1340 'setup config for checkout attr=auto ident= aeol= core.autocrlf=true': 
+expecting success of 0027.680 'setup config for checkout attr= ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1340 - setup config for checkout attr=auto ident= aeol= core.autocrlf=true
+ok 680 - setup config for checkout attr= ident= aeol= core.autocrlf=true
 
-expecting success of 0027.1341 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.681 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1341 - setup LF checkout  with -c core.eol=native
+ok 681 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1342 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.682 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1342 - setup CRLF checkout  with -c core.eol=native
+ok 682 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1343 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.683 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1343 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 683 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1344 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.684 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1344 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 684 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1345 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.685 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1345 - setup LF_nul checkout  with -c core.eol=native
+ok 685 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1346 'ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=native': 
+expecting success of 0027.686 'ls-files --eol attr=  aeol= core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181125,70 +177729,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1346 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=native
+ok 686 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=lf
 
-expecting success of 0027.1347 'checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.687 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
 	
-ok 1347 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF
+ok 687 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1348 'checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.688 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1348 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 688 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1349 'checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.689 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1349 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 689 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1350 'checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.690 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1350 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 690 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1351 'checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.691 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1351 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 691 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1352 'setup config for checkout attr=text ident= aeol= core.autocrlf=true': 
+expecting success of 0027.692 'setup config for checkout attr=auto ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1352 - setup config for checkout attr=text ident= aeol= core.autocrlf=true
+ok 692 - setup config for checkout attr=auto ident= aeol= core.autocrlf=true
 
-expecting success of 0027.1353 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.693 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1353 - setup LF checkout  with -c core.eol=native
+ok 693 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1354 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.694 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1354 - setup CRLF checkout  with -c core.eol=native
+ok 694 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1355 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.695 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1355 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 695 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1356 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.696 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1356 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 696 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1357 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.697 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1357 - setup LF_nul checkout  with -c core.eol=native
+ok 697 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1358 'ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=native': 
+expecting success of 0027.698 'ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181203,70 +177807,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1358 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=native
+ok 698 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=lf
 
-expecting success of 0027.1359 'checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.699 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1359 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF
+ok 699 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1360 'checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.700 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1360 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 700 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1361 'checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.701 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1361 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 701 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1362 'checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.702 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1362 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 702 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1363 'checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.703 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1363 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 703 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1364 'setup config for checkout attr=text ident= aeol= core.autocrlf=input': 
+expecting success of 0027.704 'setup config for checkout attr=text ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1364 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
+ok 704 - setup config for checkout attr=text ident= aeol= core.autocrlf=true
 
-expecting success of 0027.1365 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.705 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1365 - setup LF checkout  with -c core.eol=native
+ok 705 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1366 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.706 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1366 - setup CRLF checkout  with -c core.eol=native
+ok 706 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1367 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.707 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1367 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 707 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1368 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.708 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1368 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 708 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1369 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.709 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1369 - setup LF_nul checkout  with -c core.eol=native
+ok 709 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1370 'ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=native': 
+expecting success of 0027.710 'ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181281,70 +177885,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1370 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=native
+ok 710 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=lf
 
-expecting success of 0027.1371 'checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.711 'checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1371 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF
+ok 711 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1372 'checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.712 'checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1372 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 712 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1373 'checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.713 'checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1373 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 713 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1374 'checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.714 'checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1374 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 714 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1375 'checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.715 'checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1375 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_nul
+ok 715 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1376 'setup config for checkout attr=auto ident= aeol= core.autocrlf=input': 
+expecting success of 0027.716 'setup config for checkout attr=text ident= aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1376 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
+ok 716 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.1377 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.717 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1377 - setup LF checkout  with -c core.eol=native
+ok 717 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1378 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.718 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1378 - setup CRLF checkout  with -c core.eol=native
+ok 718 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1379 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.719 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1379 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 719 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1380 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.720 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1380 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 720 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1381 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.721 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1381 - setup LF_nul checkout  with -c core.eol=native
+ok 721 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1382 'ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=native': 
+expecting success of 0027.722 'ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181359,70 +177963,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1382 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=native
+ok 722 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=lf
 
-expecting success of 0027.1383 'checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.723 'checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1383 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF
+ok 723 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.1384 'checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.724 'checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1384 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 724 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.1385 'checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.725 'checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1385 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 725 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1386 'checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.726 'checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1386 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 726 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1387 'checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.727 'checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1387 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_nul
+ok 727 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.1388 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
+expecting success of 0027.728 'setup config for checkout attr=auto ident= aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1388 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
+ok 728 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
 
-expecting success of 0027.1389 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.729 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1389 - setup LF checkout  with -c core.eol=crlf
+ok 729 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1390 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.730 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1390 - setup CRLF checkout  with -c core.eol=crlf
+ok 730 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1391 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.731 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1391 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 731 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1392 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.732 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1392 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 732 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1393 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.733 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1393 - setup LF_nul checkout  with -c core.eol=crlf
+ok 733 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1394 'ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=crlf': 
+expecting success of 0027.734 'ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181437,70 +178041,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1394 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=crlf
+ok 734 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=lf
 
-expecting success of 0027.1395 'checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.735 'checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1395 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 735 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.1396 'checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.736 'checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1396 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 736 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.1397 'checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.737 'checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1397 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 737 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1398 'checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.738 'checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1398 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 738 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1399 'checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.739 'checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1399 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 739 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.1400 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
+expecting success of 0027.740 'setup config for checkout attr=-text ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1400 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
+ok 740 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
 
-expecting success of 0027.1401 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.741 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1401 - setup LF checkout  with -c core.eol=lf
+ok 741 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1402 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.742 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1402 - setup CRLF checkout  with -c core.eol=lf
+ok 742 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1403 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.743 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1403 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 743 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1404 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.744 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1404 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 744 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1405 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.745 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1405 - setup LF_nul checkout  with -c core.eol=lf
+ok 745 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1406 'ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=lf': 
+expecting success of 0027.746 'ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181515,70 +178119,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1406 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=lf
+ok 746 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.1407 'checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.747 'checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1407 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF
+ok 747 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.1408 'checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.748 'checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1408 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF
+ok 748 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.1409 'checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.749 'checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1409 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 749 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1410 'checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.750 'checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1410 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 750 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1411 'checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.751 'checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1411 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
+ok 751 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.1412 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
+expecting success of 0027.752 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1412 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
+ok 752 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1413 'setup LF checkout ': 
+expecting success of 0027.753 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1413 - setup LF checkout 
+ok 753 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1414 'setup CRLF checkout ': 
+expecting success of 0027.754 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1414 - setup CRLF checkout 
+ok 754 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1415 'setup LF_mix_CR checkout ': 
+expecting success of 0027.755 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1415 - setup LF_mix_CR checkout 
+ok 755 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1416 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.756 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1416 - setup CRLF_mix_LF checkout 
+ok 756 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1417 'setup LF_nul checkout ': 
+expecting success of 0027.757 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1417 - setup LF_nul checkout 
+ok 757 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1418 'ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=': 
+expecting success of 0027.758 'ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181593,70 +178197,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1418 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=
+ok 758 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.1419 'checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF': 
-		compare_ws_file eol__crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.759 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1419 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF
+ok 759 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.1420 'checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.760 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1420 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF
+ok 760 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.1421 'checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.761 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1421 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 761 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1422 'checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.762 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1422 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+ok 762 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1423 'checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.763 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1423 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_nul
+ok 763 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.1424 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
+expecting success of 0027.764 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1424 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
+ok 764 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1425 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.765 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1425 - setup LF checkout  with -c core.eol=native
+ok 765 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1426 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.766 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1426 - setup CRLF checkout  with -c core.eol=native
+ok 766 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1427 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.767 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1427 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 767 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1428 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.768 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1428 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 768 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1429 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.769 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1429 - setup LF_nul checkout  with -c core.eol=native
+ok 769 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1430 'ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=native': 
+expecting success of 0027.770 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181671,70 +178275,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1430 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=native
+ok 770 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.1431 'checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.771 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1431 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF
+ok 771 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.1432 'checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.772 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1432 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 772 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.1433 'checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.773 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1433 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 773 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1434 'checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.774 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1434 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 774 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1435 'checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.775 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1435 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 775 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.1436 'setup config for checkout attr=auto ident= aeol= core.autocrlf=false': 
+expecting success of 0027.776 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1436 - setup config for checkout attr=auto ident= aeol= core.autocrlf=false
+ok 776 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1437 'setup LF checkout ': 
+expecting success of 0027.777 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1437 - setup LF checkout 
+ok 777 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1438 'setup CRLF checkout ': 
+expecting success of 0027.778 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1438 - setup CRLF checkout 
+ok 778 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1439 'setup LF_mix_CR checkout ': 
+expecting success of 0027.779 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1439 - setup LF_mix_CR checkout 
+ok 779 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1440 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.780 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1440 - setup CRLF_mix_LF checkout 
+ok 780 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1441 'setup LF_nul checkout ': 
+expecting success of 0027.781 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1441 - setup LF_nul checkout 
+ok 781 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1442 'ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=': 
+expecting success of 0027.782 'ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181749,70 +178353,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1442 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=
+ok 782 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.1443 'checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF': 
-		compare_ws_file eol__crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.783 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1443 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF
+ok 783 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.1444 'checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.784 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1444 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF
+ok 784 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.1445 'checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.785 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1445 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 785 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1446 'checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.786 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1446 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+ok 786 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1447 'checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.787 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1447 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_nul
+ok 787 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.1448 'setup config for checkout attr=auto ident= aeol= core.autocrlf=false': 
+expecting success of 0027.788 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1448 - setup config for checkout attr=auto ident= aeol= core.autocrlf=false
+ok 788 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1449 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.789 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1449 - setup LF checkout  with -c core.eol=native
+ok 789 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1450 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.790 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1450 - setup CRLF checkout  with -c core.eol=native
+ok 790 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1451 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.791 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1451 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 791 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1452 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.792 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1452 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 792 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1453 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.793 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1453 - setup LF_nul checkout  with -c core.eol=native
+ok 793 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1454 'ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=native': 
+expecting success of 0027.794 'ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181827,70 +178431,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1454 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=native
+ok 794 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.1455 'checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.795 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1455 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF
+ok 795 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.1456 'checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.796 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1456 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 796 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.1457 'checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.797 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1457 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 797 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1458 'checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.798 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1458 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 798 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1459 'checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.799 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1459 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 799 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.1460 'setup config for checkout attr= ident= aeol=lf core.autocrlf=false': 
+expecting success of 0027.800 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1460 - setup config for checkout attr= ident= aeol=lf core.autocrlf=false
+ok 800 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1461 'setup LF checkout ': 
+expecting success of 0027.801 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1461 - setup LF checkout 
+ok 801 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1462 'setup CRLF checkout ': 
+expecting success of 0027.802 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1462 - setup CRLF checkout 
+ok 802 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1463 'setup LF_mix_CR checkout ': 
+expecting success of 0027.803 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1463 - setup LF_mix_CR checkout 
+ok 803 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1464 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.804 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1464 - setup CRLF_mix_LF checkout 
+ok 804 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1465 'setup LF_nul checkout ': 
+expecting success of 0027.805 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1465 - setup LF_nul checkout 
+ok 805 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1466 'ls-files --eol attr=  aeol=lf core.autocrlf=false core.eol=': 
+expecting success of 0027.806 'ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181905,70 +178509,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1466 - ls-files --eol attr=  aeol=lf core.autocrlf=false core.eol=
+ok 806 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.1467 'checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF': 
-		compare_ws_file eol__crlf_false_attr__ LF    crlf_false_attr__LF.txt
+expecting success of 0027.807 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1467 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF
+ok 807 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.1468 'checkout attr=  aeol=lf core.autocrlf=false core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.808 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1468 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=CRLF
+ok 808 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.1469 'checkout attr=  aeol=lf core.autocrlf=false core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.809 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1469 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 809 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1470 'checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.810 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1470 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF_mix_CR
+ok 810 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1471 'checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.811 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1471 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF_nul
+ok 811 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.1472 'setup config for checkout attr= ident= aeol=crlf core.autocrlf=false': 
+expecting success of 0027.812 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1472 - setup config for checkout attr= ident= aeol=crlf core.autocrlf=false
+ok 812 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1473 'setup LF checkout ': 
+expecting success of 0027.813 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1473 - setup LF checkout 
+ok 813 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1474 'setup CRLF checkout ': 
+expecting success of 0027.814 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1474 - setup CRLF checkout 
+ok 814 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1475 'setup LF_mix_CR checkout ': 
+expecting success of 0027.815 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1475 - setup LF_mix_CR checkout 
+ok 815 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1476 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.816 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1476 - setup CRLF_mix_LF checkout 
+ok 816 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1477 'setup LF_nul checkout ': 
+expecting success of 0027.817 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1477 - setup LF_nul checkout 
+ok 817 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1478 'ls-files --eol attr=  aeol=crlf core.autocrlf=false core.eol=': 
+expecting success of 0027.818 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -181983,70 +178587,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1478 - ls-files --eol attr=  aeol=crlf core.autocrlf=false core.eol=
+ok 818 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.1479 'checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF': 
-		compare_ws_file eol__crlf_false_attr__ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.819 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1479 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF
+ok 819 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.1480 'checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.820 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1480 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=CRLF
+ok 820 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.1481 'checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_false_attr__ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.821 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1481 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 821 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1482 'checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_false_attr__ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.822 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1482 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF_mix_CR
+ok 822 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1483 'checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_false_attr__ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.823 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1483 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF_nul
+ok 823 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.1484 'setup config for checkout attr= ident= aeol=lf core.autocrlf=true': 
+expecting success of 0027.824 'setup config for checkout attr=-text ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1484 - setup config for checkout attr= ident= aeol=lf core.autocrlf=true
+ok 824 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.1485 'setup LF checkout ': 
+expecting success of 0027.825 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1485 - setup LF checkout 
+ok 825 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1486 'setup CRLF checkout ': 
+expecting success of 0027.826 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1486 - setup CRLF checkout 
+ok 826 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1487 'setup LF_mix_CR checkout ': 
+expecting success of 0027.827 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1487 - setup LF_mix_CR checkout 
+ok 827 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1488 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.828 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1488 - setup CRLF_mix_LF checkout 
+ok 828 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1489 'setup LF_nul checkout ': 
+expecting success of 0027.829 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1489 - setup LF_nul checkout 
+ok 829 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1490 'ls-files --eol attr=  aeol=lf core.autocrlf=true core.eol=': 
+expecting success of 0027.830 'ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182061,70 +178665,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1490 - ls-files --eol attr=  aeol=lf core.autocrlf=true core.eol=
+ok 830 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.1491 'checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF': 
-		compare_ws_file eol__crlf_true_attr__ LF    crlf_false_attr__LF.txt
+expecting success of 0027.831 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1491 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF
+ok 831 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.1492 'checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.832 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1492 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF
+ok 832 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.1493 'checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.833 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1493 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF_mix_LF
+ok 833 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1494 'checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.834 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1494 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_mix_CR
+ok 834 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1495 'checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.835 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1495 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_nul
+ok 835 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.1496 'setup config for checkout attr= ident= aeol=crlf core.autocrlf=true': 
+expecting success of 0027.836 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1496 - setup config for checkout attr= ident= aeol=crlf core.autocrlf=true
+ok 836 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1497 'setup LF checkout ': 
+expecting success of 0027.837 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1497 - setup LF checkout 
+ok 837 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1498 'setup CRLF checkout ': 
+expecting success of 0027.838 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1498 - setup CRLF checkout 
+ok 838 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1499 'setup LF_mix_CR checkout ': 
+expecting success of 0027.839 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1499 - setup LF_mix_CR checkout 
+ok 839 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1500 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.840 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1500 - setup CRLF_mix_LF checkout 
+ok 840 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1501 'setup LF_nul checkout ': 
+expecting success of 0027.841 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1501 - setup LF_nul checkout 
+ok 841 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1502 'ls-files --eol attr=  aeol=crlf core.autocrlf=true core.eol=': 
+expecting success of 0027.842 'ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182139,70 +178743,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1502 - ls-files --eol attr=  aeol=crlf core.autocrlf=true core.eol=
+ok 842 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.1503 'checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.843 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1503 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF
+ok 843 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.1504 'checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.844 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1504 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF
+ok 844 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.1505 'checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.845 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1505 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF
+ok 845 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1506 'checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_true_attr__ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.846 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1506 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR
+ok 846 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1507 'checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_true_attr__ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.847 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1507 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_nul
+ok 847 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.1508 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.848 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1508 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
+ok 848 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1509 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.849 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1509 - setup LF checkout  with -c core.eol=lf
+ok 849 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1510 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.850 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1510 - setup CRLF checkout  with -c core.eol=lf
+ok 850 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1511 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.851 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1511 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 851 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1512 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.852 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1512 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 852 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1513 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.853 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1513 - setup LF_nul checkout  with -c core.eol=lf
+ok 853 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1514 'ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=lf': 
+expecting success of 0027.854 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182217,70 +178821,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1514 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=lf
+ok 854 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.1515 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.855 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1515 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF
+ok 855 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.1516 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.856 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1516 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 856 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.1517 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.857 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1517 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 857 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1518 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.858 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1518 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 858 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1519 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.859 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1519 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+ok 859 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.1520 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.860 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1520 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
+ok 860 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1521 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.861 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1521 - setup LF checkout  with -c core.eol=lf
+ok 861 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1522 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.862 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1522 - setup CRLF checkout  with -c core.eol=lf
+ok 862 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1523 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.863 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1523 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 863 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1524 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.864 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1524 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 864 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1525 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.865 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1525 - setup LF_nul checkout  with -c core.eol=lf
+ok 865 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1526 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=lf': 
+expecting success of 0027.866 'ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182295,70 +178899,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1526 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=lf
+ok 866 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.1527 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.867 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1527 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
+ok 867 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.1528 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.868 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1528 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+ok 868 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.1529 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.869 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1529 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 869 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1530 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.870 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1530 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 870 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1531 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.871 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1531 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+ok 871 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.1532 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.872 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1532 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
+ok 872 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1533 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.873 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1533 - setup LF checkout  with -c core.eol=lf
+ok 873 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1534 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.874 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1534 - setup CRLF checkout  with -c core.eol=lf
+ok 874 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1535 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.875 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1535 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 875 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1536 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.876 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1536 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 876 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1537 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.877 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1537 - setup LF_nul checkout  with -c core.eol=lf
+ok 877 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1538 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf': 
+expecting success of 0027.878 'ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182373,70 +178977,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1538 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf
+ok 878 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.1539 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.879 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1539 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
+ok 879 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.1540 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.880 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1540 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+ok 880 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.1541 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.881 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1541 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 881 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1542 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.882 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1542 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 882 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1543 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.883 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1543 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+ok 883 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.1544 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.884 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1544 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
+ok 884 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1545 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.885 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1545 - setup LF checkout  with -c core.eol=lf
+ok 885 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1546 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.886 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1546 - setup CRLF checkout  with -c core.eol=lf
+ok 886 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1547 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.887 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1547 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 887 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1548 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.888 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1548 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 888 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1549 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.889 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1549 - setup LF_nul checkout  with -c core.eol=lf
+ok 889 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1550 'ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=lf': 
+expecting success of 0027.890 'ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182451,70 +179055,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1550 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=lf
+ok 890 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.1551 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.891 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1551 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
+ok 891 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.1552 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.892 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1552 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+ok 892 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.1553 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.893 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1553 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 893 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1554 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.894 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1554 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 894 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1555 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.895 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1555 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+ok 895 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.1556 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.896 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1556 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
+ok 896 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1557 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.897 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1557 - setup LF checkout  with -c core.eol=lf
+ok 897 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1558 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.898 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1558 - setup CRLF checkout  with -c core.eol=lf
+ok 898 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1559 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.899 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1559 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 899 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1560 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.900 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1560 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 900 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1561 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.901 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1561 - setup LF_nul checkout  with -c core.eol=lf
+ok 901 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1562 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=lf': 
+expecting success of 0027.902 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182529,70 +179133,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1562 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=lf
+ok 902 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.1563 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.903 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1563 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
+ok 903 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.1564 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.904 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1564 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+ok 904 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.1565 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.905 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1565 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 905 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1566 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.906 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1566 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 906 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1567 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.907 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1567 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+ok 907 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.1568 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.908 'setup config for checkout attr=-text ident= aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1568 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
+ok 908 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.1569 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.909 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1569 - setup LF checkout  with -c core.eol=lf
+ok 909 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1570 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.910 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1570 - setup CRLF checkout  with -c core.eol=lf
+ok 910 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1571 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.911 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1571 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 911 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1572 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.912 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1572 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 912 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1573 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.913 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1573 - setup LF_nul checkout  with -c core.eol=lf
+ok 913 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1574 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=lf': 
+expecting success of 0027.914 'ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182607,70 +179211,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1574 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=lf
+ok 914 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=crlf
 
-expecting success of 0027.1575 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.915 'checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1575 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF
+ok 915 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 0027.1576 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.916 'checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1576 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+ok 916 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 0027.1577 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.917 'checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1577 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 917 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1578 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.918 'checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1578 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 918 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1579 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.919 'checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1579 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+ok 919 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 0027.1580 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.920 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1580 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
+ok 920 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.1581 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.921 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1581 - setup LF checkout  with -c core.eol=lf
+ok 921 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1582 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.922 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1582 - setup CRLF checkout  with -c core.eol=lf
+ok 922 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1583 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.923 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1583 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 923 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1584 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.924 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1584 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 924 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1585 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.925 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1585 - setup LF_nul checkout  with -c core.eol=lf
+ok 925 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1586 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf': 
+expecting success of 0027.926 'ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182685,70 +179289,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1586 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf
+ok 926 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=crlf
 
-expecting success of 0027.1587 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.927 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1587 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
+ok 927 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 0027.1588 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.928 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1588 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+ok 928 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 0027.1589 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.929 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1589 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 929 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1590 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.930 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1590 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 930 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1591 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.931 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1591 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+ok 931 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 0027.1592 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.932 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1592 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
+ok 932 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.1593 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.933 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1593 - setup LF checkout  with -c core.eol=lf
+ok 933 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1594 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.934 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1594 - setup CRLF checkout  with -c core.eol=lf
+ok 934 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1595 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.935 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1595 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 935 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1596 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.936 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1596 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 936 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1597 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.937 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1597 - setup LF_nul checkout  with -c core.eol=lf
+ok 937 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1598 'ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=lf': 
+expecting success of 0027.938 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182763,70 +179367,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1598 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=lf
+ok 938 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf
 
-expecting success of 0027.1599 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.939 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1599 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF
+ok 939 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 0027.1600 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.940 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1600 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+ok 940 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 0027.1601 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.941 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1601 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 941 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1602 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.942 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1602 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 942 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1603 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.943 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1603 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
+ok 943 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 0027.1604 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.944 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1604 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
+ok 944 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.1605 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.945 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1605 - setup LF checkout  with -c core.eol=lf
+ok 945 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1606 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.946 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1606 - setup CRLF checkout  with -c core.eol=lf
+ok 946 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1607 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.947 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1607 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 947 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1608 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.948 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1608 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 948 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1609 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.949 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1609 - setup LF_nul checkout  with -c core.eol=lf
+ok 949 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1610 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=lf': 
+expecting success of 0027.950 'ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182841,70 +179445,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1610 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=lf
+ok 950 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=crlf
 
-expecting success of 0027.1611 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.951 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1611 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
+ok 951 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 0027.1612 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.952 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1612 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+ok 952 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 0027.1613 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.953 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1613 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 953 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1614 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.954 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1614 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 954 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1615 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.955 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1615 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+ok 955 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 0027.1616 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.956 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1616 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
+ok 956 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.1617 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.957 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1617 - setup LF checkout  with -c core.eol=lf
+ok 957 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1618 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.958 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1618 - setup CRLF checkout  with -c core.eol=lf
+ok 958 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1619 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.959 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1619 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 959 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1620 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.960 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1620 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 960 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1621 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.961 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1621 - setup LF_nul checkout  with -c core.eol=lf
+ok 961 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1622 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf': 
+expecting success of 0027.962 'ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182919,70 +179523,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1622 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf
+ok 962 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=crlf
 
-expecting success of 0027.1623 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.963 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1623 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
+ok 963 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 0027.1624 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.964 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1624 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+ok 964 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 0027.1625 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.965 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1625 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 965 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1626 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.966 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1626 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 966 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1627 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.967 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1627 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+ok 967 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 0027.1628 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.968 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1628 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
+ok 968 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.1629 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.969 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1629 - setup LF checkout  with -c core.eol=lf
+ok 969 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1630 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.970 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1630 - setup CRLF checkout  with -c core.eol=lf
+ok 970 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1631 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.971 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1631 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 971 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1632 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.972 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1632 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 972 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1633 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.973 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1633 - setup LF_nul checkout  with -c core.eol=lf
+ok 973 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1634 'ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=lf': 
+expecting success of 0027.974 'ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -182997,70 +179601,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1634 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=lf
+ok 974 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=crlf
 
-expecting success of 0027.1635 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.975 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1635 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
+ok 975 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 0027.1636 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.976 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1636 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+ok 976 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 0027.1637 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.977 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1637 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 977 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1638 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.978 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1638 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 978 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1639 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.979 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1639 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+ok 979 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 0027.1640 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.980 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1640 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
+ok 980 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.1641 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.981 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1641 - setup LF checkout  with -c core.eol=lf
+ok 981 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1642 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.982 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1642 - setup CRLF checkout  with -c core.eol=lf
+ok 982 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1643 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.983 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1643 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 983 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1644 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.984 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1644 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 984 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1645 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.985 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1645 - setup LF_nul checkout  with -c core.eol=lf
+ok 985 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1646 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=lf': 
+expecting success of 0027.986 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183075,70 +179679,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1646 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=lf
+ok 986 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf
 
-expecting success of 0027.1647 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.987 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1647 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
+ok 987 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 0027.1648 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.988 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1648 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+ok 988 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 0027.1649 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.989 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1649 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 989 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1650 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.990 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1650 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 990 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1651 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.991 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1651 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+ok 991 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 0027.1652 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.992 'setup config for checkout attr= ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1652 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
+ok 992 - setup config for checkout attr= ident= aeol= core.autocrlf=false
 
-expecting success of 0027.1653 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.993 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1653 - setup LF checkout  with -c core.eol=lf
+ok 993 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1654 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.994 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1654 - setup CRLF checkout  with -c core.eol=lf
+ok 994 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1655 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.995 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1655 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 995 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1656 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.996 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1656 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 996 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1657 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.997 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1657 - setup LF_nul checkout  with -c core.eol=lf
+ok 997 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1658 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=lf': 
+expecting success of 0027.998 'ls-files --eol attr=  aeol= core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183153,70 +179757,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1658 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=lf
+ok 998 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.1659 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.999 'checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
 	
-ok 1659 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF
+ok 999 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.1660 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1000 'checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1660 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+ok 1000 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.1661 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1001 'checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1661 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 1001 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1662 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1002 'checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1662 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 1002 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1663 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1003 'checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1663 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+ok 1003 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.1664 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.1004 'setup config for checkout attr= ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1664 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
+ok 1004 - setup config for checkout attr= ident= aeol= core.autocrlf=true
 
-expecting success of 0027.1665 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1005 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1665 - setup LF checkout  with -c core.eol=lf
+ok 1005 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1666 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1006 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1666 - setup CRLF checkout  with -c core.eol=lf
+ok 1006 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1667 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1007 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1667 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1007 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1668 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1008 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1668 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1008 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1669 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1009 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1669 - setup LF_nul checkout  with -c core.eol=lf
+ok 1009 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1670 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf': 
+expecting success of 0027.1010 'ls-files --eol attr=  aeol= core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183231,70 +179835,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1670 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf
+ok 1010 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.1671 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1011 'checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
 	
-ok 1671 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
+ok 1011 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.1672 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1012 'checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1672 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+ok 1012 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.1673 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1013 'checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1673 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 1013 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1674 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1014 'checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1674 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 1014 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1675 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1015 'checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1675 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+ok 1015 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.1676 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input': 
+expecting success of 0027.1016 'setup config for checkout attr=auto ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1676 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
+ok 1016 - setup config for checkout attr=auto ident= aeol= core.autocrlf=true
 
-expecting success of 0027.1677 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1017 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1677 - setup LF checkout  with -c core.eol=lf
+ok 1017 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1678 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1018 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1678 - setup CRLF checkout  with -c core.eol=lf
+ok 1018 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1679 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1019 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1679 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1019 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1680 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1020 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1680 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1020 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1681 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1021 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1681 - setup LF_nul checkout  with -c core.eol=lf
+ok 1021 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1682 'ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=lf': 
+expecting success of 0027.1022 'ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183309,70 +179913,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1682 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=lf
+ok 1022 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.1683 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1023 'checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1683 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF
+ok 1023 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.1684 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1024 'checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1684 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
+ok 1024 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.1685 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1025 'checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1685 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 1025 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1686 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1026 'checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1686 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 1026 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1687 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1027 'checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1687 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
+ok 1027 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.1688 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.1028 'setup config for checkout attr=text ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1688 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
+ok 1028 - setup config for checkout attr=text ident= aeol= core.autocrlf=true
 
-expecting success of 0027.1689 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1029 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1689 - setup LF checkout  with -c core.eol=lf
+ok 1029 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1690 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1030 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1690 - setup CRLF checkout  with -c core.eol=lf
+ok 1030 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1691 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1031 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1691 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1031 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1692 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1032 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1692 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1032 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1693 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1033 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1693 - setup LF_nul checkout  with -c core.eol=lf
+ok 1033 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1694 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=lf': 
+expecting success of 0027.1034 'ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183387,70 +179991,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1694 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=lf
+ok 1034 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.1695 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1035 'checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1695 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
+ok 1035 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.1696 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1036 'checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1696 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+ok 1036 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.1697 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1037 'checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1697 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 1037 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1698 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1038 'checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1698 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 1038 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1699 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1039 'checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1699 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+ok 1039 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.1700 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.1040 'setup config for checkout attr=text ident= aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1700 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
+ok 1040 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.1701 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1041 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1701 - setup LF checkout  with -c core.eol=lf
+ok 1041 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1702 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1042 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1702 - setup CRLF checkout  with -c core.eol=lf
+ok 1042 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1703 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1043 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1703 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1043 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1704 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1044 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1704 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1044 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1705 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1045 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1705 - setup LF_nul checkout  with -c core.eol=lf
+ok 1045 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1706 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf': 
+expecting success of 0027.1046 'ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183465,70 +180069,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1706 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf
+ok 1046 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=crlf
 
-expecting success of 0027.1707 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1047 'checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1707 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+ok 1047 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 0027.1708 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1048 'checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1708 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+ok 1048 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 0027.1709 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1049 'checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1709 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 1049 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1710 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1050 'checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1710 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 1050 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1711 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1051 'checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1711 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+ok 1051 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 0027.1712 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.1052 'setup config for checkout attr=auto ident= aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1712 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
+ok 1052 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
 
-expecting success of 0027.1713 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1053 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1713 - setup LF checkout  with -c core.eol=lf
+ok 1053 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1714 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1054 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1714 - setup CRLF checkout  with -c core.eol=lf
+ok 1054 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1715 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1055 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1715 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1055 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.1716 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1056 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1716 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1056 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.1717 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1057 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1717 - setup LF_nul checkout  with -c core.eol=lf
+ok 1057 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.1718 'ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=lf': 
+expecting success of 0027.1058 'ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183543,70 +180147,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1718 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=lf
+ok 1058 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=crlf
 
-expecting success of 0027.1719 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1059 'checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1719 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
+ok 1059 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 0027.1720 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1060 'checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1720 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+ok 1060 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 0027.1721 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1061 'checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1721 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 1061 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.1722 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1062 'checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1722 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 1062 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.1723 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1063 'checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1723 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+ok 1063 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 0027.1724 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.1064 'setup config for checkout attr=-text ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1724 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
+ok 1064 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
 
-expecting success of 0027.1725 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1065 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1725 - setup LF checkout  with -c core.eol=lf
+ok 1065 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1726 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1066 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1726 - setup CRLF checkout  with -c core.eol=lf
+ok 1066 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1727 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1067 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1727 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1067 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1728 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1068 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1728 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1068 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1729 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1069 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1729 - setup LF_nul checkout  with -c core.eol=lf
+ok 1069 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1730 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=lf': 
+expecting success of 0027.1070 'ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183621,70 +180225,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1730 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=lf
+ok 1070 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=native
 
-expecting success of 0027.1731 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1071 'checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1731 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+ok 1071 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.1732 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1072 'checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1732 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+ok 1072 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.1733 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1073 'checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1733 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 1073 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1734 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1074 'checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1734 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 1074 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1735 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1075 'checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1735 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+ok 1075 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.1736 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.1076 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1736 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input
+ok 1076 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1737 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1077 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1737 - setup LF checkout  with -c core.eol=lf
+ok 1077 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1738 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1078 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1738 - setup CRLF checkout  with -c core.eol=lf
+ok 1078 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1739 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1079 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1739 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1079 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1740 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1080 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1740 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1080 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1741 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1081 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1741 - setup LF_nul checkout  with -c core.eol=lf
+ok 1081 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1742 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=lf': 
+expecting success of 0027.1082 'ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183699,70 +180303,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1742 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=lf
+ok 1082 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=native
 
-expecting success of 0027.1743 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1083 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1743 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF
+ok 1083 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.1744 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1084 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1744 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+ok 1084 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.1745 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1085 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1745 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 1085 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1746 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1086 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1746 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 1086 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1747 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1087 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1747 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+ok 1087 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.1748 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.1088 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1748 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
+ok 1088 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1749 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1089 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1749 - setup LF checkout  with -c core.eol=lf
+ok 1089 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1750 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1090 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1750 - setup CRLF checkout  with -c core.eol=lf
+ok 1090 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1751 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1091 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1751 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1091 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1752 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1092 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1752 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1092 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1753 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1093 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1753 - setup LF_nul checkout  with -c core.eol=lf
+ok 1093 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1754 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf': 
+expecting success of 0027.1094 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183777,70 +180381,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1754 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf
+ok 1094 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=native
 
-expecting success of 0027.1755 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1095 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1755 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+ok 1095 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.1756 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1096 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1756 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+ok 1096 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.1757 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1097 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1757 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 1097 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1758 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1098 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1758 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 1098 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1759 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1099 'checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1759 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+ok 1099 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.1760 'setup config for checkout attr= ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1100 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1760 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
+ok 1100 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1761 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1101 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1761 - setup LF checkout  with -c core.eol=lf
+ok 1101 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1762 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1102 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1762 - setup CRLF checkout  with -c core.eol=lf
+ok 1102 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1763 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1103 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1763 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1103 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1764 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1104 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1764 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1104 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1765 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1105 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1765 - setup LF_nul checkout  with -c core.eol=lf
+ok 1105 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1766 'ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=lf': 
+expecting success of 0027.1106 'ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183855,70 +180459,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1766 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=lf
+ok 1106 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=native
 
-expecting success of 0027.1767 'checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1107 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1767 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF
+ok 1107 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.1768 'checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1108 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1768 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+ok 1108 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.1769 'checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1109 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1769 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 1109 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1770 'checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1110 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1770 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 1110 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1771 'checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1111 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1771 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
+ok 1111 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.1772 'setup config for checkout attr= ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1112 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1772 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
+ok 1112 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1773 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1113 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1773 - setup LF checkout  with -c core.eol=lf
+ok 1113 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1774 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1114 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1774 - setup CRLF checkout  with -c core.eol=lf
+ok 1114 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1775 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1115 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1775 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1115 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1776 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1116 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1776 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1116 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1777 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1117 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1777 - setup LF_nul checkout  with -c core.eol=lf
+ok 1117 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1778 'ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=lf': 
+expecting success of 0027.1118 'ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -183933,70 +180537,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1778 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=lf
+ok 1118 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=native
 
-expecting success of 0027.1779 'checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1119 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1779 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF
+ok 1119 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.1780 'checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1120 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1780 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 1120 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.1781 'checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1121 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1781 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 1121 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1782 'checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1122 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1782 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 1122 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1783 'checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1123 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1783 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+ok 1123 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.1784 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1124 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1784 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
+ok 1124 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1785 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1125 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1785 - setup LF checkout  with -c core.eol=lf
+ok 1125 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1786 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1126 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1786 - setup CRLF checkout  with -c core.eol=lf
+ok 1126 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1787 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1127 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1787 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1127 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1788 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1128 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1788 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1128 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1789 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1129 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1789 - setup LF_nul checkout  with -c core.eol=lf
+ok 1129 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1790 'ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=lf': 
+expecting success of 0027.1130 'ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184011,70 +180615,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1790 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=lf
+ok 1130 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=native
 
-expecting success of 0027.1791 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1131 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1791 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF
+ok 1131 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.1792 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1132 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1792 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 1132 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.1793 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1133 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1793 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 1133 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1794 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1134 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1794 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 1134 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1795 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1135 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1795 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+ok 1135 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.1796 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1136 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1796 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
+ok 1136 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1797 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1137 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1797 - setup LF checkout  with -c core.eol=lf
+ok 1137 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1798 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1138 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1798 - setup CRLF checkout  with -c core.eol=lf
+ok 1138 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1799 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1139 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1799 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1139 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1800 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1140 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1800 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1140 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1801 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1141 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1801 - setup LF_nul checkout  with -c core.eol=lf
+ok 1141 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1802 'ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=lf': 
+expecting success of 0027.1142 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184089,70 +180693,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1802 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=lf
+ok 1142 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=native
 
-expecting success of 0027.1803 'checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1143 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1803 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF
+ok 1143 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.1804 'checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1144 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1804 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 1144 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.1805 'checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1145 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1805 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 1145 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1806 'checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1146 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1806 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 1146 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1807 'checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1147 'checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1807 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+ok 1147 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.1808 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=input': 
+expecting success of 0027.1148 'setup config for checkout attr=-text ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1808 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
+ok 1148 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.1809 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1149 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1809 - setup LF checkout  with -c core.eol=lf
+ok 1149 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1810 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1150 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1810 - setup CRLF checkout  with -c core.eol=lf
+ok 1150 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1811 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1151 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1811 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1151 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1812 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1152 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1812 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1152 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1813 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1153 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1813 - setup LF_nul checkout  with -c core.eol=lf
+ok 1153 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1814 'ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=lf': 
+expecting success of 0027.1154 'ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184167,70 +180771,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1814 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=lf
+ok 1154 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=native
 
-expecting success of 0027.1815 'checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1155 'checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1815 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF
+ok 1155 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.1816 'checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1156 'checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1816 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
+ok 1156 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.1817 'checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1157 'checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1817 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 1157 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1818 'checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1158 'checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1818 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 1158 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1819 'checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1159 'checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1819 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
+ok 1159 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.1820 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input': 
+expecting success of 0027.1160 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1820 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
+ok 1160 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1821 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1161 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1821 - setup LF checkout  with -c core.eol=lf
+ok 1161 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1822 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1162 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1822 - setup CRLF checkout  with -c core.eol=lf
+ok 1162 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1823 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1163 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1823 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1163 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1824 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1164 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1824 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1164 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1825 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1165 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1825 - setup LF_nul checkout  with -c core.eol=lf
+ok 1165 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1826 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=lf': 
+expecting success of 0027.1166 'ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184245,70 +180849,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1826 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=lf
+ok 1166 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=native
 
-expecting success of 0027.1827 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1167 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1827 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF
+ok 1167 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.1828 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1168 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1828 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF
+ok 1168 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.1829 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1169 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1829 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 1169 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1830 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1170 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1830 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 1170 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1831 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1171 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1831 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
+ok 1171 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.1832 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1172 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1832 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
+ok 1172 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1833 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1173 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1833 - setup LF checkout  with -c core.eol=crlf
+ok 1173 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1834 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1174 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1834 - setup CRLF checkout  with -c core.eol=crlf
+ok 1174 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1835 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1175 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1835 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1175 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1836 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1176 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1836 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1176 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1837 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1177 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1837 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1177 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1838 'ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=crlf': 
+expecting success of 0027.1178 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184323,70 +180927,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1838 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=crlf
+ok 1178 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=native
 
-expecting success of 0027.1839 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1179 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1839 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 1179 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.1840 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1180 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1840 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 1180 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.1841 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1181 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1841 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 1181 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1842 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1182 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1842 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1182 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1843 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1183 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1843 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 1183 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.1844 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.1184 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1844 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
+ok 1184 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1845 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1185 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1845 - setup LF checkout  with -c core.eol=crlf
+ok 1185 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1846 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1186 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1846 - setup CRLF checkout  with -c core.eol=crlf
+ok 1186 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1847 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1187 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1847 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1187 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1848 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1188 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1848 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1188 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1849 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1189 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1849 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1189 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1850 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf': 
+expecting success of 0027.1190 'ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184401,70 +181005,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1850 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf
+ok 1190 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=native
 
-expecting success of 0027.1851 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1191 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1851 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
+ok 1191 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.1852 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1192 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1852 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+ok 1192 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.1853 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1193 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1853 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 1193 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1854 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1194 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1854 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1194 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1855 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1195 'checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1855 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 1195 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.1856 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.1196 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1856 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
+ok 1196 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1857 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1197 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1857 - setup LF checkout  with -c core.eol=crlf
+ok 1197 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1858 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1198 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1858 - setup CRLF checkout  with -c core.eol=crlf
+ok 1198 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1859 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1199 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1859 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1199 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1860 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1200 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1860 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1200 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1861 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1201 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1861 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1201 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1862 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf': 
+expecting success of 0027.1202 'ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184479,70 +181083,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1862 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf
+ok 1202 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=native
 
-expecting success of 0027.1863 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1203 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1863 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+ok 1203 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.1864 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1204 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1864 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+ok 1204 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.1865 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1205 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1865 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 1205 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1866 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1206 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1866 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1206 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1867 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1207 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1867 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 1207 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.1868 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.1208 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1868 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
+ok 1208 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1869 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1209 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1869 - setup LF checkout  with -c core.eol=crlf
+ok 1209 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1870 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1210 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1870 - setup CRLF checkout  with -c core.eol=crlf
+ok 1210 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1871 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1211 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1871 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1211 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1872 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1212 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1872 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1212 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1873 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1213 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1873 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1213 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1874 'ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=crlf': 
+expecting success of 0027.1214 'ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184557,70 +181161,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1874 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=crlf
+ok 1214 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=native
 
-expecting success of 0027.1875 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1215 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1875 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
+ok 1215 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.1876 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1216 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1876 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+ok 1216 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.1877 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1217 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1877 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 1217 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1878 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1218 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1878 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1218 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1879 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1219 'checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1879 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 1219 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.1880 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.1220 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1880 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
+ok 1220 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1881 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1221 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1881 - setup LF checkout  with -c core.eol=crlf
+ok 1221 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1882 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1222 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1882 - setup CRLF checkout  with -c core.eol=crlf
+ok 1222 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1883 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1223 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1883 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1223 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1884 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1224 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1884 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1224 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1885 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1225 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1885 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1225 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1886 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf': 
+expecting success of 0027.1226 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184635,70 +181239,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1886 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf
+ok 1226 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=native
 
-expecting success of 0027.1887 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1227 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1887 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+ok 1227 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.1888 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1228 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1888 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+ok 1228 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.1889 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1229 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1889 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 1229 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1890 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1230 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1890 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1230 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1891 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1231 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1891 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 1231 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.1892 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.1232 'setup config for checkout attr=-text ident= aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1892 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
+ok 1232 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.1893 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1233 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1893 - setup LF checkout  with -c core.eol=crlf
+ok 1233 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1894 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1234 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1894 - setup CRLF checkout  with -c core.eol=crlf
+ok 1234 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1895 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1235 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1895 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1235 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1896 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1236 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1896 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1236 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1897 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1237 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1897 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1237 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1898 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf': 
+expecting success of 0027.1238 'ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184713,70 +181317,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1898 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf
+ok 1238 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=native
 
-expecting success of 0027.1899 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1239 'checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1899 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
+ok 1239 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF
 
-expecting success of 0027.1900 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1240 'checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1900 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+ok 1240 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 0027.1901 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1241 'checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1901 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 1241 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1902 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1242 'checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1902 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1242 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1903 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1243 'checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1903 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 1243 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 0027.1904 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.1244 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1904 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
+ok 1244 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.1905 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1245 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1905 - setup LF checkout  with -c core.eol=crlf
+ok 1245 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1906 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1246 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1906 - setup CRLF checkout  with -c core.eol=crlf
+ok 1246 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1907 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1247 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1907 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1247 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1908 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1248 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1908 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1248 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1909 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1249 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1909 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1249 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1910 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf': 
+expecting success of 0027.1250 'ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184791,70 +181395,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1910 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf
+ok 1250 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=native
 
-expecting success of 0027.1911 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1251 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1911 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+ok 1251 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 0027.1912 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1252 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1912 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+ok 1252 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 0027.1913 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1253 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1913 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 1253 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1914 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1254 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1914 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1254 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1915 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1255 'checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1915 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 1255 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 0027.1916 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1256 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1916 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
+ok 1256 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.1917 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1257 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1917 - setup LF checkout  with -c core.eol=crlf
+ok 1257 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1918 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1258 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1918 - setup CRLF checkout  with -c core.eol=crlf
+ok 1258 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1919 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1259 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1919 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1259 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1920 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1260 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1920 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1260 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1921 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1261 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1921 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1261 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1922 'ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=crlf': 
+expecting success of 0027.1262 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184869,70 +181473,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1922 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=crlf
+ok 1262 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=native
 
-expecting success of 0027.1923 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1263 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 1923 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 1263 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 0027.1924 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1264 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1924 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 1264 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 0027.1925 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1265 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1925 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 1265 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1926 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1266 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1926 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1266 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1927 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1267 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1927 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1267 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 0027.1928 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.1268 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1928 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
+ok 1268 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.1929 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1269 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1929 - setup LF checkout  with -c core.eol=crlf
+ok 1269 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1930 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1270 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1930 - setup CRLF checkout  with -c core.eol=crlf
+ok 1270 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1931 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1271 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1931 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1271 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1932 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1272 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1932 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1272 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1933 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1273 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1933 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1273 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1934 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf': 
+expecting success of 0027.1274 'ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -184947,70 +181551,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1934 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf
+ok 1274 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=native
 
-expecting success of 0027.1935 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1275 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 1935 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
+ok 1275 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 0027.1936 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1276 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1936 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+ok 1276 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 0027.1937 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1277 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1937 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 1277 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1938 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1278 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1938 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1278 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1939 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1279 'checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1939 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1279 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 0027.1940 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.1280 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1940 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
+ok 1280 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.1941 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1281 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1941 - setup LF checkout  with -c core.eol=crlf
+ok 1281 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1942 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1282 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1942 - setup CRLF checkout  with -c core.eol=crlf
+ok 1282 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1943 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1283 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1943 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1283 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1944 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1284 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1944 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1284 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1945 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1285 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1945 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1285 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1946 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf': 
+expecting success of 0027.1286 'ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185025,70 +181629,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1946 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf
+ok 1286 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=native
 
-expecting success of 0027.1947 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1287 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1947 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+ok 1287 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 0027.1948 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1288 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1948 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+ok 1288 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 0027.1949 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1289 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1949 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 1289 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1950 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1290 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1950 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1290 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1951 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1291 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1951 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1291 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 0027.1952 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.1292 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1952 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
+ok 1292 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.1953 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1293 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1953 - setup LF checkout  with -c core.eol=crlf
+ok 1293 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1954 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1294 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1954 - setup CRLF checkout  with -c core.eol=crlf
+ok 1294 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1955 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1295 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1955 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1295 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1956 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1296 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1956 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1296 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1957 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1297 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1957 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1297 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1958 'ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=crlf': 
+expecting success of 0027.1298 'ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185103,70 +181707,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1958 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=crlf
+ok 1298 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=native
 
-expecting success of 0027.1959 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1299 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 1959 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
+ok 1299 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 0027.1960 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1300 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1960 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+ok 1300 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 0027.1961 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1301 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1961 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 1301 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1962 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1302 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1962 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1302 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1963 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1303 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1963 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1303 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 0027.1964 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.1304 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1964 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
+ok 1304 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.1965 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1305 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1965 - setup LF checkout  with -c core.eol=crlf
+ok 1305 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1966 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1306 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1966 - setup CRLF checkout  with -c core.eol=crlf
+ok 1306 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1967 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1307 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1967 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1307 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1968 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1308 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1968 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1308 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1969 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1309 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1969 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1309 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1970 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf': 
+expecting success of 0027.1310 'ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185181,70 +181785,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1970 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf
+ok 1310 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=native
 
-expecting success of 0027.1971 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1311 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1971 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+ok 1311 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 0027.1972 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1312 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1972 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+ok 1312 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 0027.1973 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1313 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1973 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 1313 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1974 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1314 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1974 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1314 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1975 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1315 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1975 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1315 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 0027.1976 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.1316 'setup config for checkout attr= ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1976 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
+ok 1316 - setup config for checkout attr= ident= aeol= core.autocrlf=false
 
-expecting success of 0027.1977 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1317 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1977 - setup LF checkout  with -c core.eol=crlf
+ok 1317 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1978 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1318 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1978 - setup CRLF checkout  with -c core.eol=crlf
+ok 1318 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1979 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1319 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1979 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1319 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1980 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1320 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1980 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1320 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1981 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1321 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1981 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1321 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1982 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf': 
+expecting success of 0027.1322 'ls-files --eol attr=  aeol= core.autocrlf=false core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185259,70 +181863,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1982 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf
+ok 1322 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=native
 
-expecting success of 0027.1983 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1323 'checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr__ LF    crlf_false_attr__LF.txt
 	
-ok 1983 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
+ok 1323 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.1984 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1324 'checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1984 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+ok 1324 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.1985 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1325 'checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1985 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 1325 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1986 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1326 'checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1986 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1326 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1987 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1327 'checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1987 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1327 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.1988 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.1328 'setup config for checkout attr= ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1988 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
+ok 1328 - setup config for checkout attr= ident= aeol= core.autocrlf=true
 
-expecting success of 0027.1989 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1329 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1989 - setup LF checkout  with -c core.eol=crlf
+ok 1329 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.1990 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1330 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1990 - setup CRLF checkout  with -c core.eol=crlf
+ok 1330 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.1991 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1331 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1991 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1331 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.1992 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1332 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1992 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1332 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.1993 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1333 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1993 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1333 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.1994 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf': 
+expecting success of 0027.1334 'ls-files --eol attr=  aeol= core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185337,70 +181941,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1994 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf
+ok 1334 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=native
 
-expecting success of 0027.1995 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1335 'checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
 	
-ok 1995 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+ok 1335 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.1996 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1336 'checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1996 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+ok 1336 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.1997 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1337 'checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1997 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 1337 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.1998 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1338 'checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1998 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1338 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.1999 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1339 'checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 1999 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1339 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.2000 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input': 
+expecting success of 0027.1340 'setup config for checkout attr=auto ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2000 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
+ok 1340 - setup config for checkout attr=auto ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2001 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1341 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2001 - setup LF checkout  with -c core.eol=crlf
+ok 1341 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2002 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1342 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2002 - setup CRLF checkout  with -c core.eol=crlf
+ok 1342 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2003 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1343 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2003 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1343 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2004 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1344 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2004 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1344 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2005 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1345 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2005 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1345 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2006 'ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=crlf': 
+expecting success of 0027.1346 'ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185415,70 +182019,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2006 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=crlf
+ok 1346 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=native
 
-expecting success of 0027.2007 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1347 'checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2007 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 1347 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.2008 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1348 'checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2008 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 1348 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.2009 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1349 'checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2009 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 1349 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.2010 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1350 'checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2010 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1350 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.2011 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1351 'checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2011 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 1351 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.2012 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.1352 'setup config for checkout attr=text ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2012 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
+ok 1352 - setup config for checkout attr=text ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2013 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1353 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2013 - setup LF checkout  with -c core.eol=crlf
+ok 1353 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2014 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1354 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2014 - setup CRLF checkout  with -c core.eol=crlf
+ok 1354 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2015 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1355 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2015 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1355 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2016 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1356 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2016 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1356 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2017 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1357 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2017 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1357 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2018 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf': 
+expecting success of 0027.1358 'ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185493,70 +182097,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2018 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf
+ok 1358 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=native
 
-expecting success of 0027.2019 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1359 'checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2019 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
+ok 1359 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.2020 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1360 'checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2020 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 1360 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.2021 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1361 'checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2021 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 1361 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.2022 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1362 'checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2022 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1362 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.2023 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1363 'checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2023 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 1363 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.2024 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.1364 'setup config for checkout attr=text ident= aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2024 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
+ok 1364 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.2025 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1365 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2025 - setup LF checkout  with -c core.eol=crlf
+ok 1365 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2026 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1366 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2026 - setup CRLF checkout  with -c core.eol=crlf
+ok 1366 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2027 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1367 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2027 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1367 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2028 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1368 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2028 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1368 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2029 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1369 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2029 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1369 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2030 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf': 
+expecting success of 0027.1370 'ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185571,70 +182175,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2030 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf
+ok 1370 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=native
 
-expecting success of 0027.2031 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1371 'checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 2031 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+ok 1371 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF
 
-expecting success of 0027.2032 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1372 'checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2032 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+ok 1372 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 0027.2033 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1373 'checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2033 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 1373 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.2034 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1374 'checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2034 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1374 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 0027.2035 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1375 'checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2035 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 1375 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 0027.2036 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.1376 'setup config for checkout attr=auto ident= aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2036 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
+ok 1376 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
 
-expecting success of 0027.2037 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1377 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2037 - setup LF checkout  with -c core.eol=crlf
+ok 1377 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2038 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1378 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2038 - setup CRLF checkout  with -c core.eol=crlf
+ok 1378 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2039 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1379 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2039 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1379 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2040 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1380 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2040 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1380 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2041 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1381 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2041 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1381 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2042 'ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf': 
+expecting success of 0027.1382 'ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185649,70 +182253,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2042 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf
+ok 1382 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=native
 
-expecting success of 0027.2043 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1383 'checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 2043 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
+ok 1383 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF
 
-expecting success of 0027.2044 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1384 'checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2044 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 1384 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 0027.2045 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1385 'checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2045 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 1385 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.2046 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1386 'checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2046 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1386 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 0027.2047 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1387 'checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2047 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 1387 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 0027.2048 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.1388 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2048 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
+ok 1388 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2049 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1389 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2049 - setup LF checkout  with -c core.eol=crlf
+ok 1389 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2050 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1390 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2050 - setup CRLF checkout  with -c core.eol=crlf
+ok 1390 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2051 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1391 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2051 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1391 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2052 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1392 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2052 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1392 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2053 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1393 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2053 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1393 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2054 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf': 
+expecting success of 0027.1394 'ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185727,70 +182331,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2054 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf
+ok 1394 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.2055 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1395 'checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2055 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+ok 1395 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.2056 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1396 'checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2056 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+ok 1396 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.2057 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1397 'checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2057 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 1397 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.2058 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1398 'checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2058 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1398 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.2059 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1399 'checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2059 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 1399 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.2060 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.1400 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2060 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input
+ok 1400 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2061 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1401 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2061 - setup LF checkout  with -c core.eol=crlf
+ok 1401 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2062 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1402 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2062 - setup CRLF checkout  with -c core.eol=crlf
+ok 1402 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2063 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1403 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2063 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1403 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2064 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1404 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2064 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1404 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2065 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1405 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2065 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1405 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2066 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf': 
+expecting success of 0027.1406 'ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185805,70 +182409,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2066 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf
+ok 1406 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=lf
 
-expecting success of 0027.2067 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1407 'checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 2067 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
+ok 1407 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.2068 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1408 'checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2068 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 1408 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.2069 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1409 'checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2069 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 1409 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2070 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1410 'checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2070 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1410 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2071 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1411 'checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2071 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 1411 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.2072 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.1412 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2072 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
+ok 1412 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2073 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1413 'setup LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2073 - setup LF checkout  with -c core.eol=crlf
+ok 1413 - setup LF checkout 
 
-expecting success of 0027.2074 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1414 'setup CRLF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2074 - setup CRLF checkout  with -c core.eol=crlf
+ok 1414 - setup CRLF checkout 
 
-expecting success of 0027.2075 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1415 'setup LF_mix_CR checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2075 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1415 - setup LF_mix_CR checkout 
 
-expecting success of 0027.2076 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1416 'setup CRLF_mix_LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2076 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1416 - setup CRLF_mix_LF checkout 
 
-expecting success of 0027.2077 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1417 'setup LF_nul checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2077 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1417 - setup LF_nul checkout 
 
-expecting success of 0027.2078 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf': 
+expecting success of 0027.1418 'ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185883,70 +182487,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2078 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf
+ok 1418 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=
 
-expecting success of 0027.2079 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1419 'checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF': 
+		compare_ws_file eol__crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 2079 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+ok 1419 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF
 
-expecting success of 0027.2080 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1420 'checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2080 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+ok 1420 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF
 
-expecting success of 0027.2081 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1421 'checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2081 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 1421 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
 
-expecting success of 0027.2082 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1422 'checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2082 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1422 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
 
-expecting success of 0027.2083 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1423 'checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2083 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 1423 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_nul
 
-expecting success of 0027.2084 'setup config for checkout attr= ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1424 'setup config for checkout attr=text ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2084 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
+ok 1424 - setup config for checkout attr=text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2085 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1425 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2085 - setup LF checkout  with -c core.eol=crlf
+ok 1425 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2086 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1426 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2086 - setup CRLF checkout  with -c core.eol=crlf
+ok 1426 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2087 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1427 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2087 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1427 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2088 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1428 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2088 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1428 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2089 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1429 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2089 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1429 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2090 'ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=crlf': 
+expecting success of 0027.1430 'ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -185961,70 +182565,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2090 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=crlf
+ok 1430 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=native
 
-expecting success of 0027.2091 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1431 'checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 2091 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 1431 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.2092 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1432 'checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2092 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 1432 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.2093 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1433 'checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2093 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 1433 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.2094 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1434 'checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2094 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1434 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.2095 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1435 'checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2095 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1435 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.2096 'setup config for checkout attr= ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1436 'setup config for checkout attr=auto ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2096 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
+ok 1436 - setup config for checkout attr=auto ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2097 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1437 'setup LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2097 - setup LF checkout  with -c core.eol=crlf
+ok 1437 - setup LF checkout 
 
-expecting success of 0027.2098 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1438 'setup CRLF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2098 - setup CRLF checkout  with -c core.eol=crlf
+ok 1438 - setup CRLF checkout 
 
-expecting success of 0027.2099 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1439 'setup LF_mix_CR checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2099 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1439 - setup LF_mix_CR checkout 
 
-expecting success of 0027.2100 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1440 'setup CRLF_mix_LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2100 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1440 - setup CRLF_mix_LF checkout 
 
-expecting success of 0027.2101 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1441 'setup LF_nul checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2101 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1441 - setup LF_nul checkout 
 
-expecting success of 0027.2102 'ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=crlf': 
+expecting success of 0027.1442 'ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186039,70 +182643,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2102 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=crlf
+ok 1442 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=
 
-expecting success of 0027.2103 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1443 'checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF': 
+		compare_ws_file eol__crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 2103 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 1443 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF
 
-expecting success of 0027.2104 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1444 'checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2104 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 1444 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF
 
-expecting success of 0027.2105 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1445 'checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2105 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 1445 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
 
-expecting success of 0027.2106 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1446 'checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2106 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1446 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
 
-expecting success of 0027.2107 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1447 'checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2107 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 1447 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_nul
 
-expecting success of 0027.2108 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1448 'setup config for checkout attr=auto ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2108 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
+ok 1448 - setup config for checkout attr=auto ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2109 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1449 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2109 - setup LF checkout  with -c core.eol=crlf
+ok 1449 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2110 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1450 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2110 - setup CRLF checkout  with -c core.eol=crlf
+ok 1450 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2111 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1451 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2111 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1451 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2112 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1452 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2112 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1452 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2113 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1453 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2113 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1453 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2114 'ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=crlf': 
+expecting success of 0027.1454 'ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186117,70 +182721,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2114 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=crlf
+ok 1454 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=native
 
-expecting success of 0027.2115 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1455 'checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 2115 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 1455 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.2116 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1456 'checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2116 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 1456 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.2117 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1457 'checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2117 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 1457 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.2118 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1458 'checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2118 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1458 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.2119 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1459 'checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2119 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 1459 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.2120 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1460 'setup config for checkout attr= ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2120 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
+ok 1460 - setup config for checkout attr= ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2121 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1461 'setup LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2121 - setup LF checkout  with -c core.eol=crlf
+ok 1461 - setup LF checkout 
 
-expecting success of 0027.2122 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1462 'setup CRLF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2122 - setup CRLF checkout  with -c core.eol=crlf
+ok 1462 - setup CRLF checkout 
 
-expecting success of 0027.2123 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1463 'setup LF_mix_CR checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2123 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1463 - setup LF_mix_CR checkout 
 
-expecting success of 0027.2124 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1464 'setup CRLF_mix_LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2124 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1464 - setup CRLF_mix_LF checkout 
 
-expecting success of 0027.2125 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1465 'setup LF_nul checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2125 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1465 - setup LF_nul checkout 
 
-expecting success of 0027.2126 'ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=crlf': 
+expecting success of 0027.1466 'ls-files --eol attr=  aeol=lf core.autocrlf=false core.eol=': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186195,70 +182799,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2126 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=crlf
+ok 1466 - ls-files --eol attr=  aeol=lf core.autocrlf=false core.eol=
 
-expecting success of 0027.2127 'checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1467 'checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF': 
+		compare_ws_file eol__crlf_false_attr__ LF    crlf_false_attr__LF.txt
 	
-ok 2127 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 1467 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF
 
-expecting success of 0027.2128 'checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1468 'checkout attr=  aeol=lf core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2128 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 1468 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=CRLF
 
-expecting success of 0027.2129 'checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1469 'checkout attr=  aeol=lf core.autocrlf=false core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2129 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 1469 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=CRLF_mix_LF
 
-expecting success of 0027.2130 'checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1470 'checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2130 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1470 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF_mix_CR
 
-expecting success of 0027.2131 'checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1471 'checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2131 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 1471 - checkout attr=  aeol=lf core.autocrlf=false core.eol= file=LF_nul
 
-expecting success of 0027.2132 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=input': 
+expecting success of 0027.1472 'setup config for checkout attr= ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2132 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
+ok 1472 - setup config for checkout attr= ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2133 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1473 'setup LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2133 - setup LF checkout  with -c core.eol=crlf
+ok 1473 - setup LF checkout 
 
-expecting success of 0027.2134 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1474 'setup CRLF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2134 - setup CRLF checkout  with -c core.eol=crlf
+ok 1474 - setup CRLF checkout 
 
-expecting success of 0027.2135 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1475 'setup LF_mix_CR checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2135 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1475 - setup LF_mix_CR checkout 
 
-expecting success of 0027.2136 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1476 'setup CRLF_mix_LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2136 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1476 - setup CRLF_mix_LF checkout 
 
-expecting success of 0027.2137 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1477 'setup LF_nul checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2137 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1477 - setup LF_nul checkout 
 
-expecting success of 0027.2138 'ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=crlf': 
+expecting success of 0027.1478 'ls-files --eol attr=  aeol=crlf core.autocrlf=false core.eol=': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186273,70 +182877,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2138 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=crlf
+ok 1478 - ls-files --eol attr=  aeol=crlf core.autocrlf=false core.eol=
 
-expecting success of 0027.2139 'checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1479 'checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF    crlf_false_attr__LF.txt
 	
-ok 2139 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 1479 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF
 
-expecting success of 0027.2140 'checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1480 'checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2140 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 1480 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=CRLF
 
-expecting success of 0027.2141 'checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1481 'checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2141 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 1481 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=CRLF_mix_LF
 
-expecting success of 0027.2142 'checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1482 'checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_false_attr__ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2142 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1482 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF_mix_CR
 
-expecting success of 0027.2143 'checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1483 'checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr__ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2143 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 1483 - checkout attr=  aeol=crlf core.autocrlf=false core.eol= file=LF_nul
 
-expecting success of 0027.2144 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input': 
+expecting success of 0027.1484 'setup config for checkout attr= ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2144 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
+ok 1484 - setup config for checkout attr= ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2145 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1485 'setup LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2145 - setup LF checkout  with -c core.eol=crlf
+ok 1485 - setup LF checkout 
 
-expecting success of 0027.2146 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1486 'setup CRLF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2146 - setup CRLF checkout  with -c core.eol=crlf
+ok 1486 - setup CRLF checkout 
 
-expecting success of 0027.2147 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1487 'setup LF_mix_CR checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2147 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1487 - setup LF_mix_CR checkout 
 
-expecting success of 0027.2148 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1488 'setup CRLF_mix_LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2148 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1488 - setup CRLF_mix_LF checkout 
 
-expecting success of 0027.2149 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1489 'setup LF_nul checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2149 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1489 - setup LF_nul checkout 
 
-expecting success of 0027.2150 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf': 
+expecting success of 0027.1490 'ls-files --eol attr=  aeol=lf core.autocrlf=true core.eol=': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186351,70 +182955,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2150 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf
+ok 1490 - ls-files --eol attr=  aeol=lf core.autocrlf=true core.eol=
 
-expecting success of 0027.2151 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1491 'checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF': 
+		compare_ws_file eol__crlf_true_attr__ LF    crlf_false_attr__LF.txt
 	
-ok 2151 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 1491 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF
 
-expecting success of 0027.2152 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1492 'checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2152 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 1492 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF
 
-expecting success of 0027.2153 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1493 'checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2153 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 1493 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=CRLF_mix_LF
 
-expecting success of 0027.2154 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1494 'checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2154 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1494 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_mix_CR
 
-expecting success of 0027.2155 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1495 'checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2155 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 1495 - checkout attr=  aeol=lf core.autocrlf=true core.eol= file=LF_nul
 
-expecting success of 0027.2156 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1496 'setup config for checkout attr= ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2156 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
+ok 1496 - setup config for checkout attr= ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2157 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1497 'setup LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2157 - setup LF checkout  with -c core.eol=native
+ok 1497 - setup LF checkout 
 
-expecting success of 0027.2158 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1498 'setup CRLF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2158 - setup CRLF checkout  with -c core.eol=native
+ok 1498 - setup CRLF checkout 
 
-expecting success of 0027.2159 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1499 'setup LF_mix_CR checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2159 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1499 - setup LF_mix_CR checkout 
 
-expecting success of 0027.2160 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1500 'setup CRLF_mix_LF checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2160 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1500 - setup CRLF_mix_LF checkout 
 
-expecting success of 0027.2161 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1501 'setup LF_nul checkout ': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2161 - setup LF_nul checkout  with -c core.eol=native
+ok 1501 - setup LF_nul checkout 
 
-expecting success of 0027.2162 'ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=native': 
+expecting success of 0027.1502 'ls-files --eol attr=  aeol=crlf core.autocrlf=true core.eol=': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186429,70 +183033,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2162 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=native
+ok 1502 - ls-files --eol attr=  aeol=crlf core.autocrlf=true core.eol=
 
-expecting success of 0027.2163 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1503 'checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
 	
-ok 2163 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF
+ok 1503 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF
 
-expecting success of 0027.2164 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1504 'checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2164 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 1504 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF
 
-expecting success of 0027.2165 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1505 'checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2165 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1505 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF
 
-expecting success of 0027.2166 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1506 'checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_true_attr__ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2166 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1506 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR
 
-expecting success of 0027.2167 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1507 'checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_true_attr__ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2167 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 1507 - checkout attr=  aeol=crlf core.autocrlf=true core.eol= file=LF_nul
 
-expecting success of 0027.2168 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.1508 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2168 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
+ok 1508 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
 
-expecting success of 0027.2169 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1509 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2169 - setup LF checkout  with -c core.eol=native
+ok 1509 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2170 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1510 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2170 - setup CRLF checkout  with -c core.eol=native
+ok 1510 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2171 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1511 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2171 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1511 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2172 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1512 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2172 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1512 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2173 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1513 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2173 - setup LF_nul checkout  with -c core.eol=native
+ok 1513 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2174 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=native': 
+expecting success of 0027.1514 'ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186507,70 +183111,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2174 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=native
+ok 1514 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=lf
 
-expecting success of 0027.2175 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1515 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2175 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 1515 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2176 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1516 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2176 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 1516 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2177 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1517 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2177 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1517 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2178 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1518 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2178 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1518 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2179 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1519 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2179 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+ok 1519 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2180 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.1520 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2180 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
+ok 1520 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
 
-expecting success of 0027.2181 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1521 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2181 - setup LF checkout  with -c core.eol=native
+ok 1521 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2182 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1522 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2182 - setup CRLF checkout  with -c core.eol=native
+ok 1522 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2183 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1523 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2183 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1523 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2184 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1524 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2184 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1524 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2185 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1525 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2185 - setup LF_nul checkout  with -c core.eol=native
+ok 1525 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2186 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=native': 
+expecting success of 0027.1526 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186585,70 +183189,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2186 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=native
+ok 1526 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.2187 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1527 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2187 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 1527 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2188 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1528 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2188 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 1528 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2189 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1529 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2189 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1529 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2190 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1530 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2190 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1530 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2191 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1531 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2191 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+ok 1531 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2192 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.1532 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2192 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
+ok 1532 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2193 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1533 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2193 - setup LF checkout  with -c core.eol=native
+ok 1533 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2194 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1534 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2194 - setup CRLF checkout  with -c core.eol=native
+ok 1534 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2195 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1535 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2195 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1535 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2196 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1536 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2196 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1536 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2197 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1537 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2197 - setup LF_nul checkout  with -c core.eol=native
+ok 1537 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2198 'ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native': 
+expecting success of 0027.1538 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186663,70 +183267,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2198 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native
+ok 1538 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.2199 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1539 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2199 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 1539 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2200 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1540 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2200 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 1540 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2201 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1541 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2201 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1541 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2202 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1542 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2202 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1542 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2203 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1543 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2203 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+ok 1543 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2204 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.1544 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2204 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
+ok 1544 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
 
-expecting success of 0027.2205 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1545 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2205 - setup LF checkout  with -c core.eol=native
+ok 1545 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2206 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1546 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2206 - setup CRLF checkout  with -c core.eol=native
+ok 1546 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2207 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1547 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2207 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1547 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2208 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1548 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2208 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1548 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2209 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1549 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2209 - setup LF_nul checkout  with -c core.eol=native
+ok 1549 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2210 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native': 
+expecting success of 0027.1550 'ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186741,70 +183345,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2210 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native
+ok 1550 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.2211 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1551 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 2211 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 1551 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2212 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1552 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2212 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 1552 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2213 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1553 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2213 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1553 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2214 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1554 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2214 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1554 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2215 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1555 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2215 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+ok 1555 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2216 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.1556 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2216 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
+ok 1556 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2217 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1557 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2217 - setup LF checkout  with -c core.eol=native
+ok 1557 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2218 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1558 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2218 - setup CRLF checkout  with -c core.eol=native
+ok 1558 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2219 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1559 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2219 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1559 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2220 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1560 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2220 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1560 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2221 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1561 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2221 - setup LF_nul checkout  with -c core.eol=native
+ok 1561 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2222 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=native': 
+expecting success of 0027.1562 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186819,70 +183423,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2222 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=native
+ok 1562 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.2223 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1563 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2223 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 1563 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2224 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1564 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2224 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 1564 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2225 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1565 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2225 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1565 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2226 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1566 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2226 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1566 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2227 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1567 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2227 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+ok 1567 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2228 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.1568 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2228 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
+ok 1568 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
 
-expecting success of 0027.2229 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1569 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2229 - setup LF checkout  with -c core.eol=native
+ok 1569 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2230 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1570 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2230 - setup CRLF checkout  with -c core.eol=native
+ok 1570 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2231 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1571 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2231 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1571 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2232 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1572 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2232 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1572 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2233 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1573 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2233 - setup LF_nul checkout  with -c core.eol=native
+ok 1573 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2234 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=native': 
+expecting success of 0027.1574 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186897,70 +183501,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2234 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=native
+ok 1574 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.2235 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1575 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 2235 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 1575 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2236 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1576 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2236 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 1576 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2237 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1577 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2237 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1577 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2238 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1578 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2238 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1578 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2239 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1579 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2239 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+ok 1579 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2240 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1580 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2240 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
+ok 1580 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2241 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1581 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2241 - setup LF checkout  with -c core.eol=native
+ok 1581 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2242 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1582 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2242 - setup CRLF checkout  with -c core.eol=native
+ok 1582 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2243 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1583 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2243 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1583 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2244 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1584 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2244 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1584 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2245 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1585 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2245 - setup LF_nul checkout  with -c core.eol=native
+ok 1585 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2246 'ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=native': 
+expecting success of 0027.1586 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -186975,70 +183579,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2246 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=native
+ok 1586 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf
 
-expecting success of 0027.2247 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1587 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2247 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 1587 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2248 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1588 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2248 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 1588 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2249 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1589 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2249 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1589 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2250 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1590 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2250 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1590 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2251 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1591 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2251 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 1591 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2252 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.1592 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2252 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
+ok 1592 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
 
-expecting success of 0027.2253 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1593 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2253 - setup LF checkout  with -c core.eol=native
+ok 1593 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2254 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1594 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2254 - setup CRLF checkout  with -c core.eol=native
+ok 1594 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2255 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1595 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2255 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1595 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2256 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1596 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2256 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1596 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2257 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1597 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2257 - setup LF_nul checkout  with -c core.eol=native
+ok 1597 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2258 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=native': 
+expecting success of 0027.1598 'ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187053,70 +183657,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2258 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=native
+ok 1598 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=lf
 
-expecting success of 0027.2259 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1599 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2259 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF
+ok 1599 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.2260 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1600 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2260 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 1600 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.2261 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1601 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2261 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1601 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2262 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1602 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2262 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1602 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2263 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1603 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2263 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+ok 1603 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.2264 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.1604 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2264 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
+ok 1604 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
 
-expecting success of 0027.2265 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1605 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2265 - setup LF checkout  with -c core.eol=native
+ok 1605 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2266 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1606 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2266 - setup CRLF checkout  with -c core.eol=native
+ok 1606 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2267 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1607 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2267 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1607 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2268 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1608 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2268 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1608 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2269 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1609 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2269 - setup LF_nul checkout  with -c core.eol=native
+ok 1609 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2270 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=native': 
+expecting success of 0027.1610 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187131,70 +183735,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2270 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=native
+ok 1610 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.2271 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1611 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2271 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 1611 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.2272 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1612 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2272 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 1612 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.2273 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1613 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2273 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1613 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2274 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1614 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2274 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1614 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2275 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1615 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2275 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+ok 1615 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.2276 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.1616 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2276 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
+ok 1616 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2277 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1617 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2277 - setup LF checkout  with -c core.eol=native
+ok 1617 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2278 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1618 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2278 - setup CRLF checkout  with -c core.eol=native
+ok 1618 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2279 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1619 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2279 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1619 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2280 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1620 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2280 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1620 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2281 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1621 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2281 - setup LF_nul checkout  with -c core.eol=native
+ok 1621 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2282 'ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native': 
+expecting success of 0027.1622 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187209,70 +183813,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2282 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native
+ok 1622 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.2283 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1623 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2283 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF
+ok 1623 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.2284 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1624 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2284 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 1624 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.2285 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1625 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2285 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1625 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2286 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1626 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2286 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1626 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2287 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1627 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2287 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+ok 1627 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.2288 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.1628 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2288 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
+ok 1628 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
 
-expecting success of 0027.2289 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1629 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2289 - setup LF checkout  with -c core.eol=native
+ok 1629 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2290 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1630 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2290 - setup CRLF checkout  with -c core.eol=native
+ok 1630 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2291 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1631 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2291 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1631 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2292 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1632 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2292 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1632 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2293 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1633 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2293 - setup LF_nul checkout  with -c core.eol=native
+ok 1633 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2294 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native': 
+expecting success of 0027.1634 'ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187287,70 +183891,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2294 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native
+ok 1634 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.2295 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1635 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 2295 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 1635 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.2296 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1636 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2296 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 1636 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.2297 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1637 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2297 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1637 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2298 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1638 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2298 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1638 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2299 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1639 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2299 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+ok 1639 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.2300 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.1640 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2300 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
+ok 1640 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2301 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1641 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2301 - setup LF checkout  with -c core.eol=native
+ok 1641 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2302 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1642 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2302 - setup CRLF checkout  with -c core.eol=native
+ok 1642 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2303 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1643 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2303 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1643 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2304 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1644 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2304 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1644 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2305 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1645 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2305 - setup LF_nul checkout  with -c core.eol=native
+ok 1645 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2306 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native': 
+expecting success of 0027.1646 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187365,70 +183969,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2306 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native
+ok 1646 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.2307 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1647 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2307 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF
+ok 1647 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.2308 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1648 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2308 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 1648 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.2309 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1649 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2309 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1649 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2310 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1650 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2310 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1650 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2311 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1651 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2311 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+ok 1651 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.2312 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.1652 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2312 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
+ok 1652 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
 
-expecting success of 0027.2313 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1653 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2313 - setup LF checkout  with -c core.eol=native
+ok 1653 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2314 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1654 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2314 - setup CRLF checkout  with -c core.eol=native
+ok 1654 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2315 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1655 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2315 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1655 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2316 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1656 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2316 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1656 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2317 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1657 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2317 - setup LF_nul checkout  with -c core.eol=native
+ok 1657 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2318 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=native': 
+expecting success of 0027.1658 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187443,70 +184047,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2318 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=native
+ok 1658 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.2319 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1659 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 2319 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 1659 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.2320 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1660 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2320 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 1660 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.2321 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1661 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2321 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1661 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2322 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1662 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2322 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1662 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2323 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1663 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2323 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+ok 1663 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.2324 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input': 
+expecting success of 0027.1664 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2324 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
+ok 1664 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2325 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1665 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2325 - setup LF checkout  with -c core.eol=native
+ok 1665 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2326 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1666 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2326 - setup CRLF checkout  with -c core.eol=native
+ok 1666 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2327 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1667 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2327 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1667 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2328 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1668 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2328 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1668 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2329 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1669 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2329 - setup LF_nul checkout  with -c core.eol=native
+ok 1669 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2330 'ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=native': 
+expecting success of 0027.1670 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187521,70 +184125,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2330 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=native
+ok 1670 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf
 
-expecting success of 0027.2331 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1671 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2331 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF
+ok 1671 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.2332 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1672 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2332 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 1672 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.2333 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1673 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2333 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1673 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2334 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1674 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2334 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1674 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2335 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1675 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2335 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+ok 1675 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.2336 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.1676 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2336 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
+ok 1676 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
 
-expecting success of 0027.2337 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1677 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2337 - setup LF checkout  with -c core.eol=native
+ok 1677 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2338 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1678 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2338 - setup CRLF checkout  with -c core.eol=native
+ok 1678 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2339 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1679 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2339 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1679 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2340 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1680 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2340 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1680 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2341 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1681 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2341 - setup LF_nul checkout  with -c core.eol=native
+ok 1681 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2342 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=native': 
+expecting success of 0027.1682 'ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187599,70 +184203,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2342 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=native
+ok 1682 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=lf
 
-expecting success of 0027.2343 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1683 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2343 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 1683 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2344 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1684 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2344 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 1684 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2345 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1685 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2345 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1685 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2346 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1686 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2346 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1686 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2347 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1687 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2347 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+ok 1687 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2348 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.1688 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2348 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
+ok 1688 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
 
-expecting success of 0027.2349 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1689 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2349 - setup LF checkout  with -c core.eol=native
+ok 1689 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2350 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1690 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2350 - setup CRLF checkout  with -c core.eol=native
+ok 1690 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2351 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1691 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2351 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1691 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2352 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1692 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2352 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1692 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2353 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1693 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2353 - setup LF_nul checkout  with -c core.eol=native
+ok 1693 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2354 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=native': 
+expecting success of 0027.1694 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187677,70 +184281,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2354 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=native
+ok 1694 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.2355 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1695 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2355 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 1695 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2356 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1696 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2356 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 1696 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2357 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1697 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2357 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1697 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2358 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1698 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2358 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1698 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2359 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1699 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2359 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+ok 1699 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2360 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.1700 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2360 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
+ok 1700 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2361 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1701 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2361 - setup LF checkout  with -c core.eol=native
+ok 1701 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2362 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1702 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2362 - setup CRLF checkout  with -c core.eol=native
+ok 1702 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2363 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1703 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2363 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1703 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2364 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1704 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2364 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1704 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2365 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1705 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2365 - setup LF_nul checkout  with -c core.eol=native
+ok 1705 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2366 'ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=native': 
+expecting success of 0027.1706 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187755,70 +184359,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2366 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=native
+ok 1706 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.2367 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1707 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2367 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 1707 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2368 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1708 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2368 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 1708 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2369 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1709 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2369 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1709 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2370 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1710 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2370 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1710 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2371 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1711 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2371 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+ok 1711 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2372 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.1712 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2372 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
+ok 1712 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
 
-expecting success of 0027.2373 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1713 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2373 - setup LF checkout  with -c core.eol=native
+ok 1713 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2374 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1714 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2374 - setup CRLF checkout  with -c core.eol=native
+ok 1714 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2375 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1715 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2375 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1715 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2376 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1716 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2376 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1716 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2377 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1717 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2377 - setup LF_nul checkout  with -c core.eol=native
+ok 1717 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2378 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=native': 
+expecting success of 0027.1718 'ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187833,70 +184437,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2378 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=native
+ok 1718 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.2379 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1719 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 2379 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 1719 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2380 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1720 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2380 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 1720 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2381 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1721 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2381 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1721 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2382 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1722 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2382 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1722 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2383 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1723 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2383 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+ok 1723 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2384 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.1724 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2384 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input
+ok 1724 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2385 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1725 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2385 - setup LF checkout  with -c core.eol=native
+ok 1725 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2386 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1726 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2386 - setup CRLF checkout  with -c core.eol=native
+ok 1726 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2387 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1727 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2387 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1727 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2388 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1728 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2388 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1728 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2389 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1729 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2389 - setup LF_nul checkout  with -c core.eol=native
+ok 1729 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2390 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=native': 
+expecting success of 0027.1730 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187911,70 +184515,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2390 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=native
+ok 1730 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.2391 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1731 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2391 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 1731 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2392 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1732 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2392 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 1732 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2393 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1733 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2393 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1733 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2394 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1734 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2394 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1734 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2395 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1735 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2395 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+ok 1735 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2396 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.1736 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2396 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
+ok 1736 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input
 
-expecting success of 0027.2397 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1737 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2397 - setup LF checkout  with -c core.eol=native
+ok 1737 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2398 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1738 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2398 - setup CRLF checkout  with -c core.eol=native
+ok 1738 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2399 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1739 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2399 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1739 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2400 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1740 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2400 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1740 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2401 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1741 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2401 - setup LF_nul checkout  with -c core.eol=native
+ok 1741 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2402 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=native': 
+expecting success of 0027.1742 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -187989,70 +184593,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2402 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=native
+ok 1742 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.2403 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1743 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 2403 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 1743 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2404 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1744 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2404 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 1744 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2405 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1745 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2405 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1745 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2406 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1746 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2406 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1746 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2407 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1747 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2407 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+ok 1747 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2408 'setup config for checkout attr= ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1748 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2408 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
+ok 1748 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2409 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1749 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2409 - setup LF checkout  with -c core.eol=native
+ok 1749 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2410 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1750 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2410 - setup CRLF checkout  with -c core.eol=native
+ok 1750 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2411 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1751 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2411 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1751 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2412 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1752 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2412 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1752 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2413 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1753 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2413 - setup LF_nul checkout  with -c core.eol=native
+ok 1753 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2414 'ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native': 
+expecting success of 0027.1754 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188067,70 +184671,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2414 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native
+ok 1754 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.2415 'checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1755 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2415 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 1755 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2416 'checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1756 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2416 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 1756 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2417 'checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1757 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2417 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1757 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2418 'checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1758 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2418 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1758 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2419 'checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1759 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2419 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 1759 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2420 'setup config for checkout attr= ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1760 'setup config for checkout attr= ident=ident aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2420 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
+ok 1760 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
 
-expecting success of 0027.2421 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1761 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2421 - setup LF checkout  with -c core.eol=native
+ok 1761 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2422 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1762 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2422 - setup CRLF checkout  with -c core.eol=native
+ok 1762 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2423 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1763 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2423 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1763 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2424 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1764 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2424 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1764 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2425 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1765 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2425 - setup LF_nul checkout  with -c core.eol=native
+ok 1765 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2426 'ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native': 
+expecting success of 0027.1766 'ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188145,70 +184749,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2426 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native
+ok 1766 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=lf
 
-expecting success of 0027.2427 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1767 'checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
 	
-ok 2427 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF
+ok 1767 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.2428 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1768 'checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2428 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 1768 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.2429 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1769 'checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2429 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1769 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2430 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1770 'checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2430 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1770 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2431 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1771 'checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2431 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 1771 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.2432 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1772 'setup config for checkout attr= ident=ident aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2432 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
+ok 1772 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
 
-expecting success of 0027.2433 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1773 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2433 - setup LF checkout  with -c core.eol=native
+ok 1773 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2434 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1774 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2434 - setup CRLF checkout  with -c core.eol=native
+ok 1774 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2435 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1775 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2435 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1775 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2436 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1776 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2436 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1776 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2437 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1777 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2437 - setup LF_nul checkout  with -c core.eol=native
+ok 1777 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2438 'ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=native': 
+expecting success of 0027.1778 'ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188223,70 +184827,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2438 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=native
+ok 1778 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=lf
 
-expecting success of 0027.2439 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1779 'checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
 	
-ok 2439 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF
+ok 1779 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2440 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1780 'checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2440 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 1780 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2441 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1781 'checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2441 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1781 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2442 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1782 'checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2442 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1782 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2443 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1783 'checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2443 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 1783 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2444 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.1784 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2444 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
+ok 1784 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
 
-expecting success of 0027.2445 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1785 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2445 - setup LF checkout  with -c core.eol=native
+ok 1785 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2446 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1786 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2446 - setup CRLF checkout  with -c core.eol=native
+ok 1786 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2447 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1787 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2447 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1787 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2448 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1788 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2448 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1788 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2449 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1789 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2449 - setup LF_nul checkout  with -c core.eol=native
+ok 1789 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2450 'ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native': 
+expecting success of 0027.1790 'ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188301,70 +184905,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2450 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native
+ok 1790 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=lf
 
-expecting success of 0027.2451 'checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1791 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2451 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF
+ok 1791 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2452 'checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1792 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2452 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 1792 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2453 'checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1793 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2453 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1793 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2454 'checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1794 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2454 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1794 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2455 'checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1795 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2455 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 1795 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2456 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=input': 
+expecting success of 0027.1796 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2456 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
+ok 1796 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
 
-expecting success of 0027.2457 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1797 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2457 - setup LF checkout  with -c core.eol=native
+ok 1797 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2458 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1798 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2458 - setup CRLF checkout  with -c core.eol=native
+ok 1798 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2459 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1799 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2459 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1799 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2460 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1800 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2460 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1800 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2461 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1801 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2461 - setup LF_nul checkout  with -c core.eol=native
+ok 1801 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2462 'ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=native': 
+expecting success of 0027.1802 'ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188379,70 +184983,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2462 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=native
+ok 1802 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=lf
 
-expecting success of 0027.2463 'checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1803 'checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2463 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF
+ok 1803 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2464 'checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1804 'checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2464 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 1804 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2465 'checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1805 'checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2465 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1805 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2466 'checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1806 'checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2466 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1806 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2467 'checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1807 'checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2467 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+ok 1807 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2468 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input': 
+expecting success of 0027.1808 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2468 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
+ok 1808 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
 
-expecting success of 0027.2469 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1809 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2469 - setup LF checkout  with -c core.eol=native
+ok 1809 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2470 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1810 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2470 - setup CRLF checkout  with -c core.eol=native
+ok 1810 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2471 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1811 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2471 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1811 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2472 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1812 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2472 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1812 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2473 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1813 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2473 - setup LF_nul checkout  with -c core.eol=native
+ok 1813 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2474 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native': 
+expecting success of 0027.1814 'ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188457,70 +185061,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2474 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native
+ok 1814 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=lf
 
-expecting success of 0027.2475 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1815 'checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 2475 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF
+ok 1815 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2476 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1816 'checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2476 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 1816 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2477 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1817 'checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2477 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1817 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2478 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1818 'checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2478 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1818 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2479 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1819 'checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2479 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+ok 1819 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2480 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1820 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2480 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 1820 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
 
-expecting success of 0027.2481 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1821 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2481 - setup LF checkout  with -c core.eol=crlf
+ok 1821 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2482 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1822 'setup CRLF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2482 - setup CRLF checkout  with -c core.eol=crlf
+ok 1822 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2483 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.1823 'setup LF_mix_CR checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2483 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1823 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2484 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.1824 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2484 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1824 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2485 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.1825 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2485 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1825 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2486 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf': 
+expecting success of 0027.1826 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=lf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188535,70 +185139,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2486 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf
+ok 1826 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=lf
 
-expecting success of 0027.2487 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1827 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 2487 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 1827 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2488 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1828 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2488 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 1828 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2489 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1829 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2489 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 1829 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2490 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1830 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2490 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1830 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2491 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1831 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2491 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1831 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2492 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1832 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2492 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 1832 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
 
-expecting success of 0027.2493 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1833 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2493 - setup LF checkout  with -c core.eol=lf
+ok 1833 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2494 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1834 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2494 - setup CRLF checkout  with -c core.eol=lf
+ok 1834 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2495 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1835 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2495 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1835 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2496 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1836 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2496 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1836 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2497 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1837 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2497 - setup LF_nul checkout  with -c core.eol=lf
+ok 1837 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2498 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf': 
+expecting success of 0027.1838 'ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188613,70 +185217,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2498 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf
+ok 1838 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.2499 'checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1839 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2499 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF
+ok 1839 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.2500 'checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1840 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2500 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+ok 1840 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.2501 'checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1841 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2501 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 1841 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.2502 'checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1842 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2502 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 1842 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.2503 'checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1843 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2503 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
+ok 1843 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2504 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1844 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2504 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 1844 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
 
-expecting success of 0027.2505 'setup LF checkout ': 
+expecting success of 0027.1845 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2505 - setup LF checkout 
+ok 1845 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2506 'setup CRLF checkout ': 
+expecting success of 0027.1846 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2506 - setup CRLF checkout 
+ok 1846 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2507 'setup LF_mix_CR checkout ': 
+expecting success of 0027.1847 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2507 - setup LF_mix_CR checkout 
+ok 1847 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2508 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.1848 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2508 - setup CRLF_mix_LF checkout 
+ok 1848 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2509 'setup LF_nul checkout ': 
+expecting success of 0027.1849 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2509 - setup LF_nul checkout 
+ok 1849 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2510 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=': 
+expecting success of 0027.1850 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188691,70 +185295,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2510 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=
+ok 1850 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.2511 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF': 
-		compare_ws_file eol__crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1851 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2511 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF
+ok 1851 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.2512 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1852 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2512 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF
+ok 1852 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.2513 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1853 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2513 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 1853 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.2514 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1854 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2514 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+ok 1854 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.2515 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1855 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2515 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_nul
+ok 1855 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2516 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1856 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2516 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 1856 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2517 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1857 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2517 - setup LF checkout  with -c core.eol=native
+ok 1857 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2518 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1858 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2518 - setup CRLF checkout  with -c core.eol=native
+ok 1858 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2519 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1859 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2519 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1859 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2520 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1860 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2520 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1860 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2521 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1861 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2521 - setup LF_nul checkout  with -c core.eol=native
+ok 1861 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2522 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=native': 
+expecting success of 0027.1862 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188769,70 +185373,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2522 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=native
+ok 1862 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.2523 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1863 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2523 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 1863 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.2524 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1864 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2524 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 1864 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.2525 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1865 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2525 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1865 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.2526 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1866 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2526 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1866 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.2527 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1867 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2527 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 1867 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2528 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1868 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2528 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false
+ok 1868 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
 
-expecting success of 0027.2529 'setup LF checkout ': 
+expecting success of 0027.1869 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2529 - setup LF checkout 
+ok 1869 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2530 'setup CRLF checkout ': 
+expecting success of 0027.1870 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2530 - setup CRLF checkout 
+ok 1870 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2531 'setup LF_mix_CR checkout ': 
+expecting success of 0027.1871 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2531 - setup LF_mix_CR checkout 
+ok 1871 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2532 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.1872 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2532 - setup CRLF_mix_LF checkout 
+ok 1872 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2533 'setup LF_nul checkout ': 
+expecting success of 0027.1873 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2533 - setup LF_nul checkout 
+ok 1873 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2534 'ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=': 
+expecting success of 0027.1874 'ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188847,70 +185451,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2534 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=
+ok 1874 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.2535 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF': 
-		compare_ws_file eol__crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1875 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
 	
-ok 2535 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF
+ok 1875 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.2536 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1876 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2536 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF
+ok 1876 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.2537 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1877 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2537 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 1877 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.2538 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1878 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2538 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+ok 1878 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.2539 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1879 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2539 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_nul
+ok 1879 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2540 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1880 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2540 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false
+ok 1880 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2541 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.1881 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2541 - setup LF checkout  with -c core.eol=native
+ok 1881 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2542 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.1882 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2542 - setup CRLF checkout  with -c core.eol=native
+ok 1882 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2543 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.1883 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2543 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1883 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2544 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.1884 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2544 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1884 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2545 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.1885 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2545 - setup LF_nul checkout  with -c core.eol=native
+ok 1885 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2546 'ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=native': 
+expecting success of 0027.1886 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -188925,70 +185529,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2546 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=native
+ok 1886 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.2547 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1887 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2547 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 1887 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.2548 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1888 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2548 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 1888 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.2549 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1889 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2549 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1889 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.2550 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1890 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2550 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1890 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.2551 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1891 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2551 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 1891 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2552 'setup config for checkout attr= ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.1892 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2552 - setup config for checkout attr= ident=ident aeol=lf core.autocrlf=false
+ok 1892 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
 
-expecting success of 0027.2553 'setup LF checkout ': 
+expecting success of 0027.1893 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2553 - setup LF checkout 
+ok 1893 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2554 'setup CRLF checkout ': 
+expecting success of 0027.1894 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2554 - setup CRLF checkout 
+ok 1894 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2555 'setup LF_mix_CR checkout ': 
+expecting success of 0027.1895 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2555 - setup LF_mix_CR checkout 
+ok 1895 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2556 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.1896 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2556 - setup CRLF_mix_LF checkout 
+ok 1896 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2557 'setup LF_nul checkout ': 
+expecting success of 0027.1897 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2557 - setup LF_nul checkout 
+ok 1897 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2558 'ls-files --eol attr= ident aeol=lf core.autocrlf=false core.eol=': 
+expecting success of 0027.1898 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -189003,70 +185607,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2558 - ls-files --eol attr= ident aeol=lf core.autocrlf=false core.eol=
+ok 1898 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.2559 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF': 
-		compare_ws_file eol__crlf_false_attr__ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1899 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-ok 2559 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF
+ok 1899 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.2560 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1900 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2560 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF
+ok 1900 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.2561 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1901 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2561 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 1901 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.2562 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1902 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2562 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_mix_CR
+ok 1902 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.2563 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1903 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2563 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_nul
+ok 1903 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2564 'setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.1904 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2564 - setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=false
+ok 1904 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2565 'setup LF checkout ': 
+expecting success of 0027.1905 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2565 - setup LF checkout 
+ok 1905 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2566 'setup CRLF checkout ': 
+expecting success of 0027.1906 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2566 - setup CRLF checkout 
+ok 1906 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2567 'setup LF_mix_CR checkout ': 
+expecting success of 0027.1907 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2567 - setup LF_mix_CR checkout 
+ok 1907 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2568 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.1908 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2568 - setup CRLF_mix_LF checkout 
+ok 1908 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2569 'setup LF_nul checkout ': 
+expecting success of 0027.1909 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2569 - setup LF_nul checkout 
+ok 1909 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2570 'ls-files --eol attr= ident aeol=crlf core.autocrlf=false core.eol=': 
+expecting success of 0027.1910 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -189081,70 +185685,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2570 - ls-files --eol attr= ident aeol=crlf core.autocrlf=false core.eol=
+ok 1910 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf
 
-expecting success of 0027.2571 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF': 
-		compare_ws_file eol__crlf_false_attr__ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1911 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 2571 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF
+ok 1911 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
-expecting success of 0027.2572 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1912 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2572 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF
+ok 1912 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.2573 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_false_attr__ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1913 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2573 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 1913 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.2574 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_false_attr__ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1914 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2574 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_mix_CR
+ok 1914 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.2575 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_false_attr__ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1915 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2575 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_nul
+ok 1915 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2576 'setup config for checkout attr= ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.1916 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2576 - setup config for checkout attr= ident=ident aeol=lf core.autocrlf=true
+ok 1916 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
 
-expecting success of 0027.2577 'setup LF checkout ': 
+expecting success of 0027.1917 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2577 - setup LF checkout 
+ok 1917 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2578 'setup CRLF checkout ': 
+expecting success of 0027.1918 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2578 - setup CRLF checkout 
+ok 1918 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2579 'setup LF_mix_CR checkout ': 
+expecting success of 0027.1919 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2579 - setup LF_mix_CR checkout 
+ok 1919 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2580 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.1920 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2580 - setup CRLF_mix_LF checkout 
+ok 1920 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2581 'setup LF_nul checkout ': 
+expecting success of 0027.1921 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2581 - setup LF_nul checkout 
+ok 1921 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2582 'ls-files --eol attr= ident aeol=lf core.autocrlf=true core.eol=': 
+expecting success of 0027.1922 'ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -189159,70 +185763,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2582 - ls-files --eol attr= ident aeol=lf core.autocrlf=true core.eol=
+ok 1922 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.2583 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF': 
-		compare_ws_file eol__crlf_true_attr__ LF    crlf_false_attr__LF.txt
+expecting success of 0027.1923 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2583 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF
+ok 1923 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.2584 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1924 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2584 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF
+ok 1924 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.2585 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1925 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2585 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF_mix_LF
+ok 1925 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.2586 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1926 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2586 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_mix_CR
+ok 1926 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.2587 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1927 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2587 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_nul
+ok 1927 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.2588 'setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.1928 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2588 - setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=true
+ok 1928 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
 
-expecting success of 0027.2589 'setup LF checkout ': 
+expecting success of 0027.1929 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2589 - setup LF checkout 
+ok 1929 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2590 'setup CRLF checkout ': 
+expecting success of 0027.1930 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2590 - setup CRLF checkout 
+ok 1930 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2591 'setup LF_mix_CR checkout ': 
+expecting success of 0027.1931 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2591 - setup LF_mix_CR checkout 
+ok 1931 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2592 'setup CRLF_mix_LF checkout ': 
+expecting success of 0027.1932 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2592 - setup CRLF_mix_LF checkout 
+ok 1932 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2593 'setup LF_nul checkout ': 
+expecting success of 0027.1933 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2593 - setup LF_nul checkout 
+ok 1933 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2594 'ls-files --eol attr= ident aeol=crlf core.autocrlf=true core.eol=': 
+expecting success of 0027.1934 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -189237,1755 +185841,5155 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2594 - ls-files --eol attr= ident aeol=crlf core.autocrlf=true core.eol=
+ok 1934 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf
 
-expecting success of 0027.2595 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.1935 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-ok 2595 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF
+ok 1935 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 0027.2596 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.1936 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 2596 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF
+ok 1936 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 0027.2597 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.1937 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 2597 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF
+ok 1937 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.2598 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_true_attr__ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.1938 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 2598 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR
+ok 1938 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.2599 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_true_attr__ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.1939 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 2599 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_nul
-
-expecting success of 0027.2600 'ls-files --eol -d -z': 
-	rm crlf_false_attr__CRLF.txt crlf_false_attr__CRLF_mix_LF.txt crlf_false_attr__LF.txt .gitattributes &&
-	cat >expect <<-\EOF &&
-	i/crlf w/ crlf_false_attr__CRLF.txt
-	i/lf w/ .gitattributes
-	i/lf w/ crlf_false_attr__LF.txt
-	i/mixed w/ crlf_false_attr__CRLF_mix_LF.txt
-	EOF
-	git ls-files --eol -d >tmp &&
-	sed -e "s!attr/[^	]*!!g" -e "s/	/ /g" -e "s/  */ /g" tmp |
-	sort >actual &&
-	test_cmp expect actual
+ok 1939 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
-ok 2600 - ls-files --eol -d -z
+expecting success of 0027.1940 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1940 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
 
-# passed all 2600 test(s)
-1..2600
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3702-add-edit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3702-add-edit/.git/
-expecting success of 3702.1 'setup': 
+expecting success of 0027.1941 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1941 - setup LF checkout  with -c core.eol=crlf
 
-	git add file &&
-	test_tick &&
-	git commit -m initial file
+expecting success of 0027.1942 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1942 - setup CRLF checkout  with -c core.eol=crlf
 
+expecting success of 0027.1943 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1943 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-[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 0027.1944 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1944 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 3702.2 'add -e': 
+expecting success of 0027.1945 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1945 - setup LF_nul checkout  with -c core.eol=crlf
 
-	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 0027.1946 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1946 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf
 
+expecting success of 0027.1947 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1947 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
-ok 2 - add -e
+expecting success of 0027.1948 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1948 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
-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 0027.1949 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1949 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-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 0027.1950 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1950 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3703-add-magic-pathspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3703-add-magic-pathspec/.git/
-expecting success of 3703.1 'setup': 
-	mkdir sub anothersub &&
-	: >sub/foo &&
-	: >anothersub/foo
+expecting success of 0027.1951 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1951 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
-ok 1 - setup
+expecting success of 0027.1952 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1952 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
 
-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 0027.1953 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1953 - setup LF checkout  with -c core.eol=crlf
 
-ok 2 - add :/
+expecting success of 0027.1954 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1954 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 3703.3 'add :/anothersub': 
-	(cd sub && git add -n :/anothersub >actual) &&
-	test_cmp expected sub/actual
+expecting success of 0027.1955 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1955 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-ok 3 - add :/anothersub
+expecting success of 0027.1956 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1956 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 3703.4 'add :/non-existent': 
-	(cd sub && test_must_fail git add -n :/non-existent)
+expecting success of 0027.1957 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1957 - setup LF_nul checkout  with -c core.eol=crlf
 
-fatal: pathspec ':/non-existent' did not match any files
-ok 4 - add :/non-existent
+expecting success of 0027.1958 'ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1958 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=crlf
 
-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 0027.1959 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1959 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
-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 0027.1960 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1960 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
-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 0027.1961 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1961 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-fatal: pathspec ':/bar' did not match any files
-add ':/bar'
-ok 6 - a file with the same (short) magic name exists
+expecting success of 0027.1962 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1962 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3704-add-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 0027.1963 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1963 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
-[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 0027.1964 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1964 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
 
-expecting success of 3704.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
+expecting success of 0027.1965 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1965 - setup LF checkout  with -c core.eol=crlf
 
-	echo fileA.t | git add --pathspec-from-file=- &&
+expecting success of 0027.1966 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1966 - setup CRLF checkout  with -c core.eol=crlf
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	EOF
-	verify_expect
+expecting success of 0027.1967 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1967 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-ok 2 - --pathspec-from-file from stdin
+expecting success of 0027.1968 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1968 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 3704.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
+expecting success of 0027.1969 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1969 - setup LF_nul checkout  with -c core.eol=crlf
 
-	echo fileA.t >list &&
-	git add --pathspec-from-file=list &&
+expecting success of 0027.1970 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1970 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	EOF
-	verify_expect
+expecting success of 0027.1971 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1971 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
-ok 3 - --pathspec-from-file from file
+expecting success of 0027.1972 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1972 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 3704.4 'NUL delimiters': 
-	restore_checkpoint &&
+expecting success of 0027.1973 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1973 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-	printf "fileA.t\0fileB.t\0" | git add --pathspec-from-file=- --pathspec-file-nul &&
+expecting success of 0027.1974 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1974 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+expecting success of 0027.1975 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1975 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
-ok 4 - NUL delimiters
+expecting success of 0027.1976 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1976 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
 
-expecting success of 3704.5 'LF delimiters': 
-	restore_checkpoint &&
+expecting success of 0027.1977 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1977 - setup LF checkout  with -c core.eol=crlf
 
-	printf "fileA.t\nfileB.t\n" | git add --pathspec-from-file=- &&
+expecting success of 0027.1978 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1978 - setup CRLF checkout  with -c core.eol=crlf
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+expecting success of 0027.1979 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1979 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-ok 5 - LF delimiters
+expecting success of 0027.1980 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1980 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 3704.6 'no trailing delimiter': 
-	restore_checkpoint &&
+expecting success of 0027.1981 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1981 - setup LF_nul checkout  with -c core.eol=crlf
 
-	printf "fileA.t\nfileB.t" | git add --pathspec-from-file=- &&
+expecting success of 0027.1982 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1982 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+expecting success of 0027.1983 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1983 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
-ok 6 - no trailing delimiter
+expecting success of 0027.1984 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1984 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 3704.7 'CRLF delimiters': 
-	restore_checkpoint &&
+expecting success of 0027.1985 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1985 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-	printf "fileA.t\r\nfileB.t\r\n" | git add --pathspec-from-file=- &&
+expecting success of 0027.1986 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1986 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+expecting success of 0027.1987 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1987 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
-ok 7 - CRLF delimiters
+expecting success of 0027.1988 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 1988 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
 
-expecting success of 3704.8 'quotes': 
-	restore_checkpoint &&
+expecting success of 0027.1989 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1989 - setup LF checkout  with -c core.eol=crlf
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+expecting success of 0027.1990 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1990 - setup CRLF checkout  with -c core.eol=crlf
 
-	git add --pathspec-from-file=list &&
+expecting success of 0027.1991 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1991 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	EOF
-	verify_expect
+expecting success of 0027.1992 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1992 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-ok 8 - quotes
+expecting success of 0027.1993 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 1993 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 3704.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
+expecting success of 0027.1994 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1994 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+expecting success of 0027.1995 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1995 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
-	test_must_fail git add --pathspec-from-file=list --pathspec-file-nul
+expecting success of 0027.1996 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1996 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
-fatal: pathspec '"file\101.t"
-' did not match any files
-ok 9 - quotes not compatible with --pathspec-file-nul
+expecting success of 0027.1997 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1997 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 3704.10 'only touches what was listed': 
-	restore_checkpoint &&
+expecting success of 0027.1998 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1998 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-	printf "fileB.t\nfileC.t\n" | git add --pathspec-from-file=- &&
+expecting success of 0027.1999 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1999 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
-	cat >expect <<-\EOF &&
-	A  fileB.t
-	A  fileC.t
-	EOF
-	verify_expect
+expecting success of 0027.2000 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2000 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
 
-ok 10 - only touches what was listed
+expecting success of 0027.2001 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2001 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 3704.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-	>empty_list &&
+expecting success of 0027.2002 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2002 - setup CRLF checkout  with -c core.eol=crlf
 
-	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 0027.2003 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2003 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-	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 0027.2004 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2004 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-	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 0027.2005 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2005 - setup LF_nul checkout  with -c core.eol=crlf
 
-	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 0027.2006 'ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2006 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=crlf
 
-	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 0027.2007 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2007 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF
 
-	# 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 0027.2008 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2008 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-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 0027.2009 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2009 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3700-add.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/.git/
-expecting success of 3700.1 'Test of git add': 
-	touch foo && git add foo
+expecting success of 0027.2010 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2010 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-ok 1 - Test of git add
+expecting success of 0027.2011 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2011 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 3700.2 'Test with no pathspecs': 
-	cat >expect <<-EOF &&
-	Nothing specified, nothing added.
-	hint: Maybe you wanted to say ${SQ}git add .${SQ}?
-	hint: Disable this message with "git config advice.addEmptyPathspec false"
-	EOF
-	git add 2>actual &&
-	test_cmp expect actual
+expecting success of 0027.2012 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2012 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
 
-ok 2 - Test with no pathspecs
+expecting success of 0027.2013 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2013 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 3700.3 'Post-check that foo is in the index': 
-	git ls-files foo | grep foo
+expecting success of 0027.2014 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2014 - setup CRLF checkout  with -c core.eol=crlf
 
-foo
-ok 3 - Post-check that foo is in the index
+expecting success of 0027.2015 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2015 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 3700.4 'Test that "git add -- -q" works': 
-	touch -- -q && git add -- -q
+expecting success of 0027.2016 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2016 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-ok 4 - Test that "git add -- -q" works
+expecting success of 0027.2017 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2017 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 3700.5 'git add: core.fsyncmethod=batch': 
-	test_create_unique_files 2 4 files_base_dir1 &&
-	GIT_TEST_FSYNC=1 git -c core.fsync=loose-object -c core.fsyncmethod=batch add -- ./files_base_dir1/ &&
-	git ls-files --stage files_base_dir1/ |
-	test_parse_ls_files_stage_oids >added_files_oids &&
+expecting success of 0027.2018 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2018 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf
 
-	# We created 2 subdirs with 4 files each (8 files total) above
-	test_line_count = 8 added_files_oids &&
-	git cat-file --batch-check='%(objectname)' <added_files_oids >added_files_actual &&
-	test_cmp added_files_oids added_files_actual
+expecting success of 0027.2019 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2019 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
-ok 5 - git add: core.fsyncmethod=batch
+expecting success of 0027.2020 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2020 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 3700.6 'git update-index: core.fsyncmethod=batch': 
-	test_create_unique_files 2 4 files_base_dir2 &&
-	find files_base_dir2 ! -type d -print | xargs git -c core.fsync=loose-object -c core.fsyncmethod=batch update-index --add -- &&
-	git ls-files --stage files_base_dir2 |
-	test_parse_ls_files_stage_oids >added_files2_oids &&
+expecting success of 0027.2021 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2021 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-	# We created 2 subdirs with 4 files each (8 files total) above
-	test_line_count = 8 added_files2_oids &&
-	git cat-file --batch-check='%(objectname)' <added_files2_oids >added_files2_actual &&
-	test_cmp added_files2_oids added_files2_actual
+expecting success of 0027.2022 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2022 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-ok 6 - git update-index: core.fsyncmethod=batch
+expecting success of 0027.2023 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2023 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 3700.7 'git add: Test that executable bit is not used if core.filemode=0': git config core.filemode 0 &&
-	 echo foo >xfoo1 &&
-	 chmod 755 xfoo1 &&
-	 git add xfoo1 &&
-	 test_mode_in_index 100644 xfoo1
-pass
-ok 7 - git add: Test that executable bit is not used if core.filemode=0
+expecting success of 0027.2024 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2024 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
 
-expecting success of 3700.8 'git add: filemode=0 should not get confused by symlink': 
-	rm -f xfoo1 &&
-	test_ln_s_add foo xfoo1 &&
-	test_mode_in_index 120000 xfoo1
+expecting success of 0027.2025 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2025 - setup LF checkout  with -c core.eol=crlf
 
-checking prerequisite: SYMLINKS
+expecting success of 0027.2026 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2026 - setup CRLF checkout  with -c core.eol=crlf
 
-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 0027.2027 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2027 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-)
-prerequisite SYMLINKS ok
-pass
-ok 8 - git add: filemode=0 should not get confused by symlink
+expecting success of 0027.2028 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2028 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 3700.9 'git update-index --add: Test that executable bit is not used...': git config core.filemode 0 &&
-	 echo foo >xfoo2 &&
-	 chmod 755 xfoo2 &&
-	 git update-index --add xfoo2 &&
-	 test_mode_in_index 100644 xfoo2
-pass
-ok 9 - git update-index --add: Test that executable bit is not used...
+expecting success of 0027.2029 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2029 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 3700.10 'git add: filemode=0 should not get confused by symlink': 
-	rm -f xfoo2 &&
-	test_ln_s_add foo xfoo2 &&
-	test_mode_in_index 120000 xfoo2
+expecting success of 0027.2030 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2030 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf
 
-pass
-ok 10 - git add: filemode=0 should not get confused by symlink
+expecting success of 0027.2031 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2031 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 3700.11 'git update-index --add: Test that executable bit is not used...': git config core.filemode 0 &&
-	 test_ln_s_add xfoo2 xfoo3 &&	# runs git update-index --add
-	 test_mode_in_index 120000 xfoo3
-pass
-ok 11 - git update-index --add: Test that executable bit is not used...
+expecting success of 0027.2032 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2032 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 3700.12 '.gitignore test setup': 
-	echo "*.ig" >.gitignore &&
-	mkdir c.if d.ig &&
-	>a.ig && >b.if &&
-	>c.if/c.if && >c.if/c.ig &&
-	>d.ig/d.if && >d.ig/d.ig
+expecting success of 0027.2033 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2033 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-ok 12 - .gitignore test setup
+expecting success of 0027.2034 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2034 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 3700.13 '.gitignore is honored': 
-	git add . &&
-	git ls-files >files &&
-	sed -n "/\\.ig/p" <files >actual &&
-	test_must_be_empty actual
+expecting success of 0027.2035 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2035 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
-ok 13 - .gitignore is honored
+expecting success of 0027.2036 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2036 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
 
-expecting success of 3700.14 'error out when attempting to add ignored ones without -f': 
-	test_must_fail git add a.?? &&
-	git ls-files >files &&
-	sed -n "/\\.ig/p" <files >actual &&
-	test_must_be_empty actual
+expecting success of 0027.2037 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2037 - setup LF checkout  with -c core.eol=crlf
 
-The following paths are ignored by one of your .gitignore files:
-a.ig
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 14 - error out when attempting to add ignored ones without -f
+expecting success of 0027.2038 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2038 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 3700.15 'error out when attempting to add ignored ones without -f': 
-	test_must_fail git add d.?? &&
-	git ls-files >files &&
-	sed -n "/\\.ig/p" <files >actual &&
-	test_must_be_empty actual
+expecting success of 0027.2039 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2039 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-The following paths are ignored by one of your .gitignore files:
-d.ig
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 15 - error out when attempting to add ignored ones without -f
+expecting success of 0027.2040 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2040 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 3700.16 'error out when attempting to add ignored ones but add others': 
-	touch a.if &&
-	test_must_fail git add a.?? &&
-	git ls-files >files &&
-	sed -n "/\\.ig/p" <files >actual &&
-	test_must_be_empty actual &&
-	grep a.if files
+expecting success of 0027.2041 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2041 - setup LF_nul checkout  with -c core.eol=crlf
 
-The following paths are ignored by one of your .gitignore files:
-a.ig
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-a.if
-ok 16 - error out when attempting to add ignored ones but add others
+expecting success of 0027.2042 'ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2042 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf
 
-expecting success of 3700.17 'add ignored ones with -f': 
-	git add -f a.?? &&
-	git ls-files --error-unmatch a.ig
+expecting success of 0027.2043 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 2043 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
-a.ig
-ok 17 - add ignored ones with -f
+expecting success of 0027.2044 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2044 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 3700.18 'add ignored ones with -f': 
-	git add -f d.??/* &&
-	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
+expecting success of 0027.2045 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2045 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-d.ig/d.if
-d.ig/d.ig
-ok 18 - add ignored ones with -f
+expecting success of 0027.2046 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2046 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 3700.19 'add ignored ones with -f': 
-	rm -f .git/index &&
-	git add -f d.?? &&
-	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
+expecting success of 0027.2047 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2047 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
-d.ig/d.if
-d.ig/d.ig
-ok 19 - add ignored ones with -f
+expecting success of 0027.2048 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2048 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
 
-expecting success of 3700.20 '.gitignore with subdirectory': 
+expecting success of 0027.2049 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2049 - setup LF checkout  with -c core.eol=crlf
 
-	rm -f .git/index &&
-	mkdir -p sub/dir &&
-	echo "!dir/a.*" >sub/.gitignore &&
-	>sub/a.ig &&
-	>sub/dir/a.ig &&
-	git add sub/dir &&
-	git ls-files --error-unmatch sub/dir/a.ig &&
-	rm -f .git/index &&
-	(
-		cd sub/dir &&
-		git add .
-	) &&
-	git ls-files --error-unmatch sub/dir/a.ig
+expecting success of 0027.2050 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2050 - setup CRLF checkout  with -c core.eol=crlf
 
-sub/dir/a.ig
-sub/dir/a.ig
-ok 20 - .gitignore with subdirectory
+expecting success of 0027.2051 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2051 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 3700.21 'check correct prefix detection': 
-	rm -f .git/index &&
-	git add 1/2/a 1/3/b 1/2/c
+expecting success of 0027.2052 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2052 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-ok 21 - check correct prefix detection
+expecting success of 0027.2053 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2053 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 3700.22 'git add with filemode=0, symlinks=0, and unmerged entries': 
-	for s in 1 2 3
-	do
-		echo $s > stage$s &&
-		echo "100755 $(git hash-object -w stage$s) $s	file" &&
-		echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s	symlink" || return 1
-	done | 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$"
+expecting success of 0027.2054 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2054 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf
 
-100755 3e757656cf36eca53338e520d134963a44f793f8 0	file
-120000 3e757656cf36eca53338e520d134963a44f793f8 0	symlink
-ok 22 - git add with filemode=0, symlinks=0, and unmerged entries
+expecting success of 0027.2055 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2055 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 3700.23 'git add with filemode=0, symlinks=0 prefers stage 2 over stage 1': 
-	git rm --cached -f file symlink &&
-	(
-		echo "100644 $(git hash-object -w stage1) 1	file" &&
-		echo "100755 $(git hash-object -w stage2) 2	file" &&
-		echo "100644 $(printf 1 | git hash-object -w -t blob --stdin) 1	symlink" &&
-		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$"
+expecting success of 0027.2056 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2056 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
-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 0027.2057 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2057 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-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)"
+expecting success of 0027.2058 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2058 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-[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 0027.2059 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2059 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
-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 &&
+expecting success of 0027.2060 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2060 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input
 
-	git diff-files --name-only >actual &&
-	! grep bar actual &&
-	grep baz actual
+expecting success of 0027.2061 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2061 - setup LF checkout  with -c core.eol=crlf
 
-HEAD is now at 0254e3c commit all
-rm 'foo'
-baz
-ok 25 - git add --refresh with pathspec
+expecting success of 0027.2062 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2062 - setup CRLF checkout  with -c core.eol=crlf
 
-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
+expecting success of 0027.2063 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2063 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-ok 26 - git add --refresh correctly reports no match error
+expecting success of 0027.2064 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2064 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-checking prerequisite: SANITY
+expecting success of 0027.2065 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2065 - setup LF_nul checkout  with -c core.eol=crlf
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+expecting success of 0027.2066 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2066 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf
 
-	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 0027.2067 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 2067 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+expecting success of 0027.2068 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2068 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+expecting success of 0027.2069 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2069 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-)
-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 )
+expecting success of 0027.2070 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2070 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-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 0027.2071 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2071 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
-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
+expecting success of 0027.2072 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2072 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
 
-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 0027.2073 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2073 - setup LF checkout  with -c core.eol=crlf
 
-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
+expecting success of 0027.2074 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2074 - setup CRLF checkout  with -c core.eol=crlf
 
-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 0027.2075 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2075 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-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 )
+expecting success of 0027.2076 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2076 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-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 0027.2077 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2077 - setup LF_nul checkout  with -c core.eol=crlf
 
-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
+expecting success of 0027.2078 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2078 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf
 
-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 0027.2079 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2079 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
-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 )
+expecting success of 0027.2080 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2080 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
-HEAD is now at 0254e3c commit all
-fo[ou]bar
-ok 32 - git add 'fo\[ou\]bar' ignores foobar
+expecting success of 0027.2081 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2081 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-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
+expecting success of 0027.2082 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2082 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-HEAD is now at 0254e3c commit all
-ok 33 - git add to resolve conflicts on otherwise ignored path
+expecting success of 0027.2083 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2083 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 3700.34 '"add non-existent" should fail': 
-	test_must_fail git add non-existent &&
-	! (git ls-files | grep "non-existent")
+expecting success of 0027.2084 'setup config for checkout attr= ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2084 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
 
-fatal: pathspec 'non-existent' did not match any files
-ok 34 - "add non-existent" should fail
+expecting success of 0027.2085 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2085 - setup LF checkout  with -c core.eol=crlf
 
-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
-	)
+expecting success of 0027.2086 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2086 - setup CRLF checkout  with -c core.eol=crlf
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/empty/.git/
-ok 35 - git add -A on empty repo does not error out
+expecting success of 0027.2087 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2087 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 3700.36 '"git add ." in empty repo': 
-	rm -fr empty &&
-	git init empty &&
-	(
-		cd empty &&
-		git add .
-	)
+expecting success of 0027.2088 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2088 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/empty/.git/
-ok 36 - "git add ." in empty repo
+expecting success of 0027.2089 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2089 - setup LF_nul checkout  with -c core.eol=crlf
 
-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 advice.addEmbeddedRepo false"
-		warning: adding embedded git repository: inner2
+expecting success of 0027.2090 'ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
 		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
 		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/outer/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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
+	
+ok 2090 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=crlf
 
-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 0027.2091 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+	
+ok 2091 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/empty/.git/
-ok 38 - error on a repository with no commits
+expecting success of 0027.2092 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2092 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
-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 0027.2093 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2093 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-ok 39 - git add --dry-run of existing changed file
+expecting success of 0027.2094 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2094 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-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 0027.2095 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2095 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
-ok 40 - git add --dry-run of non-existing file
+expecting success of 0027.2096 'setup config for checkout attr= ident=ident aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2096 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
 
-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 0027.2097 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2097 - setup LF checkout  with -c core.eol=crlf
 
-ok 41 - git add --dry-run of an existing file output
+expecting success of 0027.2098 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2098 - setup CRLF checkout  with -c core.eol=crlf
 
-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 0027.2099 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2099 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-ok 42 - git add --dry-run --ignore-missing of non-existing file
+expecting success of 0027.2100 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2100 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-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 0027.2101 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2101 - setup LF_nul checkout  with -c core.eol=crlf
 
-ok 43 - git add --dry-run --ignore-missing of non-existing file output
+expecting success of 0027.2102 'ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2102 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=crlf
 
-expecting success of 3700.44 'git add --dry-run --interactive should fail': 
-	test_must_fail git add --dry-run --interactive
+expecting success of 0027.2103 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+	
+ok 2103 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF
 
-fatal: options '--dry-run' and '--interactive/--patch' cannot be used together
-ok 44 - git add --dry-run --interactive should fail
+expecting success of 0027.2104 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2104 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 3700.45 'git add empty string should fail': 
-	test_must_fail git add ""
+expecting success of 0027.2105 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2105 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-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 0027.2106 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2106 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-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
+expecting success of 0027.2107 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2107 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-pass
-pass
-ok 46 - git add --chmod=[+-]x stages correctly
+expecting success of 0027.2108 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2108 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
 
-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
+expecting success of 0027.2109 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2109 - setup LF checkout  with -c core.eol=crlf
 
-pass
-ok 47 - git add --chmod=+x with symlinks
+expecting success of 0027.2110 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2110 - setup CRLF checkout  with -c core.eol=crlf
 
-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 0027.2111 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2111 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-HEAD is now at 0254e3c commit all
-pass
-pass
-ok 48 - git add --chmod=[+-]x changes index with already added file
+expecting success of 0027.2112 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2112 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-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 0027.2113 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2113 - setup LF_nul checkout  with -c core.eol=crlf
 
-ok 49 - git add --chmod=[+-]x does not change the working tree
+expecting success of 0027.2114 'ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2114 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=crlf
 
-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 0027.2115 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2115 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF
 
-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 0027.2116 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2116 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
-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 0027.2117 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2117 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-HEAD is now at 0254e3c commit all
-pass
-ok 51 - git add --chmod honors --dry-run
+expecting success of 0027.2118 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2118 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-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 0027.2119 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2119 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-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 0027.2120 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2120 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
 
-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 0027.2121 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2121 - setup LF checkout  with -c core.eol=crlf
 
-fatal: pathspec 'nonexistent' did not match any files
-ok 53 - git add --chmod --dry-run reports error for unmatched pathspec
+expecting success of 0027.2122 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2122 - setup CRLF checkout  with -c core.eol=crlf
 
-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 0027.2123 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2123 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-Nothing specified, nothing added.
-hint: Maybe you wanted to say 'git add .'?
-hint: Disable this message with "git config advice.addEmptyPathspec false"
-pass
-pass
-ok 54 - no file status change if no pathspec is given
+expecting success of 0027.2124 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2124 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-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
-	)
+expecting success of 0027.2125 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2125 - setup LF_nul checkout  with -c core.eol=crlf
 
-Nothing specified, nothing added.
-hint: Maybe you wanted to say 'git add .'?
-hint: Disable this message with "git config advice.addEmptyPathspec false"
-pass
-pass
-ok 55 - no file status change if no pathspec is given in subdir
+expecting success of 0027.2126 'ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2126 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=crlf
 
-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
-	)
+expecting success of 0027.2127 'checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2127 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3700-add/repo/.git/
-ok 56 - all statuses changed in folder if . is given
+expecting success of 0027.2128 'checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2128 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
-checking prerequisite: CASE_INSENSITIVE_FS
+expecting success of 0027.2129 'checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2129 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-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 0027.2130 'checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2130 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 57 # skip path is case-insensitive (missing CASE_INSENSITIVE_FS)
+expecting success of 0027.2131 'checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2131 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-# passed all 57 test(s)
-1..57
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3426-rebase-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 0027.2132 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.47.2/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'
-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"
- 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/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_rebase: added submodule creates empty directory
+ok 2132 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
 
-expecting success of 3426.2 'git_rebase: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 0027.2133 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2133 - setup LF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2134 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2134 - setup CRLF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2135 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2135 - setup LF_mix_CR checkout  with -c core.eol=crlf
+
+expecting success of 0027.2136 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2136 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2137 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2137 - setup LF_nul checkout  with -c core.eol=crlf
+
+expecting success of 0027.2138 'ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >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
- 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
- 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/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_rebase: added submodule leaves existing empty directory alone
+ok 2138 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=crlf
 
-expecting success of 3426.3 'git_rebase: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
+expecting success of 0027.2139 'checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Switched to 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
- 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/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_rebase: replace tracked file with submodule creates empty directory
+ok 2139 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 3426.4 'git_rebase: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
+expecting success of 0027.2140 'checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Switched to 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
- 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/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_rebase: replace directory with submodule
+ok 2140 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 3426.5 'git_rebase: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 0027.2141 'checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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'.
-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(-)
-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 2141 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 3426.6 'git_rebase: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 0027.2142 'checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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'.
-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(-)
-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 2142 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 3426.7 'git_rebase: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 0027.2143 'checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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
- 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 switch branches.
-Aborting
-error: could not detach HEAD
-ok 7 - git_rebase: replace submodule with a directory must fail
+ok 2143 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-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 &&
-		(
-			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 0027.2144 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
 	
-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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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
- 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 switch branches.
-Aborting
-error: could not detach HEAD
-ok 8 - git_rebase: replace submodule containing a .git directory with a directory must fail
+ok 2144 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
 
-checking known breakage of 3426.9 'git_rebase: 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 0027.2145 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2145 - setup LF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2146 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2146 - setup CRLF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2147 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2147 - setup LF_mix_CR checkout  with -c core.eol=crlf
+
+expecting success of 0027.2148 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2148 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2149 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2149 - setup LF_nul checkout  with -c core.eol=crlf
+
+expecting success of 0027.2150 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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
- 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.
-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
+ok 2150 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf
 
-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 &&
-		(
-			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
-		)
+expecting success of 0027.2151 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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
- 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.
-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
+ok 2151 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF
 
-expecting success of 3426.11 'git_rebase: 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 0027.2152 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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
- 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_rebase: modified submodule does not update submodule work tree
+ok 2152 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-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 &&
-		(
-			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 0027.2153 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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
- 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.
-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 2153 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-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 &&
-		(
-			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
-		)
+expecting success of 0027.2154 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-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
- 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
- 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/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_rebase: modified submodule does not update submodule work tree from invalid commit
+ok 2154 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-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 &&
-		(
-			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 0027.2155 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-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"
- 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 14 - git_rebase: added submodule doesn't remove untracked unignored file with same name
+ok 2155 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 3426.15 'git_rebase_interactive: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 0027.2156 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
 	
-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"
+ok 2156 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=true
+
+expecting success of 0027.2157 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2157 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2158 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2158 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2159 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2159 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2160 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2160 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2161 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2161 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2162 'ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2162 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=native
+
+expecting success of 0027.2163 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2163 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF
+
+expecting success of 0027.2164 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2164 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF
+
+expecting success of 0027.2165 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2165 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2166 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2166 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2167 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2167 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success of 0027.2168 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2168 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
+
+expecting success of 0027.2169 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2169 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2170 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2170 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2171 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2171 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2172 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2172 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2173 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2173 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2174 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2174 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=native
+
+expecting success of 0027.2175 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2175 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF
+
+expecting success of 0027.2176 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2176 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+
+expecting success of 0027.2177 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2177 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2178 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2178 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2179 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2179 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success of 0027.2180 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2180 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
+
+expecting success of 0027.2181 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2181 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2182 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2182 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2183 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2183 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2184 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2184 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2185 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2185 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2186 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2186 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=native
+
+expecting success of 0027.2187 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2187 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+
+expecting success of 0027.2188 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2188 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+
+expecting success of 0027.2189 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2189 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2190 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2190 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2191 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2191 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success of 0027.2192 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2192 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
+
+expecting success of 0027.2193 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2193 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2194 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2194 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2195 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2195 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2196 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2196 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2197 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2197 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2198 'ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2198 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native
+
+expecting success of 0027.2199 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 2199 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF
+
+expecting success of 0027.2200 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2200 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+
+expecting success of 0027.2201 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2201 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2202 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2202 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2203 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2203 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success of 0027.2204 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2204 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
+
+expecting success of 0027.2205 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2205 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2206 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2206 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2207 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2207 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2208 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2208 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2209 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2209 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2210 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2210 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native
+
+expecting success of 0027.2211 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2211 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+
+expecting success of 0027.2212 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2212 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+
+expecting success of 0027.2213 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2213 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2214 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2214 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2215 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2215 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success of 0027.2216 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2216 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
+
+expecting success of 0027.2217 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2217 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2218 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2218 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2219 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2219 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2220 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2220 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2221 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2221 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2222 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2222 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=native
+
+expecting success of 0027.2223 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 2223 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF
+
+expecting success of 0027.2224 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2224 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+
+expecting success of 0027.2225 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2225 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2226 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2226 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2227 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2227 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success of 0027.2228 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2228 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
+
+expecting success of 0027.2229 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2229 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2230 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2230 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2231 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2231 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2232 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2232 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2233 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2233 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2234 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2234 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=native
+
+expecting success of 0027.2235 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2235 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+
+expecting success of 0027.2236 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2236 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+
+expecting success of 0027.2237 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2237 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2238 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2238 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2239 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2239 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success of 0027.2240 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2240 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
+
+expecting success of 0027.2241 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2241 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2242 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2242 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2243 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2243 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2244 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2244 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2245 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2245 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2246 'ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2246 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=native
+
+expecting success of 0027.2247 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2247 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF
+
+expecting success of 0027.2248 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2248 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF
+
+expecting success of 0027.2249 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2249 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2250 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2250 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2251 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2251 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success of 0027.2252 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2252 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
+
+expecting success of 0027.2253 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2253 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2254 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2254 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2255 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2255 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2256 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2256 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2257 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2257 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2258 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2258 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=native
+
+expecting success of 0027.2259 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2259 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF
+
+expecting success of 0027.2260 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2260 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+
+expecting success of 0027.2261 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2261 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2262 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2262 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2263 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2263 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success of 0027.2264 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2264 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
+
+expecting success of 0027.2265 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2265 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2266 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2266 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2267 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2267 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2268 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2268 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2269 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2269 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2270 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2270 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=native
+
+expecting success of 0027.2271 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2271 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+
+expecting success of 0027.2272 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2272 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+
+expecting success of 0027.2273 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2273 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2274 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2274 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2275 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2275 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success of 0027.2276 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2276 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
+
+expecting success of 0027.2277 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2277 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2278 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2278 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2279 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2279 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2280 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2280 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2281 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2281 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2282 'ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2282 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native
+
+expecting success of 0027.2283 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 2283 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF
+
+expecting success of 0027.2284 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2284 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+
+expecting success of 0027.2285 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2285 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2286 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2286 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2287 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2287 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success of 0027.2288 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2288 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
+
+expecting success of 0027.2289 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2289 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2290 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2290 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2291 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2291 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2292 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2292 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2293 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2293 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2294 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2294 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native
+
+expecting success of 0027.2295 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2295 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+
+expecting success of 0027.2296 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2296 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+
+expecting success of 0027.2297 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2297 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2298 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2298 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2299 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2299 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success of 0027.2300 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2300 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
+
+expecting success of 0027.2301 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2301 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2302 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2302 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2303 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2303 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2304 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2304 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2305 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2305 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2306 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2306 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native
+
+expecting success of 0027.2307 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 2307 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF
+
+expecting success of 0027.2308 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2308 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+
+expecting success of 0027.2309 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2309 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2310 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2310 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2311 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2311 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success of 0027.2312 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2312 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
+
+expecting success of 0027.2313 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2313 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2314 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2314 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2315 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2315 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2316 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2316 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2317 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2317 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2318 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2318 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=native
+
+expecting success of 0027.2319 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2319 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+
+expecting success of 0027.2320 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2320 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+
+expecting success of 0027.2321 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2321 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2322 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2322 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2323 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2323 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success of 0027.2324 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2324 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
+
+expecting success of 0027.2325 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2325 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2326 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2326 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2327 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2327 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2328 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2328 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2329 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2329 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2330 'ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2330 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=native
+
+expecting success of 0027.2331 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2331 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF
+
+expecting success of 0027.2332 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2332 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF
+
+expecting success of 0027.2333 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2333 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2334 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2334 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2335 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2335 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success of 0027.2336 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2336 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
+
+expecting success of 0027.2337 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2337 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2338 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2338 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2339 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2339 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2340 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2340 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2341 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2341 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2342 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2342 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=native
+
+expecting success of 0027.2343 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2343 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF
+
+expecting success of 0027.2344 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2344 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success of 0027.2345 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2345 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2346 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2346 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2347 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2347 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success of 0027.2348 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2348 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
+
+expecting success of 0027.2349 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2349 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2350 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2350 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2351 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2351 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2352 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2352 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2353 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2353 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2354 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2354 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=native
+
+expecting success of 0027.2355 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2355 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+
+expecting success of 0027.2356 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2356 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success of 0027.2357 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2357 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2358 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2358 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2359 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2359 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success of 0027.2360 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2360 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
+
+expecting success of 0027.2361 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2361 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2362 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2362 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2363 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2363 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2364 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2364 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2365 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2365 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2366 'ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2366 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=native
+
+expecting success of 0027.2367 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 2367 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF
+
+expecting success of 0027.2368 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2368 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success of 0027.2369 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2369 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2370 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2370 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2371 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2371 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success of 0027.2372 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2372 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
+
+expecting success of 0027.2373 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2373 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2374 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2374 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2375 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2375 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2376 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2376 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2377 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2377 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2378 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2378 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=native
+
+expecting success of 0027.2379 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2379 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+
+expecting success of 0027.2380 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2380 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success of 0027.2381 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2381 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2382 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2382 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2383 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2383 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success of 0027.2384 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2384 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input
+
+expecting success of 0027.2385 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2385 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2386 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2386 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2387 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2387 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2388 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2388 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2389 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2389 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2390 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2390 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=native
+
+expecting success of 0027.2391 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 2391 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF
+
+expecting success of 0027.2392 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2392 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success of 0027.2393 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2393 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2394 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2394 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2395 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2395 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success of 0027.2396 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2396 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
+
+expecting success of 0027.2397 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2397 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2398 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2398 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2399 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2399 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2400 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2400 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2401 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2401 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2402 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2402 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=native
+
+expecting success of 0027.2403 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2403 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+
+expecting success of 0027.2404 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2404 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success of 0027.2405 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2405 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2406 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2406 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2407 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2407 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success of 0027.2408 'setup config for checkout attr= ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2408 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
+
+expecting success of 0027.2409 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2409 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2410 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2410 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2411 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2411 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2412 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2412 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2413 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2413 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2414 'ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2414 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native
+
+expecting success of 0027.2415 'checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+	
+ok 2415 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF
+
+expecting success of 0027.2416 'checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2416 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF
+
+expecting success of 0027.2417 'checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2417 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2418 'checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2418 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2419 'checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2419 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success of 0027.2420 'setup config for checkout attr= ident=ident aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2420 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
+
+expecting success of 0027.2421 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2421 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2422 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2422 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2423 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2423 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2424 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2424 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2425 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2425 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2426 'ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2426 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native
+
+expecting success of 0027.2427 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+	
+ok 2427 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF
+
+expecting success of 0027.2428 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2428 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF
+
+expecting success of 0027.2429 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2429 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2430 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2430 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2431 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2431 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success of 0027.2432 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2432 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
+
+expecting success of 0027.2433 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2433 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2434 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2434 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2435 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2435 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2436 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2436 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2437 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2437 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2438 'ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2438 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=native
+
+expecting success of 0027.2439 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2439 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF
+
+expecting success of 0027.2440 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2440 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF
+
+expecting success of 0027.2441 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2441 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2442 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2442 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2443 'checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2443 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success of 0027.2444 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2444 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
+
+expecting success of 0027.2445 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2445 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2446 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2446 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2447 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2447 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2448 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2448 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2449 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2449 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2450 'ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2450 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native
+
+expecting success of 0027.2451 'checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2451 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF
+
+expecting success of 0027.2452 'checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2452 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF
+
+expecting success of 0027.2453 'checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2453 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2454 'checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2454 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2455 'checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2455 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success of 0027.2456 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2456 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
+
+expecting success of 0027.2457 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2457 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2458 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2458 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2459 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2459 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2460 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2460 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2461 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2461 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2462 'ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2462 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=native
+
+expecting success of 0027.2463 'checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 2463 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF
+
+expecting success of 0027.2464 'checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2464 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF
+
+expecting success of 0027.2465 'checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2465 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2466 'checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2466 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2467 'checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2467 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success of 0027.2468 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2468 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
+
+expecting success of 0027.2469 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2469 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2470 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2470 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2471 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2471 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2472 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2472 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2473 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2473 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2474 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2474 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native
+
+expecting success of 0027.2475 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 2475 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF
+
+expecting success of 0027.2476 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2476 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF
+
+expecting success of 0027.2477 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2477 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2478 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2478 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2479 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2479 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success of 0027.2480 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2480 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+
+expecting success of 0027.2481 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2481 - setup LF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2482 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2482 - setup CRLF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2483 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2483 - setup LF_mix_CR checkout  with -c core.eol=crlf
+
+expecting success of 0027.2484 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2484 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2485 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2485 - setup LF_nul checkout  with -c core.eol=crlf
+
+expecting success of 0027.2486 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2486 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf
+
+expecting success of 0027.2487 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2487 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF
+
+expecting success of 0027.2488 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2488 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+
+expecting success of 0027.2489 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2489 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+
+expecting success of 0027.2490 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2490 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+
+expecting success of 0027.2491 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2491 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+
+expecting success of 0027.2492 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2492 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+
+expecting success of 0027.2493 'setup LF checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2493 - setup LF checkout  with -c core.eol=lf
+
+expecting success of 0027.2494 'setup CRLF checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2494 - setup CRLF checkout  with -c core.eol=lf
+
+expecting success of 0027.2495 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2495 - setup LF_mix_CR checkout  with -c core.eol=lf
+
+expecting success of 0027.2496 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2496 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+
+expecting success of 0027.2497 'setup LF_nul checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2497 - setup LF_nul checkout  with -c core.eol=lf
+
+expecting success of 0027.2498 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2498 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf
+
+expecting success of 0027.2499 'checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 2499 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF
+
+expecting success of 0027.2500 'checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2500 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+
+expecting success of 0027.2501 'checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2501 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+
+expecting success of 0027.2502 'checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2502 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+
+expecting success of 0027.2503 'checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul': 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2503 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
+
+expecting success of 0027.2504 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2504 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+
+expecting success of 0027.2505 'setup LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2505 - setup LF checkout 
+
+expecting success of 0027.2506 'setup CRLF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2506 - setup CRLF checkout 
+
+expecting success of 0027.2507 'setup LF_mix_CR checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2507 - setup LF_mix_CR checkout 
+
+expecting success of 0027.2508 'setup CRLF_mix_LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2508 - setup CRLF_mix_LF checkout 
+
+expecting success of 0027.2509 'setup LF_nul checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2509 - setup LF_nul checkout 
+
+expecting success of 0027.2510 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2510 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=
+
+expecting success of 0027.2511 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF': 
+		compare_ws_file eol__crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 2511 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF
+
+expecting success of 0027.2512 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2512 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF
+
+expecting success of 0027.2513 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2513 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+
+expecting success of 0027.2514 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2514 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+
+expecting success of 0027.2515 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2515 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_nul
+
+expecting success of 0027.2516 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2516 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+
+expecting success of 0027.2517 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2517 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2518 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2518 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2519 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2519 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2520 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2520 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2521 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2521 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2522 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2522 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=native
+
+expecting success of 0027.2523 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 2523 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF
+
+expecting success of 0027.2524 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2524 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF
+
+expecting success of 0027.2525 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2525 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2526 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2526 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2527 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2527 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success of 0027.2528 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2528 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false
+
+expecting success of 0027.2529 'setup LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2529 - setup LF checkout 
+
+expecting success of 0027.2530 'setup CRLF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2530 - setup CRLF checkout 
+
+expecting success of 0027.2531 'setup LF_mix_CR checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2531 - setup LF_mix_CR checkout 
+
+expecting success of 0027.2532 'setup CRLF_mix_LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2532 - setup CRLF_mix_LF checkout 
+
+expecting success of 0027.2533 'setup LF_nul checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2533 - setup LF_nul checkout 
+
+expecting success of 0027.2534 'ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2534 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=
+
+expecting success of 0027.2535 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF': 
+		compare_ws_file eol__crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 2535 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF
+
+expecting success of 0027.2536 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2536 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF
+
+expecting success of 0027.2537 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2537 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+
+expecting success of 0027.2538 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2538 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+
+expecting success of 0027.2539 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2539 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_nul
+
+expecting success of 0027.2540 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2540 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false
+
+expecting success of 0027.2541 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2541 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2542 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2542 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2543 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2543 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2544 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2544 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2545 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2545 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2546 'ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2546 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=native
+
+expecting success of 0027.2547 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 2547 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF
+
+expecting success of 0027.2548 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2548 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF
+
+expecting success of 0027.2549 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2549 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success of 0027.2550 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2550 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success of 0027.2551 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2551 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success of 0027.2552 'setup config for checkout attr= ident=ident aeol=lf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2552 - setup config for checkout attr= ident=ident aeol=lf core.autocrlf=false
+
+expecting success of 0027.2553 'setup LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2553 - setup LF checkout 
+
+expecting success of 0027.2554 'setup CRLF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2554 - setup CRLF checkout 
+
+expecting success of 0027.2555 'setup LF_mix_CR checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2555 - setup LF_mix_CR checkout 
+
+expecting success of 0027.2556 'setup CRLF_mix_LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2556 - setup CRLF_mix_LF checkout 
+
+expecting success of 0027.2557 'setup LF_nul checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2557 - setup LF_nul checkout 
+
+expecting success of 0027.2558 'ls-files --eol attr= ident aeol=lf core.autocrlf=false core.eol=': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2558 - ls-files --eol attr= ident aeol=lf core.autocrlf=false core.eol=
+
+expecting success of 0027.2559 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF': 
+		compare_ws_file eol__crlf_false_attr__ LF    crlf_false_attr__LF.txt
+	
+ok 2559 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF
+
+expecting success of 0027.2560 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2560 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF
+
+expecting success of 0027.2561 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2561 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF_mix_LF
+
+expecting success of 0027.2562 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2562 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_mix_CR
+
+expecting success of 0027.2563 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2563 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_nul
+
+expecting success of 0027.2564 'setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2564 - setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=false
+
+expecting success of 0027.2565 'setup LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2565 - setup LF checkout 
+
+expecting success of 0027.2566 'setup CRLF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2566 - setup CRLF checkout 
+
+expecting success of 0027.2567 'setup LF_mix_CR checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2567 - setup LF_mix_CR checkout 
+
+expecting success of 0027.2568 'setup CRLF_mix_LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2568 - setup CRLF_mix_LF checkout 
+
+expecting success of 0027.2569 'setup LF_nul checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2569 - setup LF_nul checkout 
+
+expecting success of 0027.2570 'ls-files --eol attr= ident aeol=crlf core.autocrlf=false core.eol=': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2570 - ls-files --eol attr= ident aeol=crlf core.autocrlf=false core.eol=
+
+expecting success of 0027.2571 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF    crlf_false_attr__LF.txt
+	
+ok 2571 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF
+
+expecting success of 0027.2572 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2572 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF
+
+expecting success of 0027.2573 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2573 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF_mix_LF
+
+expecting success of 0027.2574 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_false_attr__ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2574 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_mix_CR
+
+expecting success of 0027.2575 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr__ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2575 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_nul
+
+expecting success of 0027.2576 'setup config for checkout attr= ident=ident aeol=lf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2576 - setup config for checkout attr= ident=ident aeol=lf core.autocrlf=true
+
+expecting success of 0027.2577 'setup LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2577 - setup LF checkout 
+
+expecting success of 0027.2578 'setup CRLF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2578 - setup CRLF checkout 
+
+expecting success of 0027.2579 'setup LF_mix_CR checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2579 - setup LF_mix_CR checkout 
+
+expecting success of 0027.2580 'setup CRLF_mix_LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2580 - setup CRLF_mix_LF checkout 
+
+expecting success of 0027.2581 'setup LF_nul checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2581 - setup LF_nul checkout 
+
+expecting success of 0027.2582 'ls-files --eol attr= ident aeol=lf core.autocrlf=true core.eol=': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2582 - ls-files --eol attr= ident aeol=lf core.autocrlf=true core.eol=
+
+expecting success of 0027.2583 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF': 
+		compare_ws_file eol__crlf_true_attr__ LF    crlf_false_attr__LF.txt
+	
+ok 2583 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF
+
+expecting success of 0027.2584 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2584 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF
+
+expecting success of 0027.2585 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2585 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF_mix_LF
+
+expecting success of 0027.2586 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2586 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_mix_CR
+
+expecting success of 0027.2587 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2587 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_nul
+
+expecting success of 0027.2588 'setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2588 - setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=true
+
+expecting success of 0027.2589 'setup LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2589 - setup LF checkout 
+
+expecting success of 0027.2590 'setup CRLF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2590 - setup CRLF checkout 
+
+expecting success of 0027.2591 'setup LF_mix_CR checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2591 - setup LF_mix_CR checkout 
+
+expecting success of 0027.2592 'setup CRLF_mix_LF checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2592 - setup CRLF_mix_LF checkout 
+
+expecting success of 0027.2593 'setup LF_nul checkout ': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2593 - setup LF_nul checkout 
+
+expecting success of 0027.2594 'ls-files --eol attr= ident aeol=crlf core.autocrlf=true core.eol=': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2594 - ls-files --eol attr= ident aeol=crlf core.autocrlf=true core.eol=
+
+expecting success of 0027.2595 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+	
+ok 2595 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF
+
+expecting success of 0027.2596 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2596 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF
+
+expecting success of 0027.2597 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2597 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF
+
+expecting success of 0027.2598 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR': 
+		compare_ws_file eol__crlf_true_attr__ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2598 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR
+
+expecting success of 0027.2599 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_true_attr__ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2599 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_nul
+
+expecting success of 0027.2600 'ls-files --eol -d -z': 
+	rm crlf_false_attr__CRLF.txt crlf_false_attr__CRLF_mix_LF.txt crlf_false_attr__LF.txt .gitattributes &&
+	cat >expect <<-\EOF &&
+	i/crlf w/ crlf_false_attr__CRLF.txt
+	i/lf w/ .gitattributes
+	i/lf w/ crlf_false_attr__LF.txt
+	i/mixed w/ crlf_false_attr__CRLF_mix_LF.txt
+	EOF
+	git ls-files --eol -d >tmp &&
+	sed -e "s!attr/[^	]*!!g" -e "s/	/ /g" -e "s/  */ /g" tmp |
+	sort >actual &&
+	test_cmp expect actual
+
+ok 2600 - ls-files --eol -d -z
+
+# passed all 2600 test(s)
+1..2600
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3704-add-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+
+[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 3704.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
+
+	echo fileA.t | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+
+ok 2 - --pathspec-from-file from stdin
+
+expecting success of 3704.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git add --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+
+ok 3 - --pathspec-from-file from file
+
+expecting success of 3704.4 'NUL delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git add --pathspec-from-file=- --pathspec-file-nul &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+
+ok 4 - NUL delimiters
+
+expecting success of 3704.5 'LF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+
+ok 5 - LF delimiters
+
+expecting success of 3704.6 'no trailing delimiter': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+
+ok 6 - no trailing delimiter
+
+expecting success of 3704.7 'CRLF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+
+ok 7 - CRLF delimiters
+
+expecting success of 3704.8 'quotes': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git add --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+
+ok 8 - quotes
+
+expecting success of 3704.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git add --pathspec-from-file=list --pathspec-file-nul
+
+fatal: pathspec '"file\101.t"
+' did not match any files
+ok 9 - quotes not compatible with --pathspec-file-nul
+
+expecting success of 3704.10 'only touches what was listed': 
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileB.t
+	A  fileC.t
+	EOF
+	verify_expect
+
+ok 10 - only touches what was listed
+
+expecting success of 3704.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
+
+	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 &&
+
+	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 &&
+
+	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 &&
+
+	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 &&
+
+	test_must_fail git add --pathspec-file-nul 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+
+	# 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
+
+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
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3426-rebase-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.47.2/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'
+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"
+ 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/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_rebase: added submodule creates empty directory
+
+expecting success of 3426.2 'git_rebase: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to 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
+ 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/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_rebase: added submodule leaves existing empty directory alone
+
+expecting success of 3426.3 'git_rebase: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Switched to 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
+ 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/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_rebase: replace tracked file with submodule creates empty directory
+
+expecting success of 3426.4 'git_rebase: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Switched to 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
+ 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/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_rebase: replace directory with submodule
+
+expecting success of 3426.5 'git_rebase: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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'.
+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(-)
+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 3426.6 'git_rebase: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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'.
+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(-)
+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 3426.7 'git_rebase: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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
+ 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 switch branches.
+Aborting
+error: could not detach HEAD
+ok 7 - git_rebase: 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': 
+		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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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
+ 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 switch branches.
+Aborting
+error: could not detach HEAD
+ok 8 - git_rebase: 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': 
+		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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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
+ 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.
+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 3426.10 'git_rebase: 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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
+ 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.
+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 3426.11 'git_rebase: 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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
+ 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_rebase: 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': 
+		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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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
+ 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.
+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
+
+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 &&
+		(
+			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
+ 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
+ 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.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/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_rebase: 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': 
+		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'.
+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
+ 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
+
+expecting success of 3426.15 'git_rebase_interactive: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+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
  1 file changed, 1 deletion(-)
@@ -192458,326 +192462,739 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3901-i18n-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3901-i18n-patch/.git/
-expecting success of 3901.1 'setup': 
-	git config i18n.commitencoding UTF-8 &&
-
-	# 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 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>
- 1 file changed, 1 insertion(+)
- create mode 100644 theirs
-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.
-
-	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 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 3901.9 'cherry-pick(L/L)': 
-	# Both the commitencoding and logoutputencoding is set to ISO-8859-1
-
-	git config i18n.commitencoding ISO8859-1 &&
-	git config i18n.logoutputencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-
-	git reset --hard main &&
-	git cherry-pick side^ &&
-	git cherry-pick side &&
-	git revert HEAD &&
-
-	check_encoding 3 8859
+*** t3305-notes-fanout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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;
 
-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
+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 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)
-
-expecting success of 3901.10 'cherry-pick(U/L)': 
-	# Commitencoding is set to UTF-8 but logoutputencoding is ISO-8859-1
-
-	git config i18n.commitencoding UTF-8 &&
-	git config i18n.logoutputencoding ISO8859-1 &&
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
-
-	git reset --hard main &&
-	git cherry-pick side^ &&
-	git cherry-pick side &&
-	git revert HEAD &&
+ create mode 100644 A.t
+Switched to a new branch 'with_notes'
+ok 1 - tweak test environment
 
-	check_encoding 3
+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
 
-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)
+ok 2 - creating many notes with git-notes
 
-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.
+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
 
-	git config i18n.commitencoding ISO8859-1 &&
-	git config i18n.logoutputencoding UTF-8 &&
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+ok 3 - many notes created correctly with git-notes
 
-	git reset --hard main &&
-	git cherry-pick side^ &&
-	git cherry-pick side &&
-	git revert HEAD &&
+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
 
-	check_encoding 3 8859
+Fanout 0 -> 1 at refs/notes/commits~202
+ok 4 - stable fanout 0 is followed by stable fanout 1
 
-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)
+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
 
-expecting success of 3901.12 'rebase --merge (U/U)': 
-	git config i18n.commitencoding UTF-8 &&
-	git config i18n.logoutputencoding UTF-8 &&
+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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3901-i18n-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3901-i18n-patch/.git/
+expecting success of 3901.1 'setup': 
+	git config i18n.commitencoding UTF-8 &&
+
+	# 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 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>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 theirs
+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.
+
+	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 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 3901.9 'cherry-pick(L/L)': 
+	# Both the commitencoding and logoutputencoding is set to ISO-8859-1
+
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+
+	git reset --hard main &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	git revert HEAD &&
+
+	check_encoding 3 8859
+
+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)
+
+expecting success of 3901.10 'cherry-pick(U/L)': 
+	# Commitencoding is set to UTF-8 but logoutputencoding is ISO-8859-1
+
+	git config i18n.commitencoding UTF-8 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$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 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 3901.11 'cherry-pick(L/U)': 
+	# Again, the commitencoding is set to ISO-8859-1 but
+	# logoutputencoding is set to UTF-8.
+
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+
+	git reset --hard main &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	git revert HEAD &&
+
+	check_encoding 3 8859
+
+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)
+
+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 &&
 
 	git reset --hard side &&
@@ -192948,6 +193365,634 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3512-cherry-pick-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/.git/
+expecting success of 3512.1 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'main'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+[no_submodule 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_test_func: added submodule creates empty directory
+
+expecting success of 3512.2 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+[no_submodule 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 3512.3 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+[replace_sub1_with_file 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 3512.4 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+[replace_sub1_with_directory a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - git_test_func: replace directory with submodule
+
+expecting success of 3512.5 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+[add_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+ok 5 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 3512.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+[add_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+ok 6 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 3512.7 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+fatal: cherry-pick failed
+ok 7 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 3512.8 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+[add_sub1 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git cherry-pick replace_sub1_with_file
+not ok 9 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 3512.10 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+[add_sub1 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git cherry-pick replace_sub1_with_file
+not ok 10 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 3512.11 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 3512.14 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+fatal: cherry-pick failed
+ok 14 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 3512.15 'unrelated submodule/file conflict is ignored': 
+	test_config_global protocol.file.allow always &&
+
+	test_create_repo sub &&
+
+	touch sub/file &&
+	git -C sub add file &&
+	git -C sub commit -m "add a file in a submodule" &&
+
+	test_create_repo a_repo &&
+	(
+		cd a_repo &&
+		>a_file &&
+		git add a_file &&
+		git commit -m "add a file" &&
+
+		git branch test &&
+		git checkout test &&
+
+		mkdir sub &&
+		>sub/content &&
+		git add sub/content &&
+		git commit -m "add a regular folder with name sub" &&
+
+		echo "123" >a_file &&
+		git add a_file &&
+		git commit -m "modify a file" &&
+
+		git checkout main &&
+
+		git submodule add ../sub sub &&
+		git submodule update sub &&
+		git commit -m "add a submodule info folder with name sub" &&
+
+		git cherry-pick test
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3070-wildmatch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3070-wildmatch/.git/
 checking prerequisite: EXPENSIVE_ON_WINDOWS
@@ -210583,8 +211628,7 @@
 	sleep 2 &&
 	! kill $!
 
-t3070-wildmatch.sh: 11: kill: No such process
-
+./test-lib.sh: line 1060: kill: (1806919) - No such process
 ok 1891 - matching does not exhibit exponential behavior
 
 # still have 40 known breakage(s)
@@ -210918,634 +211962,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3512-cherry-pick-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/.git/
-expecting success of 3512.1 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'main'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-[no_submodule 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_test_func: added submodule creates empty directory
-
-expecting success of 3512.2 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-[no_submodule 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 3512.3 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-[replace_sub1_with_file 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 3512.4 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-[replace_sub1_with_directory a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_test_func: replace directory with submodule
-
-expecting success of 3512.5 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-[add_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-ok 5 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 3512.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-[add_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-ok 6 - git_test_func: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 3512.7 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-fatal: cherry-pick failed
-ok 7 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 3512.8 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-[add_sub1 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git cherry-pick replace_sub1_with_file
-not ok 9 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 3512.10 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-[add_sub1 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git cherry-pick replace_sub1_with_file
-not ok 10 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 3512.11 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_test_func: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 3512.14 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-fatal: cherry-pick failed
-ok 14 - git_test_func: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 3512.15 'unrelated submodule/file conflict is ignored': 
-	test_config_global protocol.file.allow always &&
-
-	test_create_repo sub &&
-
-	touch sub/file &&
-	git -C sub add file &&
-	git -C sub commit -m "add a file in a submodule" &&
-
-	test_create_repo a_repo &&
-	(
-		cd a_repo &&
-		>a_file &&
-		git add a_file &&
-		git commit -m "add a file" &&
-
-		git branch test &&
-		git checkout test &&
-
-		mkdir sub &&
-		>sub/content &&
-		git add sub/content &&
-		git commit -m "add a regular folder with name sub" &&
-
-		echo "123" >a_file &&
-		git add a_file &&
-		git commit -m "modify a file" &&
-
-		git checkout main &&
-
-		git submodule add ../sub sub &&
-		git submodule update sub &&
-		git commit -m "add a submodule info folder with name sub" &&
-
-		git cherry-pick test
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3908-stash-in-worktree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3908-stash-in-worktree/.git/
 expecting success of 3908.1 'setup': 
@@ -211583,75 +211999,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3907-stash-show-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3701-add-interactive.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3701-add-interactive/.git/
 expecting success of 3701.1 'unknown command': 
@@ -213791,6 +214138,116 @@
 1..85
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3909-stash-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3910-mac-os-precompose.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3910-mac-os-precompose/.git/
 checking prerequisite: UTF8_NFD_TO_NFC
@@ -213809,6 +214266,75 @@
 1..0 # SKIP filesystem does not corrupt utf-8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3907-stash-show-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3513-revert-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3513-revert-submodule/.git/
 expecting success of 3513.1 'git_revert: added submodule creates empty directory': 
@@ -214427,527 +214953,124 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3305-notes-fanout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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;
+*** t4003-diff-rename-1.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-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
+f7f2b494dd94f6acf05bc19174516b590236eb2d
+ok 1 - prepare reference tree
 
-expecting success of 3305.2 'creating many notes with git-notes': 
-	num_notes=300 &&
-	i=0 &&
-	while test $i -lt $num_notes
-	do
-		i=$(($i + 1)) &&
-		test_tick &&
-		echo "file for commit #$i" > file &&
-		git add file &&
-		git commit -q -m "commit #$i" &&
-		git notes add -m "note #$i" || return 1
-	done
+expecting success of 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 - creating many notes with git-notes
+ok 2 - prepare work tree
 
-expecting success of 3305.3 'many notes created correctly with git-notes': 
-	git log >output.raw &&
-	grep "^    " output.raw >output &&
-	i=$num_notes &&
-	while test $i -gt 0
-	do
-		echo "    commit #$i" &&
-		echo "    note #$i" &&
-		i=$(($i - 1)) || return 1
-	done > expect &&
-	test_cmp expect output
+expecting success of 4003.3 'validate output from rename/copy detection (#1)': 
+	compare_diff_patch current expected
 
-ok 3 - many notes created correctly with git-notes
+ok 3 - validate output from rename/copy detection (#1)
 
-expecting success of 3305.4 'stable fanout 0 is followed by stable fanout 1': 
-	i=$num_notes &&
-	fanout=0 &&
-	while test $i -gt 0
-	do
-		i=$(($i - 1)) &&
-		if touched_one_note_with_fanout refs/notes/commits~$i A $fanout
-		then
-			continue
-		elif test $fanout -eq 0
-		then
-			fanout=1 &&
-			if all_notes_have_fanout refs/notes/commits~$i $fanout
-			then
-				echo "Fanout 0 -> 1 at refs/notes/commits~$i" &&
-				continue
-			fi
-		fi &&
-		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
-		git ls-tree -r --name-only refs/notes/commits~$i &&
-		return 1
-	done &&
-	all_notes_have_fanout refs/notes/commits 1
+expecting success of 4003.4 'prepare work tree again': 
+	mv COPYING.2 COPYING &&
+	git update-index --add --remove COPYING COPYING.1 COPYING.2
 
-Fanout 0 -> 1 at refs/notes/commits~202
-ok 4 - stable fanout 0 is followed by stable fanout 1
+ok 4 - prepare work tree again
 
-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
+expecting success of 4003.5 'validate output from rename/copy detection (#2)': 
+	compare_diff_patch current expected
 
-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
+ok 5 - validate output from rename/copy detection (#2)
 
-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
+expecting success of 4003.6 'prepare work tree once again': 
+	COPYING_test_data >COPYING &&
+	git update-index --add --remove COPYING COPYING.1
 
-ok 6 - most notes deleted correctly with git-notes
+ok 6 - prepare work tree once again
 
-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
+expecting success of 4003.7 'validate output from rename/copy detection (#3)': 
+	compare_diff_patch current expected
 
-Fanout 1 -> 0 at refs/notes/commits~43
-ok 7 - stable fanout 1 is followed by stable fanout 0
+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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3909-stash-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+*** t4004-diff-rename-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4004-diff-rename-symlink/.git/
+checking prerequisite: SYMLINKS
 
-	# 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 &&
+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
 
-	cat >expect <<-\EOF &&
-	M	fileB.t
-	M	fileC.t
-	EOF
+)
+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
 
-	printf "fileB.t\nfileC.t\n" | git stash push --pathspec-from-file=- &&
-	verify_expect
+e8a7292168115b2c189b56bd500aa179ca8d69ba
+ok 1 - prepare reference tree
 
-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 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
 
-expecting success of 3909.5 'error conditions': 
-	restore_checkpoint &&
-	echo A >fileA.t &&
-	echo fileA.t >list &&
+ok 2 - prepare work tree
 
-	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 &&
+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
 
-	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 &&
+ok 3 - setup diff output
 
-	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 4004.4 'validate diff output': 
+	compare_diff_patch current expected
 
-HEAD is now at 2d1bb5b Files
-fatal: options '--pathspec-from-file' and '--patch' cannot be used together
-fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
-fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
-ok 5 - error conditions
+ok 4 - validate diff output
 
-# passed all 5 test(s)
-1..5
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3905-stash-include-untracked.sh ***
@@ -215549,126 +215672,6 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4003-diff-rename-1.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4004-diff-rename-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4005-diff-rename-2.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4005-diff-rename-2/.git/
 expecting success of 4005.1 'setup reference tree': 
@@ -215728,6 +215731,1197 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4006-diff-mode.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t3920-crlf-messages.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3920-crlf-messages/.git/
+expecting success of 3920.1 'Setup refs with commit and tag messages using CRLF': 
+	test_commit inital &&
+	create_crlf_refs
+
+[master (root-commit) b6c1fc7] inital
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 inital.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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4000-diff-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4001-diff-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4007-rename-3.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4009-diff-rename-4.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3800-mktag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3800-mktag/.git/
 expecting success of 3800.1 'setup': 
@@ -218315,1233 +219509,42 @@
 1..151
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4000-diff-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t4008-diff-break-rewrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 - update-index --add two files with and without +x.
+ok 1 - setup
 
-expecting success of 4000.2 'git diff-files -p after editing work tree.': 
-	git diff-files -p >actual
+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 - git diff-files -p after editing work tree.
+ok 2 - change file1 with copy-edit of file0 and remove file0
 
-expecting success of 4000.3 'validate git diff-files -p output.': 
-	compare_diff_patch expected actual
+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 - validate git diff-files -p output.
+ok 3 - run diff with -B (#1)
 
-expecting success of 4000.4 'git diff-files -s after editing work tree': 
-	git diff-files -s >actual 2>err &&
-	test_must_be_empty actual &&
-	test_must_be_empty err
-
-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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4006-diff-mode.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4001-diff-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4007-rename-3.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3920-crlf-messages.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3920-crlf-messages/.git/
-expecting success of 3920.1 'Setup refs with commit and tag messages using CRLF': 
-	test_commit inital &&
-	create_crlf_refs
-
-[master (root-commit) b6c1fc7] inital
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 inital.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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4009-diff-rename-4.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4008-diff-break-rewrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+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)
 
@@ -219844,6 +219847,139 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4012-diff-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4010-diff-pathspec.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4010-diff-pathspec/.git/
 expecting success of 4010.1 'setup': echo frotz >file0 &&
@@ -220009,139 +220145,6 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4012-diff-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4016-diff-quote.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4016-diff-quote/.git/
 expecting success of 4016.1 'setup': 
@@ -221365,134 +221368,6 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4022-diff-rewrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4022-diff-rewrite/.git/
-expecting success of 4022.1 'setup': 
-
-	COPYING_test_data >test.data &&
-	cp test.data test &&
-	git add test &&
-	tr \
-	  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-	  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
-	  <test.data >test &&
-	echo "to be deleted" >test2 &&
-	blob=$(git hash-object test2) &&
-	blob=$(git rev-parse --short $blob) &&
-	git add test2
-
-
-ok 1 - setup
-
-expecting success of 4022.2 'detect rewrite': 
-
-	actual=$(git diff-files -B --summary test) &&
-	expr "$actual" : " rewrite test ([0-9]*%)$"
-
-
-19
-ok 2 - detect rewrite
-
-expecting success of 4022.3 'show deletion diff without -D': 
-
-	rm test2 &&
-	git diff -- test2 >actual &&
-	test_cmp expect actual
-
-ok 3 - show deletion diff without -D
-
-expecting success of 4022.4 'suppress deletion diff with -D': 
-
-	git diff -D -- test2 >actual &&
-	test_cmp expect actual
-
-ok 4 - suppress deletion diff with -D
-
-expecting success of 4022.5 'show deletion diff with -B': 
-
-	git diff -B -- test >actual &&
-	grep "Linus Torvalds" actual
-
--			Linus Torvalds
-ok 5 - show deletion diff with -B
-
-expecting success of 4022.6 'suppress deletion diff with -B -D': 
-
-	git diff -B -D -- test >actual &&
-	grep -v "Linus Torvalds" actual
-
-diff --git a/test b/test
-dissimilarity index 99%
-index 27063eb..f1f2e4d 100644
---- a/test
-+++ b/test
-@@ -?,? +1,18 @@
-+
-+ Abgr gung gur bayl inyvq irefvba bs gur TCY nf sne nf guvf cebwrpg
-+ vf pbaprearq vf _guvf_ cnegvphyne irefvba bs gur yvprafr (vr i2, abg
-+ i2.2 be i3.k be jungrire), hayrff rkcyvpvgyl bgurejvfr fgngrq.
-+
-+ UBJRIRE, va beqre gb nyybj n zvtengvba gb TCYi3 vs gung frrzf yvxr
-+ n tbbq vqrn, V nyfb nfx gung crbcyr vaibyirq jvgu gur cebwrpg znxr
-+ gurve cersreraprf xabja. Va cnegvphyne, vs lbh gehfg zr gb znxr gung
-+ qrpvfvba, lbh zvtug abgr fb va lbhe pbclevtug zrffntr, vr fbzrguvat
-+ yvxr
-+
-+	Guvf svyr vf yvprafrq haqre gur TCY i2, be n yngre irefvba
-+	ng gur qvfpergvba bs Yvahf.
-+
-+  zvtug nibvq vffhrf. Ohg jr pna nyfb whfg qrpvqr gb flapuebavmr naq
-+  pbagnpg nyy pbclevtug ubyqref ba erpbeq vs/jura gur bppnfvba nevfrf.
-+
-+			Yvahf Gbeinyqf
-ok 6 - suppress deletion diff with -B -D
-
-expecting success of 4022.7 'prepare a file that ends with an incomplete line': 
-	test_seq 1 99 >seq &&
-	printf 100 >>seq &&
-	git add seq &&
-	git commit seq -m seq
-
-[master (root-commit) 2d6607f] seq
- Author: A U Thor <author@example.com>
- 1 file changed, 100 insertions(+)
- create mode 100644 seq
-ok 7 - prepare a file that ends with an incomplete line
-
-expecting success of 4022.8 'rewrite the middle 90% of sequence file and terminate with newline': 
-	test_seq 1 5 >seq &&
-	test_seq 9331 9420 >>seq &&
-	test_seq 96 100 >>seq
-
-ok 8 - rewrite the middle 90% of sequence file and terminate with newline
-
-expecting success of 4022.9 'confirm that sequence file is considered a rewrite': 
-	git diff -B seq >res &&
-	grep "dissimilarity index" res
-
-dissimilarity index 92%
-ok 9 - confirm that sequence file is considered a rewrite
-
-expecting success of 4022.10 'no newline at eof is on its own line without -B': 
-	git diff seq >res &&
-	grep "^\\\\ " res &&
-	! grep "^..*\\\\ " res
-
-\ No newline at end of file
-ok 10 - no newline at eof is on its own line without -B
-
-expecting success of 4022.11 'no newline at eof is on its own line with -B': 
-	git diff -B seq >res &&
-	grep "^\\\\ " res &&
-	! grep "^..*\\\\ " res
-
-\ No newline at end of file
-ok 11 - no newline at eof is on its own line with -B
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4021-format-patch-numbered.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4021-format-patch-numbered/.git/
 expecting success of 4021.1 'setup': 
@@ -221635,6 +221510,134 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4022-diff-rewrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4022-diff-rewrite/.git/
+expecting success of 4022.1 'setup': 
+
+	COPYING_test_data >test.data &&
+	cp test.data test &&
+	git add test &&
+	tr \
+	  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+	  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
+	  <test.data >test &&
+	echo "to be deleted" >test2 &&
+	blob=$(git hash-object test2) &&
+	blob=$(git rev-parse --short $blob) &&
+	git add test2
+
+
+ok 1 - setup
+
+expecting success of 4022.2 'detect rewrite': 
+
+	actual=$(git diff-files -B --summary test) &&
+	expr "$actual" : " rewrite test ([0-9]*%)$"
+
+
+19
+ok 2 - detect rewrite
+
+expecting success of 4022.3 'show deletion diff without -D': 
+
+	rm test2 &&
+	git diff -- test2 >actual &&
+	test_cmp expect actual
+
+ok 3 - show deletion diff without -D
+
+expecting success of 4022.4 'suppress deletion diff with -D': 
+
+	git diff -D -- test2 >actual &&
+	test_cmp expect actual
+
+ok 4 - suppress deletion diff with -D
+
+expecting success of 4022.5 'show deletion diff with -B': 
+
+	git diff -B -- test >actual &&
+	grep "Linus Torvalds" actual
+
+-			Linus Torvalds
+ok 5 - show deletion diff with -B
+
+expecting success of 4022.6 'suppress deletion diff with -B -D': 
+
+	git diff -B -D -- test >actual &&
+	grep -v "Linus Torvalds" actual
+
+diff --git a/test b/test
+dissimilarity index 99%
+index 27063eb..f1f2e4d 100644
+--- a/test
++++ b/test
+@@ -?,? +1,18 @@
++
++ Abgr gung gur bayl inyvq irefvba bs gur TCY nf sne nf guvf cebwrpg
++ vf pbaprearq vf _guvf_ cnegvphyne irefvba bs gur yvprafr (vr i2, abg
++ i2.2 be i3.k be jungrire), hayrff rkcyvpvgyl bgurejvfr fgngrq.
++
++ UBJRIRE, va beqre gb nyybj n zvtengvba gb TCYi3 vs gung frrzf yvxr
++ n tbbq vqrn, V nyfb nfx gung crbcyr vaibyirq jvgu gur cebwrpg znxr
++ gurve cersreraprf xabja. Va cnegvphyne, vs lbh gehfg zr gb znxr gung
++ qrpvfvba, lbh zvtug abgr fb va lbhe pbclevtug zrffntr, vr fbzrguvat
++ yvxr
++
++	Guvf svyr vf yvprafrq haqre gur TCY i2, be n yngre irefvba
++	ng gur qvfpergvba bs Yvahf.
++
++  zvtug nibvq vffhrf. Ohg jr pna nyfb whfg qrpvqr gb flapuebavmr naq
++  pbagnpg nyy pbclevtug ubyqref ba erpbeq vs/jura gur bppnfvba nevfrf.
++
++			Yvahf Gbeinyqf
+ok 6 - suppress deletion diff with -B -D
+
+expecting success of 4022.7 'prepare a file that ends with an incomplete line': 
+	test_seq 1 99 >seq &&
+	printf 100 >>seq &&
+	git add seq &&
+	git commit seq -m seq
+
+[master (root-commit) 2d6607f] seq
+ Author: A U Thor <author@example.com>
+ 1 file changed, 100 insertions(+)
+ create mode 100644 seq
+ok 7 - prepare a file that ends with an incomplete line
+
+expecting success of 4022.8 'rewrite the middle 90% of sequence file and terminate with newline': 
+	test_seq 1 5 >seq &&
+	test_seq 9331 9420 >>seq &&
+	test_seq 96 100 >>seq
+
+ok 8 - rewrite the middle 90% of sequence file and terminate with newline
+
+expecting success of 4022.9 'confirm that sequence file is considered a rewrite': 
+	git diff -B seq >res &&
+	grep "dissimilarity index" res
+
+dissimilarity index 92%
+ok 9 - confirm that sequence file is considered a rewrite
+
+expecting success of 4022.10 'no newline at eof is on its own line without -B': 
+	git diff seq >res &&
+	grep "^\\\\ " res &&
+	! grep "^..*\\\\ " res
+
+\ No newline at end of file
+ok 10 - no newline at eof is on its own line without -B
+
+expecting success of 4022.11 'no newline at eof is on its own line with -B': 
+	git diff -B seq >res &&
+	grep "^\\\\ " res &&
+	! grep "^..*\\\\ " res
+
+\ No newline at end of file
+ok 11 - no newline at eof is on its own line with -B
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4025-hunk-header.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4025-hunk-header/.git/
 expecting success of 4025.1 'setup': 
@@ -221804,6 +221807,90 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4024-diff-optimize-common.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4028-format-patch-mime-headers.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4028-format-patch-mime-headers/.git/
+expecting success of 4028.1 'create commit with utf-8 body': 
+	echo content >file &&
+	git add file &&
+	git commit -m one &&
+	echo more >>file &&
+	git commit -a -m "two
+
+	utf-8 body: ñ"
+
+[master (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 219a3c6] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - create commit with utf-8 body
+
+expecting success of 4028.2 'patch has mime headers': 
+	rm -f 0001-two.patch &&
+	git format-patch HEAD^ &&
+	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
+
+0001-two.patch
+Content-Type: text/plain; charset=UTF-8
+ok 2 - patch has mime headers
+
+expecting success of 4028.3 'patch has mime and extra headers': 
+	rm -f 0001-two.patch &&
+	git config format.headers "x-foo: bar" &&
+	git format-patch HEAD^ &&
+	grep -i "x-foo: bar" 0001-two.patch &&
+	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
+
+0001-two.patch
+x-foo: bar
+Content-Type: text/plain; charset=UTF-8
+ok 3 - patch has mime and extra headers
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3432-rebase-fast-forward.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3432-rebase-fast-forward/.git/
 expecting success of 3432.1 'setup': 
@@ -231840,119 +231927,6 @@
 1..225
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4024-diff-optimize-common.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4028-format-patch-mime-headers.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4028-format-patch-mime-headers/.git/
-expecting success of 4028.1 'create commit with utf-8 body': 
-	echo content >file &&
-	git add file &&
-	git commit -m one &&
-	echo more >>file &&
-	git commit -a -m "two
-
-	utf-8 body: ñ"
-
-[master (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 219a3c6] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - create commit with utf-8 body
-
-expecting success of 4028.2 'patch has mime headers': 
-	rm -f 0001-two.patch &&
-	git format-patch HEAD^ &&
-	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
-
-0001-two.patch
-Content-Type: text/plain; charset=UTF-8
-ok 2 - patch has mime headers
-
-expecting success of 4028.3 'patch has mime and extra headers': 
-	rm -f 0001-two.patch &&
-	git config format.headers "x-foo: bar" &&
-	git format-patch HEAD^ &&
-	grep -i "x-foo: bar" 0001-two.patch &&
-	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
-
-0001-two.patch
-x-foo: bar
-Content-Type: text/plain; charset=UTF-8
-ok 3 - patch has mime and extra headers
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4029-diff-trailing-space.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4029-diff-trailing-space/.git/
-expecting success of 4029.1 'diff honors config option, diff.suppressBlankEmpty': 
-	printf "\nx\n" > f &&
-	before=$(git hash-object f) &&
-	before=$(git rev-parse --short $before) &&
-	git add f &&
-	git commit -q -m. f &&
-	printf "\ny\n" > f &&
-	after=$(git hash-object f) &&
-	after=$(git rev-parse --short $after) &&
-	sed -e "s/^index .*/index $before..$after 100644/" expected >exp &&
-	git config --bool diff.suppressBlankEmpty true &&
-	git diff f > actual &&
-	test_cmp exp actual &&
-	perl -i.bak -p -e "s/^\$/ /" exp &&
-	git config --bool diff.suppressBlankEmpty false &&
-	git diff f > actual &&
-	test_cmp exp actual &&
-	git config --bool --unset diff.suppressBlankEmpty &&
-	git diff f > actual &&
-	test_cmp exp actual
-
-ok 1 - diff honors config option, diff.suppressBlankEmpty
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4026-color.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4026-color/.git/
 expecting success of 4026.1 'reset': 
@@ -232191,528 +232165,33 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4031-diff-rewrite-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4031-diff-rewrite-binary/.git/
-expecting success of 4031.1 'create binary file with changes': 
-	make_file "\\0" &&
-	git add file &&
-	make_file "\\01"
-
-ok 1 - create binary file with changes
-
-expecting success of 4031.2 'vanilla diff is binary': 
-	git diff >diff &&
-	grep "Binary files a/file and b/file differ" diff
-
-Binary files a/file and b/file differ
-ok 2 - vanilla diff is binary
-
-expecting success of 4031.3 'rewrite diff is binary': 
-	git diff -B >diff &&
-	grep "dissimilarity index" diff &&
-	grep "Binary files a/file and b/file differ" diff
-
-dissimilarity index 99%
-Binary files a/file and b/file differ
-ok 3 - rewrite diff is binary
-
-expecting success of 4031.4 'rewrite diff can show binary patch': 
-	git diff -B --binary >diff &&
-	grep "dissimilarity index" diff &&
-	grep "GIT binary patch" diff
-
-dissimilarity index 99%
-GIT binary patch
-ok 4 - rewrite diff can show binary patch
-
-expecting success of 4031.5 'rewrite diff --numstat shows binary changes': 
-	git diff -B --numstat --summary >diff &&
-	grep -e "-	-	" diff &&
-	grep " rewrite file" diff
-
--	-	file
- rewrite file (99%)
-ok 5 - rewrite diff --numstat shows binary changes
-
-expecting success of 4031.6 'diff --stat counts binary rewrite as 0 lines': 
-	git diff -B --stat --summary >diff &&
-	grep "Bin" diff &&
-	test_grep "0 insertions.*0 deletions" diff &&
-	grep " rewrite file" diff
-
- file | Bin 902 -> 902 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rewrite file (99%)
-ok 6 - diff --stat counts binary rewrite as 0 lines
-
-expecting success of 4031.7 'setup textconv': 
-	echo file diff=foo >.gitattributes &&
-	git config diff.foo.textconv "\"$(pwd)\""/dump
-
-ok 7 - setup textconv
-
-expecting success of 4031.8 'rewrite diff respects textconv': 
-	git diff -B >diff &&
-	grep "dissimilarity index" diff &&
-	grep "^-61" diff &&
-	grep "^-0" diff
+*** t4029-diff-trailing-space.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4029-diff-trailing-space/.git/
+expecting success of 4029.1 'diff honors config option, diff.suppressBlankEmpty': 
+	printf "\nx\n" > f &&
+	before=$(git hash-object f) &&
+	before=$(git rev-parse --short $before) &&
+	git add f &&
+	git commit -q -m. f &&
+	printf "\ny\n" > f &&
+	after=$(git hash-object f) &&
+	after=$(git rev-parse --short $after) &&
+	sed -e "s/^index .*/index $before..$after 100644/" expected >exp &&
+	git config --bool diff.suppressBlankEmpty true &&
+	git diff f > actual &&
+	test_cmp exp actual &&
+	perl -i.bak -p -e "s/^\$/ /" exp &&
+	git config --bool diff.suppressBlankEmpty false &&
+	git diff f > actual &&
+	test_cmp exp actual &&
+	git config --bool --unset diff.suppressBlankEmpty &&
+	git diff f > actual &&
+	test_cmp exp actual
 
-dissimilarity index 99%
--61
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
-ok 8 - rewrite diff respects textconv
+ok 1 - diff honors config option, diff.suppressBlankEmpty
 
-# passed all 8 test(s)
-1..8
+# passed all 1 test(s)
+1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3906-stash-submodule.sh ***
@@ -232897,8 +232376,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	2026-03-04 07:58:12.103352315 +0000
-+++ actual	2026-03-04 07:58:12.211352315 +0000
+--- expect	2025-01-30 02:11:02.291844582 +0000
++++ actual	2025-01-30 02:11:02.403845254 +0000
 @@ -2,5 +2,3 @@
  expect
  file1
@@ -233197,8 +232676,8 @@
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'modify_sub1' set up to track 'origin/modify_sub1'.
 No local changes to save
---- expect	2026-03-04 07:58:21.375352315 +0000
-+++ actual	2026-03-04 07:58:21.447352315 +0000
+--- expect	2025-01-30 02:11:11.435899419 +0000
++++ actual	2025-01-30 02:11:11.527899970 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -233229,8 +232708,8 @@
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
 No local changes to save
---- expect	2026-03-04 07:58:22.447352315 +0000
-+++ actual	2026-03-04 07:58:22.515352315 +0000
+--- expect	2025-01-30 02:11:12.507905847 +0000
++++ actual	2025-01-30 02:11:12.607906447 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -233258,8 +232737,8 @@
 fatal: Needed a single revision
 branch 'valid_sub1' set up to track 'origin/valid_sub1'.
 No local changes to save
---- expect	2026-03-04 07:58:22.931352315 +0000
-+++ actual	2026-03-04 07:58:23.007352315 +0000
+--- expect	2025-01-30 02:11:13.079909278 +0000
++++ actual	2025-01-30 02:11:13.135909613 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -233360,6 +232839,530 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4031-diff-rewrite-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4031-diff-rewrite-binary/.git/
+expecting success of 4031.1 'create binary file with changes': 
+	make_file "\\0" &&
+	git add file &&
+	make_file "\\01"
+
+ok 1 - create binary file with changes
+
+expecting success of 4031.2 'vanilla diff is binary': 
+	git diff >diff &&
+	grep "Binary files a/file and b/file differ" diff
+
+Binary files a/file and b/file differ
+ok 2 - vanilla diff is binary
+
+expecting success of 4031.3 'rewrite diff is binary': 
+	git diff -B >diff &&
+	grep "dissimilarity index" diff &&
+	grep "Binary files a/file and b/file differ" diff
+
+dissimilarity index 99%
+Binary files a/file and b/file differ
+ok 3 - rewrite diff is binary
+
+expecting success of 4031.4 'rewrite diff can show binary patch': 
+	git diff -B --binary >diff &&
+	grep "dissimilarity index" diff &&
+	grep "GIT binary patch" diff
+
+dissimilarity index 99%
+GIT binary patch
+ok 4 - rewrite diff can show binary patch
+
+expecting success of 4031.5 'rewrite diff --numstat shows binary changes': 
+	git diff -B --numstat --summary >diff &&
+	grep -e "-	-	" diff &&
+	grep " rewrite file" diff
+
+-	-	file
+ rewrite file (99%)
+ok 5 - rewrite diff --numstat shows binary changes
+
+expecting success of 4031.6 'diff --stat counts binary rewrite as 0 lines': 
+	git diff -B --stat --summary >diff &&
+	grep "Bin" diff &&
+	test_grep "0 insertions.*0 deletions" diff &&
+	grep " rewrite file" diff
+
+ file | Bin 902 -> 902 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rewrite file (99%)
+ok 6 - diff --stat counts binary rewrite as 0 lines
+
+expecting success of 4031.7 'setup textconv': 
+	echo file diff=foo >.gitattributes &&
+	git config diff.foo.textconv "\"$(pwd)\""/dump
+
+ok 7 - setup textconv
+
+expecting success of 4031.8 'rewrite diff respects textconv': 
+	git diff -B >diff &&
+	grep "dissimilarity index" diff &&
+	grep "^-61" diff &&
+	grep "^-0" diff
+
+dissimilarity index 99%
+-61
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+ok 8 - rewrite diff respects textconv
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4027-diff-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4027-diff-submodule/.git/
 expecting success of 4027.1 'setup': 
@@ -233699,6 +233702,114 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4033-diff-patience.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4020-diff-external.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4020-diff-external/.git/
 expecting success of 4020.1 'setup': 
@@ -234362,8 +234473,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
-file /tmp/git-blob-GD0T6R/file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
-file2 /tmp/git-blob-OsOCCl/file2 abc9fa522731419e7eaa3d472e3cb3d99e475c49 100644 file2 0000000000000000000000000000000000000000 100644
+file /tmp/git-blob-Rdmvug/file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
+file2 /tmp/git-blob-3Htpdl/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': 
@@ -234644,6 +234755,562 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4036-format-patch-signer-mime.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4036-format-patch-signer-mime/.git/
+expecting success of 4036.1 'setup': 
+
+	>F &&
+	git add F &&
+	git commit -m initial &&
+	echo new line >F &&
+
+	test_tick &&
+	git commit -m "This adds some lines to F" F
+
+
+[master (root-commit) bf01fa7] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 F
+[master dc5bbb5] This adds some lines to F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 4036.2 'format normally': 
+
+	git format-patch --stdout -1 >output &&
+	! grep Content-Type output
+
+
+ok 2 - format normally
+
+expecting success of 4036.3 'format with signoff without funny signer name': 
+
+	git format-patch -s --stdout -1 >output &&
+	! grep Content-Type output
+
+
+ok 3 - format with signoff without funny signer name
+
+expecting success of 4036.4 'format with non ASCII signer name': 
+
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 >output &&
+	grep Content-Type output
+
+
+Content-Type: text/plain; charset=UTF-8
+ok 4 - format with non ASCII signer name
+
+expecting success of 4036.5 'attach and signoff do not duplicate mime headers': 
+
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 --attach >output &&
+	test $(grep -ci ^MIME-Version: output) = 1
+
+
+ok 5 - attach and signoff do not duplicate mime headers
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4037-diff-r-t-dirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4037-diff-r-t-dirs/.git/
+expecting success of 4037.1 'setup': 
+	mkdir dc dr dt &&
+	>dc/1 &&
+	>dr/2 &&
+	>dt/3 &&
+	>fc &&
+	>fr &&
+	>ft &&
+	git add . &&
+	test_tick &&
+	git commit -m initial &&
+
+	rm -fr dt dr ft fr &&
+	mkdir da ft &&
+	for p in dc/1 da/4 dt ft/5 fc
+	do
+		echo hello >$p || exit
+	done &&
+	git add -u &&
+	git add . &&
+	test_tick &&
+	git commit -m second
+
+[master (root-commit) 26fc746] initial
+ Author: A U Thor <author@example.com>
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dc/1
+ create mode 100644 dr/2
+ create mode 100644 dt/3
+ create mode 100644 fc
+ create mode 100644 fr
+ create mode 100644 ft
+[master 25e238e] second
+ Author: A U Thor <author@example.com>
+ 9 files changed, 5 insertions(+)
+ create mode 100644 da/4
+ delete mode 100644 dr/2
+ create mode 100644 dt
+ delete mode 100644 dt/3
+ delete mode 100644 fr
+ delete mode 100644 ft
+ create mode 100644 ft/5
+ok 1 - setup
+
+expecting success of 4037.2 'verify': 
+	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 2 - verify
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4035-diff-quiet.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4035-diff-quiet/.git/
+expecting success of 4035.1 'setup': 
+	echo 1 >a &&
+	git add . &&
+	git commit -m first &&
+	echo 2 >b &&
+	git add . &&
+	git commit -a -m second &&
+	mkdir -p test-outside/repo && (
+		cd test-outside/repo &&
+		git init &&
+		echo "1 1" >a &&
+		git add . &&
+		git commit -m 1
+	) &&
+	mkdir -p test-outside/non/git && (
+		cd test-outside/non/git &&
+		echo "1 1" >a &&
+		echo "1 1" >matching-file &&
+		echo "1 1 " >trailing-space &&
+		echo "1   1" >extra-space &&
+		echo "2" >never-match
+	)
+
+[master (root-commit) 703ec9e] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[master 3476b69] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4035-diff-quiet/test-outside/repo/.git/
+[master (root-commit) f9eeef1] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+ok 1 - setup
+
+expecting success of 4035.2 'git diff-tree HEAD^ HEAD': 
+	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt &&
+	test_line_count = 0 cnt
+
+ok 2 - git diff-tree HEAD^ HEAD
+
+expecting success of 4035.3 'git diff-tree HEAD^ HEAD -- a': 
+	test_expect_code 0 git diff-tree --quiet HEAD^ HEAD -- a >cnt &&
+	test_line_count = 0 cnt
+
+ok 3 - git diff-tree HEAD^ HEAD -- a
+
+expecting success of 4035.4 'git diff-tree HEAD^ HEAD -- b': 
+	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
+
+ok 4 - git diff-tree HEAD^ HEAD -- b
+
+expecting success of 4035.5 'echo HEAD | git diff-tree --stdin': 
+	echo $(git rev-parse HEAD) |
+	test_expect_code 1 git diff-tree --quiet --stdin >cnt &&
+	test_line_count = 1 cnt
+
+ok 5 - echo HEAD | git diff-tree --stdin
+
+expecting success of 4035.6 'git diff-tree HEAD HEAD': 
+	test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt &&
+	test_line_count = 0 cnt
+
+ok 6 - git diff-tree HEAD HEAD
+
+expecting success of 4035.7 'git diff-files': 
+	test_expect_code 0 git diff-files --quiet >cnt &&
+	test_line_count = 0 cnt
+
+ok 7 - git diff-files
+
+expecting success of 4035.8 'git diff-index --cached HEAD': 
+	test_expect_code 0 git diff-index --quiet --cached HEAD >cnt &&
+	test_line_count = 0 cnt
+
+ok 8 - git diff-index --cached HEAD
+
+expecting success of 4035.9 'git diff-index --cached HEAD^': 
+	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
+	test_line_count = 0 cnt
+
+ok 9 - git diff-index --cached HEAD^
+
+expecting success of 4035.10 'git diff-index --cached HEAD^': 
+	echo text >>b &&
+	echo 3 >c &&
+	git add . &&
+	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
+	test_line_count = 0 cnt
+
+warning: adding embedded git repository: test-outside/repo
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> test-outside/repo
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached test-outside/repo
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+ok 10 - git diff-index --cached HEAD^
+
+expecting success of 4035.11 'git diff-tree -Stext HEAD^ HEAD -- b': 
+	git commit -m "text in b" &&
+	test_expect_code 1 git diff-tree --quiet -Stext HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
+
+[master b583ee2] text in b
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+)
+ create mode 100644 c
+ create mode 100644 cnt
+ create mode 100644 test-outside/non/git/a
+ create mode 100644 test-outside/non/git/extra-space
+ create mode 100644 test-outside/non/git/matching-file
+ create mode 100644 test-outside/non/git/never-match
+ create mode 100644 test-outside/non/git/trailing-space
+ create mode 160000 test-outside/repo
+ok 11 - git diff-tree -Stext HEAD^ HEAD -- b
+
+expecting success of 4035.12 'git diff-tree -Snot-found HEAD^ HEAD -- b': 
+	test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
+
+ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
+
+expecting success of 4035.13 'git diff-files': 
+	echo 3 >>c &&
+	test_expect_code 1 git diff-files --quiet >cnt &&
+	test_line_count = 0 cnt
+
+ok 13 - git diff-files
+
+expecting success of 4035.14 'git diff-index --cached HEAD': 
+	git update-index c &&
+	test_expect_code 1 git diff-index --quiet --cached HEAD >cnt &&
+	test_line_count = 0 cnt
+
+ok 14 - git diff-index --cached HEAD
+
+expecting success of 4035.15 'git diff, one file outside repo': 
+	(
+		cd test-outside/repo &&
+		test_expect_code 0 git diff --quiet a ../non/git/matching-file &&
+		test_expect_code 1 git diff --quiet a ../non/git/extra-space
+	)
+
+ok 15 - git diff, one file outside repo
+
+expecting success of 4035.16 'git diff, both files outside repo': 
+	(
+		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd test-outside/non/git &&
+		test_expect_code 0 git diff --quiet a matching-file &&
+		test_expect_code 1 git diff --quiet a extra-space
+	)
+
+ok 16 - git diff, both files outside repo
+
+expecting success of 4035.17 'git diff --ignore-space-at-eol, one file outside repo': 
+	(
+		cd test-outside/repo &&
+		test_expect_code 0 git diff --quiet --ignore-space-at-eol a ../non/git/trailing-space &&
+		test_expect_code 1 git diff --quiet --ignore-space-at-eol a ../non/git/extra-space
+	)
+
+ok 17 - git diff --ignore-space-at-eol, one file outside repo
+
+expecting success of 4035.18 'git diff --ignore-space-at-eol, both files outside repo': 
+	(
+		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd test-outside/non/git &&
+		test_expect_code 0 git diff --quiet --ignore-space-at-eol a trailing-space &&
+		test_expect_code 1 git diff --quiet --ignore-space-at-eol a extra-space
+	)
+
+ok 18 - git diff --ignore-space-at-eol, both files outside repo
+
+expecting success of 4035.19 'git diff --ignore-all-space, one file outside repo': 
+	(
+		cd test-outside/repo &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/trailing-space &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/extra-space &&
+		test_expect_code 1 git diff --quiet --ignore-all-space a ../non/git/never-match
+	)
+
+ok 19 - git diff --ignore-all-space, one file outside repo
+
+expecting success of 4035.20 'git diff --ignore-all-space, both files outside repo': 
+	(
+		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd test-outside/non/git &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a trailing-space &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a extra-space &&
+		test_expect_code 1 git diff --quiet --ignore-all-space a never-match
+	)
+
+ok 20 - git diff --ignore-all-space, both files outside repo
+
+expecting success of 4035.21 'git diff --quiet ignores stat-change only entries': 
+	test-tool chmtime +10 a &&
+	echo modified >>b &&
+	test_expect_code 1 git diff --quiet
+
+ok 21 - git diff --quiet ignores stat-change only entries
+
+expecting success of 4035.22 'git diff --quiet on a path that need conversion': 
+	echo "crlf.txt text=auto" >.gitattributes &&
+	printf "Hello\r\nWorld\r\n" >crlf.txt &&
+	git add .gitattributes crlf.txt &&
+
+	printf "Hello\r\nWorld\n" >crlf.txt &&
+	git diff --quiet crlf.txt
+
+warning: in the working copy of 'crlf.txt', CRLF will be replaced by LF the next time Git touches it
+warning: in the working copy of 'crlf.txt', CRLF will be replaced by LF the next time Git touches it
+ok 22 - git diff --quiet on a path that need conversion
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4032-diff-inter-hunk-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4032-diff-inter-hunk-context/.git/
+expecting success of 4032.1 'diff -U0, 1 common line: count hunks (2)': 
+		test 2 = 2
+	
+ok 1 - diff -U0, 1 common line: count hunks (2)
+
+expecting success of 4032.2 'diff -U0, 1 common line: check output': 
+		git diff -U0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.2 actual
+	
+ok 2 - diff -U0, 1 common line: check output
+
+expecting success of 4032.3 'diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)': 
+		test 2 = 2
+	
+ok 3 - diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)
+
+expecting success of 4032.4 'diff -U0 --inter-hunk-context=0, 1 common line: check output': 
+		git diff -U0 --inter-hunk-context=0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.2 actual
+	
+ok 4 - diff -U0 --inter-hunk-context=0, 1 common line: check output
+
+expecting success of 4032.5 'diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 5 - diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)
+
+expecting success of 4032.6 'diff -U0 --inter-hunk-context=1, 1 common line: check output': 
+		git diff -U0 --inter-hunk-context=1 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 6 - diff -U0 --inter-hunk-context=1, 1 common line: check output
+
+expecting success of 4032.7 'diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 7 - diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)
+
+expecting success of 4032.8 'diff -U0 --inter-hunk-context=2, 1 common line: check output': 
+		git diff -U0 --inter-hunk-context=2 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 8 - diff -U0 --inter-hunk-context=2, 1 common line: check output
+
+expecting success of 4032.9 'diff -U1, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 9 - diff -U1, 1 common line: count hunks (1)
+
+expecting success of 4032.10 'diff -U0, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 10 - diff -U0, 2 common lines: count hunks (2)
+
+expecting success of 4032.11 'diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 11 - diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)
+
+expecting success of 4032.12 'diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 12 - diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)
+
+expecting success of 4032.13 'diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 13 - diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)
+
+expecting success of 4032.14 'diff -U1, 2 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 14 - diff -U1, 2 common lines: count hunks (1)
+
+expecting success of 4032.15 'diff -U1, 3 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 15 - diff -U1, 3 common lines: count hunks (2)
+
+expecting success of 4032.16 'diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 16 - diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)
+
+expecting success of 4032.17 'diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 17 - diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)
+
+expecting success of 4032.18 'diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 18 - diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)
+
+expecting success of 4032.19 'diff -U3, 9 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 19 - diff -U3, 9 common lines: count hunks (2)
+
+expecting success of 4032.20 'diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 20 - diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)
+
+expecting success of 4032.21 'diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 21 - diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)
+
+expecting success of 4032.22 '(diff.interHunkContext=0) diff -U0, 1 common line: count hunks (2)': 
+		test 2 = 2
+	
+ok 22 - (diff.interHunkContext=0) diff -U0, 1 common line: count hunks (2)
+
+expecting success of 4032.23 '(diff.interHunkContext=0) diff -U0, 1 common line: check output': 
+		git diff -U0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.2 actual
+	
+ok 23 - (diff.interHunkContext=0) diff -U0, 1 common line: check output
+
+expecting success of 4032.24 '(diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 24 - (diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)
+
+expecting success of 4032.25 '(diff.interHunkContext=1) diff -U0, 1 common line: check output': 
+		git diff -U0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 25 - (diff.interHunkContext=1) diff -U0, 1 common line: check output
+
+expecting success of 4032.26 '(diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 26 - (diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)
+
+expecting success of 4032.27 '(diff.interHunkContext=2) diff -U0, 1 common line: check output': 
+		git diff -U0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 27 - (diff.interHunkContext=2) diff -U0, 1 common line: check output
+
+expecting success of 4032.28 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 28 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
+
+expecting success of 4032.29 '(diff.interHunkContext=0) diff -U0, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 29 - (diff.interHunkContext=0) diff -U0, 2 common lines: count hunks (2)
+
+expecting success of 4032.30 '(diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 30 - (diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)
+
+expecting success of 4032.31 '(diff.interHunkContext=2) diff -U0, 2 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 31 - (diff.interHunkContext=2) diff -U0, 2 common lines: count hunks (1)
+
+expecting success of 4032.32 '(diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 32 - (diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)
+
+expecting success of 4032.33 '(diff.interHunkContext=1) diff -U1, 3 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 33 - (diff.interHunkContext=1) diff -U1, 3 common lines: count hunks (1)
+
+expecting success of 4032.34 '(diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 34 - (diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)
+
+expecting success of 4032.35 '(diff.interHunkContext=2) diff -U3, 9 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 35 - (diff.interHunkContext=2) diff -U3, 9 common lines: count hunks (2)
+
+expecting success of 4032.36 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 36 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
+
+expecting success of 4032.37 'diff.interHunkContext invalid': 
+	git config diff.interHunkContext asdf &&
+	test_must_fail git diff &&
+	git config diff.interHunkContext -1 &&
+	test_must_fail git diff
+
+fatal: bad numeric config value 'asdf' for 'diff.interhunkcontext' in file .git/config: invalid unit
+fatal: bad config variable 'diff.interhunkcontext' in file '.git/config' at line 7
+ok 37 - diff.interHunkContext invalid
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t3903-stash.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3903-stash/.git/
 expecting success of 3903.1 'usage on cmd and subcommand invalid option': 
@@ -237878,1175 +238545,276 @@
 1..127
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4033-diff-patience.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t3600-rm.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3600-rm/.git/
+expecting success of 3600.1 'Initialize test directory': 
+	touch -- foo bar baz "space embedded" -q &&
+	git add -- foo bar baz "space embedded" -q &&
+	git commit -m "add normal files"
 
-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
+[main (root-commit) 27fd14d] add normal files
  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
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 -q
+ create mode 100644 bar
+ create mode 100644 baz
+ create mode 100644 foo
+ create mode 100644 space embedded
+ok 1 - Initialize test directory
 
-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
+checking prerequisite: FUNNYNAMES
 
-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
+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
 
-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
+)
+prerequisite FUNNYNAMES ok
+expecting success of 3600.2 'add files with funny names': 
+	touch -- "tab	embedded" "newline${LF}embedded" &&
+	git add -- "tab	embedded" "newline${LF}embedded" &&
+	git commit -m "add files with tabs and newlines"
 
-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
+[main eaf70aa] add files with tabs and newlines
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 "newline\nembedded"
+ create mode 100644 "tab\tembedded"
+ok 2 - add files with funny names
 
-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 3600.3 'Pre-check that foo exists and is in index before git rm foo': 
+	test_path_is_file foo &&
+	git ls-files --error-unmatch foo
 
-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
+foo
+ok 3 - Pre-check that foo exists and is in index before git rm foo
 
-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 3600.4 'Test that git rm foo succeeds': 
+	git rm --cached foo
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4036-format-patch-signer-mime.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4036-format-patch-signer-mime/.git/
-expecting success of 4036.1 'setup': 
+rm 'foo'
+ok 4 - Test that git rm foo succeeds
 
-	>F &&
-	git add F &&
-	git commit -m initial &&
-	echo new line >F &&
+expecting success of 3600.5 'Test that git rm --cached foo succeeds if the index matches the file': 
+	echo content >foo &&
+	git add foo &&
+	git rm --cached foo
 
-	test_tick &&
-	git commit -m "This adds some lines to F" F
+rm 'foo'
+ok 5 - Test that git rm --cached foo succeeds if the index matches the file
 
+expecting success of 3600.6 'Test that git rm --cached foo succeeds if the index matches the file': 
+	echo content >foo &&
+	git add foo &&
+	git commit -m foo &&
+	echo "other content" >foo &&
+	git rm --cached foo
 
-[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
+[main 774d6a8] foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 1 - setup
+rm 'foo'
+ok 6 - Test that git rm --cached foo succeeds if the index matches the file
 
-expecting success of 4036.2 'format normally': 
+expecting success of 3600.7 'Test that git rm --cached foo fails if the index matches neither the file nor HEAD': 
+	echo content >foo &&
+	git add foo &&
+	git commit -m foo --allow-empty &&
+	echo "other content" >foo &&
+	git add foo &&
+	echo "yet another content" >foo &&
+	test_must_fail git rm --cached foo
 
-	git format-patch --stdout -1 >output &&
-	! grep Content-Type output
+[main 105830b] foo
+ Author: A U Thor <author@example.com>
+error: the following file has staged content different from both the
+file and the HEAD:
+    foo
+(use -f to force removal)
+ok 7 - Test that git rm --cached foo fails if the index matches neither the file nor HEAD
 
+expecting success of 3600.8 'Test that git rm --cached -f foo works in case where --cached only did not': 
+	echo content >foo &&
+	git add foo &&
+	git commit -m foo --allow-empty &&
+	echo "other content" >foo &&
+	git add foo &&
+	echo "yet another content" >foo &&
+	git rm --cached -f foo
 
-ok 2 - format normally
+[main 6fb3ca4] foo
+ Author: A U Thor <author@example.com>
+rm 'foo'
+ok 8 - Test that git rm --cached -f foo works in case where --cached only did not
 
-expecting success of 4036.3 'format with signoff without funny signer name': 
+expecting success of 3600.9 'Post-check that foo exists but is not in index after git rm foo': 
+	test_path_is_file foo &&
+	test_must_fail git ls-files --error-unmatch foo
 
-	git format-patch -s --stdout -1 >output &&
-	! grep Content-Type output
+error: pathspec 'foo' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 9 - Post-check that foo exists but is not in index after git rm foo
 
+expecting success of 3600.10 'Pre-check that bar exists and is in index before "git rm bar"': 
+	test_path_is_file bar &&
+	git ls-files --error-unmatch bar
 
-ok 3 - format with signoff without funny signer name
+bar
+ok 10 - Pre-check that bar exists and is in index before "git rm bar"
 
-expecting success of 4036.4 'format with non ASCII signer name': 
+expecting success of 3600.11 'Test that "git rm bar" succeeds': 
+	git rm bar
 
-	GIT_COMMITTER_NAME="��� ����" \
-	git format-patch -s --stdout -1 >output &&
-	grep Content-Type output
+rm 'bar'
+ok 11 - Test that "git rm bar" succeeds
 
+expecting success of 3600.12 'Post-check that bar does not exist and is not in index after "git rm -f bar"': 
+	test_path_is_missing bar &&
+	test_must_fail git ls-files --error-unmatch bar
 
-Content-Type: text/plain; charset=UTF-8
-ok 4 - format with non ASCII signer name
+error: pathspec 'bar' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 12 - Post-check that bar does not exist and is not in index after "git rm -f bar"
 
-expecting success of 4036.5 'attach and signoff do not duplicate mime headers': 
+expecting success of 3600.13 'Test that "git rm -- -q" succeeds (remove a file that looks like an option)': 
+	git rm -- -q
 
-	GIT_COMMITTER_NAME="��� ����" \
-	git format-patch -s --stdout -1 --attach >output &&
-	test $(grep -ci ^MIME-Version: output) = 1
+rm '-q'
+ok 13 - Test that "git rm -- -q" succeeds (remove a file that looks like an option)
 
+expecting success of 3600.14 'Test that "git rm -f" succeeds with embedded space, tab, or newline characters.': 
+	git rm -f "space embedded" "tab	embedded" "newline${LF}embedded"
 
-ok 5 - attach and signoff do not duplicate mime headers
+rm 'newline
+embedded'
+rm 'space embedded'
+rm 'tab	embedded'
+ok 14 - Test that "git rm -f" succeeds with embedded space, tab, or newline characters.
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4035-diff-quiet.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4035-diff-quiet/.git/
-expecting success of 4035.1 'setup': 
-	echo 1 >a &&
-	git add . &&
-	git commit -m first &&
-	echo 2 >b &&
-	git add . &&
-	git commit -a -m second &&
-	mkdir -p test-outside/repo && (
-		cd test-outside/repo &&
-		git init &&
-		echo "1 1" >a &&
-		git add . &&
-		git commit -m 1
-	) &&
-	mkdir -p test-outside/non/git && (
-		cd test-outside/non/git &&
-		echo "1 1" >a &&
-		echo "1 1" >matching-file &&
-		echo "1 1 " >trailing-space &&
-		echo "1   1" >extra-space &&
-		echo "2" >never-match
-	)
+checking prerequisite: SANITY
 
-[master (root-commit) 703ec9e] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[master 3476b69] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4035-diff-quiet/test-outside/repo/.git/
-[master (root-commit) f9eeef1] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-ok 1 - setup
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-expecting success of 4035.2 'git diff-tree HEAD^ HEAD': 
-	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt &&
-	test_line_count = 0 cnt
+	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 2 - git diff-tree HEAD^ HEAD
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-expecting success of 4035.3 'git diff-tree HEAD^ HEAD -- a': 
-	test_expect_code 0 git diff-tree --quiet HEAD^ HEAD -- a >cnt &&
-	test_line_count = 0 cnt
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-ok 3 - git diff-tree HEAD^ HEAD -- a
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 3600.15 'Test that "git rm -f" fails if its rm fails': 
+	test_when_finished "chmod 775 ." &&
+	chmod a-w . &&
+	test_must_fail git rm -f baz
 
-expecting success of 4035.4 'git diff-tree HEAD^ HEAD -- b': 
-	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
+fatal: git rm: 'baz': Permission denied
+rm 'baz'
+ok 15 - Test that "git rm -f" fails if its rm fails
 
-ok 4 - git diff-tree HEAD^ HEAD -- b
+expecting success of 3600.16 'When the rm in "git rm -f" fails, it should not remove the file from the index': 
+	git ls-files --error-unmatch baz
 
-expecting success of 4035.5 'echo HEAD | git diff-tree --stdin': 
-	echo $(git rev-parse HEAD) |
-	test_expect_code 1 git diff-tree --quiet --stdin >cnt &&
-	test_line_count = 1 cnt
+baz
+ok 16 - When the rm in "git rm -f" fails, it should not remove the file from the index
 
-ok 5 - echo HEAD | git diff-tree --stdin
+expecting success of 3600.17 'Remove nonexistent file with --ignore-unmatch': 
+	git rm --ignore-unmatch nonexistent
 
-expecting success of 4035.6 'git diff-tree HEAD HEAD': 
-	test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt &&
-	test_line_count = 0 cnt
+ok 17 - Remove nonexistent file with --ignore-unmatch
 
-ok 6 - git diff-tree HEAD HEAD
+expecting success of 3600.18 '"rm" command printed': 
+	echo frotz >test-file &&
+	git add test-file &&
+	git commit -m "add file for rm test" &&
+	git rm test-file >rm-output.raw &&
+	grep "^rm " rm-output.raw >rm-output &&
+	test_line_count = 1 rm-output &&
+	rm -f test-file rm-output.raw rm-output &&
+	git commit -m "remove file from rm test"
 
-expecting success of 4035.7 'git diff-files': 
-	test_expect_code 0 git diff-files --quiet >cnt &&
-	test_line_count = 0 cnt
+[main d86816c] add file for rm test
+ Author: A U Thor <author@example.com>
+ 7 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 -q
+ delete mode 100644 bar
+ delete mode 100644 foo
+ delete mode 100644 "newline\nembedded"
+ delete mode 100644 space embedded
+ delete mode 100644 "tab\tembedded"
+ create mode 100644 test-file
+[main 3dc045d] remove file from rm test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 test-file
+ok 18 - "rm" command printed
 
-ok 7 - git diff-files
+expecting success of 3600.19 '"rm" command suppressed with --quiet': 
+	echo frotz >test-file &&
+	git add test-file &&
+	git commit -m "add file for rm --quiet test" &&
+	git rm --quiet test-file >rm-output &&
+	test_must_be_empty rm-output &&
+	rm -f test-file rm-output &&
+	git commit -m "remove file from rm --quiet test"
 
-expecting success of 4035.8 'git diff-index --cached HEAD': 
-	test_expect_code 0 git diff-index --quiet --cached HEAD >cnt &&
-	test_line_count = 0 cnt
+[main cd5294c] add file for rm --quiet test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-file
+[main 308e36c] remove file from rm --quiet test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 test-file
+ok 19 - "rm" command suppressed with --quiet
 
-ok 8 - git diff-index --cached HEAD
+expecting success of 3600.20 'Re-add foo and baz': 
+	git add foo baz &&
+	git ls-files --error-unmatch foo baz
 
-expecting success of 4035.9 'git diff-index --cached HEAD^': 
-	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
-	test_line_count = 0 cnt
+baz
+foo
+ok 20 - Re-add foo and baz
 
-ok 9 - git diff-index --cached HEAD^
+expecting success of 3600.21 'Modify foo -- rm should refuse': 
+	echo >>foo &&
+	test_must_fail git rm foo baz &&
+	test_path_is_file foo &&
+	test_path_is_file baz &&
+	git ls-files --error-unmatch foo baz
 
-expecting success of 4035.10 'git diff-index --cached HEAD^': 
-	echo text >>b &&
-	echo 3 >c &&
-	git add . &&
-	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
-	test_line_count = 0 cnt
-
-warning: adding embedded git repository: test-outside/repo
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> test-outside/repo
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached test-outside/repo
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-ok 10 - git diff-index --cached HEAD^
-
-expecting success of 4035.11 'git diff-tree -Stext HEAD^ HEAD -- b': 
-	git commit -m "text in b" &&
-	test_expect_code 1 git diff-tree --quiet -Stext HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
-
-[master b583ee2] text in b
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+)
- create mode 100644 c
- create mode 100644 cnt
- create mode 100644 test-outside/non/git/a
- create mode 100644 test-outside/non/git/extra-space
- create mode 100644 test-outside/non/git/matching-file
- create mode 100644 test-outside/non/git/never-match
- create mode 100644 test-outside/non/git/trailing-space
- create mode 160000 test-outside/repo
-ok 11 - git diff-tree -Stext HEAD^ HEAD -- b
-
-expecting success of 4035.12 'git diff-tree -Snot-found HEAD^ HEAD -- b': 
-	test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
-
-ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
-
-expecting success of 4035.13 'git diff-files': 
-	echo 3 >>c &&
-	test_expect_code 1 git diff-files --quiet >cnt &&
-	test_line_count = 0 cnt
-
-ok 13 - git diff-files
-
-expecting success of 4035.14 'git diff-index --cached HEAD': 
-	git update-index c &&
-	test_expect_code 1 git diff-index --quiet --cached HEAD >cnt &&
-	test_line_count = 0 cnt
-
-ok 14 - git diff-index --cached HEAD
-
-expecting success of 4035.15 'git diff, one file outside repo': 
-	(
-		cd test-outside/repo &&
-		test_expect_code 0 git diff --quiet a ../non/git/matching-file &&
-		test_expect_code 1 git diff --quiet a ../non/git/extra-space
-	)
-
-ok 15 - git diff, one file outside repo
-
-expecting success of 4035.16 'git diff, both files outside repo': 
-	(
-		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd test-outside/non/git &&
-		test_expect_code 0 git diff --quiet a matching-file &&
-		test_expect_code 1 git diff --quiet a extra-space
-	)
-
-ok 16 - git diff, both files outside repo
-
-expecting success of 4035.17 'git diff --ignore-space-at-eol, one file outside repo': 
-	(
-		cd test-outside/repo &&
-		test_expect_code 0 git diff --quiet --ignore-space-at-eol a ../non/git/trailing-space &&
-		test_expect_code 1 git diff --quiet --ignore-space-at-eol a ../non/git/extra-space
-	)
-
-ok 17 - git diff --ignore-space-at-eol, one file outside repo
-
-expecting success of 4035.18 'git diff --ignore-space-at-eol, both files outside repo': 
-	(
-		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd test-outside/non/git &&
-		test_expect_code 0 git diff --quiet --ignore-space-at-eol a trailing-space &&
-		test_expect_code 1 git diff --quiet --ignore-space-at-eol a extra-space
-	)
-
-ok 18 - git diff --ignore-space-at-eol, both files outside repo
-
-expecting success of 4035.19 'git diff --ignore-all-space, one file outside repo': 
-	(
-		cd test-outside/repo &&
-		test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/trailing-space &&
-		test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/extra-space &&
-		test_expect_code 1 git diff --quiet --ignore-all-space a ../non/git/never-match
-	)
-
-ok 19 - git diff --ignore-all-space, one file outside repo
-
-expecting success of 4035.20 'git diff --ignore-all-space, both files outside repo': 
-	(
-		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd test-outside/non/git &&
-		test_expect_code 0 git diff --quiet --ignore-all-space a trailing-space &&
-		test_expect_code 0 git diff --quiet --ignore-all-space a extra-space &&
-		test_expect_code 1 git diff --quiet --ignore-all-space a never-match
-	)
-
-ok 20 - git diff --ignore-all-space, both files outside repo
-
-expecting success of 4035.21 'git diff --quiet ignores stat-change only entries': 
-	test-tool chmtime +10 a &&
-	echo modified >>b &&
-	test_expect_code 1 git diff --quiet
-
-ok 21 - git diff --quiet ignores stat-change only entries
-
-expecting success of 4035.22 'git diff --quiet on a path that need conversion': 
-	echo "crlf.txt text=auto" >.gitattributes &&
-	printf "Hello\r\nWorld\r\n" >crlf.txt &&
-	git add .gitattributes crlf.txt &&
-
-	printf "Hello\r\nWorld\n" >crlf.txt &&
-	git diff --quiet crlf.txt
-
-warning: in the working copy of 'crlf.txt', CRLF will be replaced by LF the next time Git touches it
-warning: in the working copy of 'crlf.txt', CRLF will be replaced by LF the next time Git touches it
-ok 22 - git diff --quiet on a path that need conversion
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4032-diff-inter-hunk-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4032-diff-inter-hunk-context/.git/
-expecting success of 4032.1 'diff -U0, 1 common line: count hunks (2)': 
-		test 2 = 2
-	
-ok 1 - diff -U0, 1 common line: count hunks (2)
-
-expecting success of 4032.2 'diff -U0, 1 common line: check output': 
-		git diff -U0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.2 actual
-	
-ok 2 - diff -U0, 1 common line: check output
-
-expecting success of 4032.3 'diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)': 
-		test 2 = 2
-	
-ok 3 - diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)
-
-expecting success of 4032.4 'diff -U0 --inter-hunk-context=0, 1 common line: check output': 
-		git diff -U0 --inter-hunk-context=0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.2 actual
-	
-ok 4 - diff -U0 --inter-hunk-context=0, 1 common line: check output
-
-expecting success of 4032.5 'diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)': 
-		test 1 = 1
-	
-ok 5 - diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)
-
-expecting success of 4032.6 'diff -U0 --inter-hunk-context=1, 1 common line: check output': 
-		git diff -U0 --inter-hunk-context=1 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.1 actual
-	
-ok 6 - diff -U0 --inter-hunk-context=1, 1 common line: check output
-
-expecting success of 4032.7 'diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)': 
-		test 1 = 1
-	
-ok 7 - diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)
-
-expecting success of 4032.8 'diff -U0 --inter-hunk-context=2, 1 common line: check output': 
-		git diff -U0 --inter-hunk-context=2 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.1 actual
-	
-ok 8 - diff -U0 --inter-hunk-context=2, 1 common line: check output
-
-expecting success of 4032.9 'diff -U1, 1 common line: count hunks (1)': 
-		test 1 = 1
-	
-ok 9 - diff -U1, 1 common line: count hunks (1)
-
-expecting success of 4032.10 'diff -U0, 2 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 10 - diff -U0, 2 common lines: count hunks (2)
-
-expecting success of 4032.11 'diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 11 - diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)
-
-expecting success of 4032.12 'diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 12 - diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)
-
-expecting success of 4032.13 'diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 13 - diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)
-
-expecting success of 4032.14 'diff -U1, 2 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 14 - diff -U1, 2 common lines: count hunks (1)
-
-expecting success of 4032.15 'diff -U1, 3 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 15 - diff -U1, 3 common lines: count hunks (2)
-
-expecting success of 4032.16 'diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 16 - diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)
-
-expecting success of 4032.17 'diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 17 - diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)
-
-expecting success of 4032.18 'diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 18 - diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)
-
-expecting success of 4032.19 'diff -U3, 9 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 19 - diff -U3, 9 common lines: count hunks (2)
-
-expecting success of 4032.20 'diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 20 - diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)
-
-expecting success of 4032.21 'diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 21 - diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)
-
-expecting success of 4032.22 '(diff.interHunkContext=0) diff -U0, 1 common line: count hunks (2)': 
-		test 2 = 2
-	
-ok 22 - (diff.interHunkContext=0) diff -U0, 1 common line: count hunks (2)
-
-expecting success of 4032.23 '(diff.interHunkContext=0) diff -U0, 1 common line: check output': 
-		git diff -U0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.2 actual
-	
-ok 23 - (diff.interHunkContext=0) diff -U0, 1 common line: check output
-
-expecting success of 4032.24 '(diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)': 
-		test 1 = 1
-	
-ok 24 - (diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)
-
-expecting success of 4032.25 '(diff.interHunkContext=1) diff -U0, 1 common line: check output': 
-		git diff -U0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.1 actual
-	
-ok 25 - (diff.interHunkContext=1) diff -U0, 1 common line: check output
-
-expecting success of 4032.26 '(diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)': 
-		test 1 = 1
-	
-ok 26 - (diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)
-
-expecting success of 4032.27 '(diff.interHunkContext=2) diff -U0, 1 common line: check output': 
-		git diff -U0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.1 actual
-	
-ok 27 - (diff.interHunkContext=2) diff -U0, 1 common line: check output
-
-expecting success of 4032.28 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 28 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
-
-expecting success of 4032.29 '(diff.interHunkContext=0) diff -U0, 2 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 29 - (diff.interHunkContext=0) diff -U0, 2 common lines: count hunks (2)
-
-expecting success of 4032.30 '(diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 30 - (diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)
-
-expecting success of 4032.31 '(diff.interHunkContext=2) diff -U0, 2 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 31 - (diff.interHunkContext=2) diff -U0, 2 common lines: count hunks (1)
-
-expecting success of 4032.32 '(diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 32 - (diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)
-
-expecting success of 4032.33 '(diff.interHunkContext=1) diff -U1, 3 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 33 - (diff.interHunkContext=1) diff -U1, 3 common lines: count hunks (1)
-
-expecting success of 4032.34 '(diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 34 - (diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)
-
-expecting success of 4032.35 '(diff.interHunkContext=2) diff -U3, 9 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 35 - (diff.interHunkContext=2) diff -U3, 9 common lines: count hunks (2)
-
-expecting success of 4032.36 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 36 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
-
-expecting success of 4032.37 'diff.interHunkContext invalid': 
-	git config diff.interHunkContext asdf &&
-	test_must_fail git diff &&
-	git config diff.interHunkContext -1 &&
-	test_must_fail git diff
-
-fatal: bad numeric config value 'asdf' for 'diff.interhunkcontext' in file .git/config: invalid unit
-fatal: bad config variable 'diff.interhunkcontext' in file '.git/config' at line 7
-ok 37 - diff.interHunkContext invalid
-
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4037-diff-r-t-dirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4037-diff-r-t-dirs/.git/
-expecting success of 4037.1 'setup': 
-	mkdir dc dr dt &&
-	>dc/1 &&
-	>dr/2 &&
-	>dt/3 &&
-	>fc &&
-	>fr &&
-	>ft &&
-	git add . &&
-	test_tick &&
-	git commit -m initial &&
-
-	rm -fr dt dr ft fr &&
-	mkdir da ft &&
-	for p in dc/1 da/4 dt ft/5 fc
-	do
-		echo hello >$p || exit
-	done &&
-	git add -u &&
-	git add . &&
-	test_tick &&
-	git commit -m second
-
-[master (root-commit) 26fc746] initial
- Author: A U Thor <author@example.com>
- 6 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dc/1
- create mode 100644 dr/2
- create mode 100644 dt/3
- create mode 100644 fc
- create mode 100644 fr
- create mode 100644 ft
-[master 25e238e] second
- Author: A U Thor <author@example.com>
- 9 files changed, 5 insertions(+)
- create mode 100644 da/4
- delete mode 100644 dr/2
- create mode 100644 dt
- delete mode 100644 dt/3
- delete mode 100644 fr
- delete mode 100644 ft
- create mode 100644 ft/5
-ok 1 - setup
-
-expecting success of 4037.2 'verify': 
-	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
-	test_cmp expect actual
-
-ok 2 - verify
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4039-diff-assume-unchanged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4040-whitespace-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4040-whitespace-status/.git/
-expecting success of 4040.1 'setup': 
-	mkdir a b &&
-	echo >c &&
-	echo >a/d &&
-	echo >b/e &&
-	git add . &&
-	test_tick &&
-	git commit -m initial &&
-	echo " " >a/d &&
-	test_tick &&
-	git commit -a -m second &&
-	echo "  " >a/d &&
-	echo " " >b/e &&
-	git add a/d
-
-[master (root-commit) b80f2e3] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 a/d
- create mode 100644 b/e
- create mode 100644 c
-[master 13a0478] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 4040.2 'diff-tree --exit-code': 
-	test_must_fail git diff --exit-code HEAD^ HEAD &&
-	test_must_fail git diff-tree --exit-code HEAD^ HEAD
-
-diff --git a/a/d b/a/d
-index 8b13789..8d1c8b6 100644
---- a/a/d
-+++ b/a/d
-@@ -1 +1 @@
--
-+ 
-:040000 040000 13061aad4970f02b314943ec46981e9ef332cae2 ac592974c686387705f2617b895d6585cc0a0d46 M	a
-ok 2 - diff-tree --exit-code
-
-expecting success of 4040.3 'diff-tree -b --exit-code': 
-	git diff -b --exit-code HEAD^ HEAD &&
-	git diff-tree -b -p --exit-code HEAD^ HEAD
-
-ok 3 - diff-tree -b --exit-code
-
-expecting success of 4040.4 'diff-index --cached --exit-code': 
-	test_must_fail git diff --cached --exit-code HEAD &&
-	test_must_fail git diff-index --cached --exit-code HEAD
-
-diff --git a/a/d b/a/d
-index 8d1c8b6..1a4baf5 100644
---- a/a/d
-+++ b/a/d
-@@ -1 +1 @@
-- 
-+  
-:100644 100644 8d1c8b69c3fce7bea45c73efd06983e3c419a92f 1a4baf536d705b9c814847cb7a708a0e63d5b976 M	a/d
-ok 4 - diff-index --cached --exit-code
-
-expecting success of 4040.5 'diff-index -b -p --cached --exit-code': 
-	git diff -b --cached --exit-code HEAD &&
-	git diff-index -b -p --cached --exit-code HEAD
-
-ok 5 - diff-index -b -p --cached --exit-code
-
-expecting success of 4040.6 'diff-index --exit-code': 
-	test_must_fail git diff --exit-code HEAD &&
-	test_must_fail git diff-index --exit-code HEAD
-
-diff --git a/a/d b/a/d
-index 8d1c8b6..1a4baf5 100644
---- a/a/d
-+++ b/a/d
-@@ -1 +1 @@
-- 
-+  
-diff --git a/b/e b/b/e
-index 8b13789..8d1c8b6 100644
---- a/b/e
-+++ b/b/e
-@@ -1 +1 @@
--
-+ 
-:100644 100644 8d1c8b69c3fce7bea45c73efd06983e3c419a92f 1a4baf536d705b9c814847cb7a708a0e63d5b976 M	a/d
-:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
-ok 6 - diff-index --exit-code
-
-expecting success of 4040.7 'diff-index -b -p --exit-code': 
-	git diff -b --exit-code HEAD &&
-	git diff-index -b -p --exit-code HEAD
-
-ok 7 - diff-index -b -p --exit-code
-
-expecting success of 4040.8 'diff-files --exit-code': 
-	test_must_fail git diff --exit-code &&
-	test_must_fail git diff-files --exit-code
-
-diff --git a/b/e b/b/e
-index 8b13789..8d1c8b6 100644
---- a/b/e
-+++ b/b/e
-@@ -1 +1 @@
--
-+ 
-:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
-ok 8 - diff-files --exit-code
-
-expecting success of 4040.9 'diff-files -b -p --exit-code': 
-	git diff -b --exit-code &&
-	git diff-files -b -p --exit-code
-
-ok 9 - diff-files -b -p --exit-code
-
-expecting success of 4040.10 'diff-files --diff-filter --quiet': 
-	git reset --hard &&
-	rm a/d &&
-	echo x >>b/e &&
-	test_must_fail git diff-files --diff-filter=M --quiet
-
-HEAD is now at 13a0478 second
-ok 10 - diff-files --diff-filter --quiet
-
-expecting success of 4040.11 'diff-tree --diff-filter --quiet': 
-	git commit -a -m "worktree state" &&
-	test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
-
-[master c0a31dc] worktree state
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 a/d
-ok 11 - diff-tree --diff-filter --quiet
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4043-diff-rename-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4043-diff-rename-binary/.git/
-expecting success of 4043.1 'prepare repository': 
-	git init &&
-	echo foo > foo &&
-	echo "barQ" | q_to_nul > bar &&
-	git add . &&
-	git commit -m "Initial commit"
-
-Reinitialized existing Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4043-diff-rename-binary/.git/
-[master (root-commit) 07508f6] Initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 bar
- create mode 100644 foo
-ok 1 - prepare repository
-
-expecting success of 4043.2 'move the files into a "sub" directory': 
-	mkdir sub &&
-	git mv bar foo sub/ &&
-	git commit -m "Moved to sub/"
-
-[master ebc8afa] Moved to sub/
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename bar => sub/bar (100%)
- rename foo => sub/foo (100%)
-ok 2 - move the files into a "sub" directory
-
-expecting success of 4043.3 'git show -C -C report renames': 
-	git show -C -C --raw --binary --numstat >patch-with-stat &&
-	tail -n 11 patch-with-stat >current &&
-	test_cmp expected current
-
-ok 3 - git show -C -C report renames
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t3600-rm.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t3600-rm/.git/
-expecting success of 3600.1 'Initialize test directory': 
-	touch -- foo bar baz "space embedded" -q &&
-	git add -- foo bar baz "space embedded" -q &&
-	git commit -m "add normal files"
-
-[main (root-commit) 27fd14d] add normal files
- Author: A U Thor <author@example.com>
- 5 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 -q
- create mode 100644 bar
- create mode 100644 baz
- create mode 100644 foo
- create mode 100644 space embedded
-ok 1 - Initialize test directory
-
-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
-expecting success of 3600.2 'add files with funny names': 
-	touch -- "tab	embedded" "newline${LF}embedded" &&
-	git add -- "tab	embedded" "newline${LF}embedded" &&
-	git commit -m "add files with tabs and newlines"
-
-[main eaf70aa] add files with tabs and newlines
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 "newline\nembedded"
- create mode 100644 "tab\tembedded"
-ok 2 - add files with funny names
-
-expecting success of 3600.3 'Pre-check that foo exists and is in index before git rm foo': 
-	test_path_is_file foo &&
-	git ls-files --error-unmatch foo
-
-foo
-ok 3 - Pre-check that foo exists and is in index before git rm foo
-
-expecting success of 3600.4 'Test that git rm foo succeeds': 
-	git rm --cached foo
-
-rm 'foo'
-ok 4 - Test that git rm foo succeeds
-
-expecting success of 3600.5 'Test that git rm --cached foo succeeds if the index matches the file': 
-	echo content >foo &&
-	git add foo &&
-	git rm --cached foo
-
-rm 'foo'
-ok 5 - Test that git rm --cached foo succeeds if the index matches the file
-
-expecting success of 3600.6 'Test that git rm --cached foo succeeds if the index matches the file': 
-	echo content >foo &&
-	git add foo &&
-	git commit -m foo &&
-	echo "other content" >foo &&
-	git rm --cached foo
-
-[main 774d6a8] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-rm 'foo'
-ok 6 - Test that git rm --cached foo succeeds if the index matches the file
-
-expecting success of 3600.7 'Test that git rm --cached foo fails if the index matches neither the file nor HEAD': 
-	echo content >foo &&
-	git add foo &&
-	git commit -m foo --allow-empty &&
-	echo "other content" >foo &&
-	git add foo &&
-	echo "yet another content" >foo &&
-	test_must_fail git rm --cached foo
-
-[main 105830b] foo
- Author: A U Thor <author@example.com>
-error: the following file has staged content different from both the
-file and the HEAD:
-    foo
-(use -f to force removal)
-ok 7 - Test that git rm --cached foo fails if the index matches neither the file nor HEAD
-
-expecting success of 3600.8 'Test that git rm --cached -f foo works in case where --cached only did not': 
-	echo content >foo &&
-	git add foo &&
-	git commit -m foo --allow-empty &&
-	echo "other content" >foo &&
-	git add foo &&
-	echo "yet another content" >foo &&
-	git rm --cached -f foo
-
-[main 6fb3ca4] foo
- Author: A U Thor <author@example.com>
-rm 'foo'
-ok 8 - Test that git rm --cached -f foo works in case where --cached only did not
-
-expecting success of 3600.9 'Post-check that foo exists but is not in index after git rm foo': 
-	test_path_is_file foo &&
-	test_must_fail git ls-files --error-unmatch foo
-
-error: pathspec 'foo' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 9 - Post-check that foo exists but is not in index after git rm foo
-
-expecting success of 3600.10 'Pre-check that bar exists and is in index before "git rm bar"': 
-	test_path_is_file bar &&
-	git ls-files --error-unmatch bar
-
-bar
-ok 10 - Pre-check that bar exists and is in index before "git rm bar"
-
-expecting success of 3600.11 'Test that "git rm bar" succeeds': 
-	git rm bar
-
-rm 'bar'
-ok 11 - Test that "git rm bar" succeeds
-
-expecting success of 3600.12 'Post-check that bar does not exist and is not in index after "git rm -f bar"': 
-	test_path_is_missing bar &&
-	test_must_fail git ls-files --error-unmatch bar
-
-error: pathspec 'bar' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 12 - Post-check that bar does not exist and is not in index after "git rm -f bar"
-
-expecting success of 3600.13 'Test that "git rm -- -q" succeeds (remove a file that looks like an option)': 
-	git rm -- -q
-
-rm '-q'
-ok 13 - Test that "git rm -- -q" succeeds (remove a file that looks like an option)
-
-expecting success of 3600.14 'Test that "git rm -f" succeeds with embedded space, tab, or newline characters.': 
-	git rm -f "space embedded" "tab	embedded" "newline${LF}embedded"
-
-rm 'newline
-embedded'
-rm 'space embedded'
-rm 'tab	embedded'
-ok 14 - Test that "git rm -f" succeeds with embedded space, tab, or newline characters.
-
-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 3600.15 'Test that "git rm -f" fails if its rm fails': 
-	test_when_finished "chmod 775 ." &&
-	chmod a-w . &&
-	test_must_fail git rm -f baz
-
-fatal: git rm: 'baz': Permission denied
-rm 'baz'
-ok 15 - Test that "git rm -f" fails if its rm fails
-
-expecting success of 3600.16 'When the rm in "git rm -f" fails, it should not remove the file from the index': 
-	git ls-files --error-unmatch baz
-
-baz
-ok 16 - When the rm in "git rm -f" fails, it should not remove the file from the index
-
-expecting success of 3600.17 'Remove nonexistent file with --ignore-unmatch': 
-	git rm --ignore-unmatch nonexistent
-
-ok 17 - Remove nonexistent file with --ignore-unmatch
-
-expecting success of 3600.18 '"rm" command printed': 
-	echo frotz >test-file &&
-	git add test-file &&
-	git commit -m "add file for rm test" &&
-	git rm test-file >rm-output.raw &&
-	grep "^rm " rm-output.raw >rm-output &&
-	test_line_count = 1 rm-output &&
-	rm -f test-file rm-output.raw rm-output &&
-	git commit -m "remove file from rm test"
-
-[main d86816c] add file for rm test
- Author: A U Thor <author@example.com>
- 7 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 -q
- delete mode 100644 bar
- delete mode 100644 foo
- delete mode 100644 "newline\nembedded"
- delete mode 100644 space embedded
- delete mode 100644 "tab\tembedded"
- create mode 100644 test-file
-[main 3dc045d] remove file from rm test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 test-file
-ok 18 - "rm" command printed
-
-expecting success of 3600.19 '"rm" command suppressed with --quiet': 
-	echo frotz >test-file &&
-	git add test-file &&
-	git commit -m "add file for rm --quiet test" &&
-	git rm --quiet test-file >rm-output &&
-	test_must_be_empty rm-output &&
-	rm -f test-file rm-output &&
-	git commit -m "remove file from rm --quiet test"
-
-[main cd5294c] add file for rm --quiet test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-file
-[main 308e36c] remove file from rm --quiet test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 test-file
-ok 19 - "rm" command suppressed with --quiet
-
-expecting success of 3600.20 'Re-add foo and baz': 
-	git add foo baz &&
-	git ls-files --error-unmatch foo baz
-
-baz
-foo
-ok 20 - Re-add foo and baz
-
-expecting success of 3600.21 'Modify foo -- rm should refuse': 
-	echo >>foo &&
-	test_must_fail git rm foo baz &&
-	test_path_is_file foo &&
-	test_path_is_file baz &&
-	git ls-files --error-unmatch foo baz
-
-error: the following file has staged content different from both the
-file and the HEAD:
-    foo
-(use -f to force removal)
-baz
-foo
-ok 21 - Modify foo -- rm should refuse
+error: the following file has staged content different from both the
+file and the HEAD:
+    foo
+(use -f to force removal)
+baz
+foo
+ok 21 - Modify foo -- rm should refuse
 
 expecting success of 3600.22 'Modified foo -- rm -f should work': 
 	git rm -f foo baz &&
@@ -240226,6 +239994,241 @@
 1..82
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4039-diff-assume-unchanged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4040-whitespace-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4040-whitespace-status/.git/
+expecting success of 4040.1 'setup': 
+	mkdir a b &&
+	echo >c &&
+	echo >a/d &&
+	echo >b/e &&
+	git add . &&
+	test_tick &&
+	git commit -m initial &&
+	echo " " >a/d &&
+	test_tick &&
+	git commit -a -m second &&
+	echo "  " >a/d &&
+	echo " " >b/e &&
+	git add a/d
+
+[master (root-commit) b80f2e3] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 a/d
+ create mode 100644 b/e
+ create mode 100644 c
+[master 13a0478] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 4040.2 'diff-tree --exit-code': 
+	test_must_fail git diff --exit-code HEAD^ HEAD &&
+	test_must_fail git diff-tree --exit-code HEAD^ HEAD
+
+diff --git a/a/d b/a/d
+index 8b13789..8d1c8b6 100644
+--- a/a/d
++++ b/a/d
+@@ -1 +1 @@
+-
++ 
+:040000 040000 13061aad4970f02b314943ec46981e9ef332cae2 ac592974c686387705f2617b895d6585cc0a0d46 M	a
+ok 2 - diff-tree --exit-code
+
+expecting success of 4040.3 'diff-tree -b --exit-code': 
+	git diff -b --exit-code HEAD^ HEAD &&
+	git diff-tree -b -p --exit-code HEAD^ HEAD
+
+ok 3 - diff-tree -b --exit-code
+
+expecting success of 4040.4 'diff-index --cached --exit-code': 
+	test_must_fail git diff --cached --exit-code HEAD &&
+	test_must_fail git diff-index --cached --exit-code HEAD
+
+diff --git a/a/d b/a/d
+index 8d1c8b6..1a4baf5 100644
+--- a/a/d
++++ b/a/d
+@@ -1 +1 @@
+- 
++  
+:100644 100644 8d1c8b69c3fce7bea45c73efd06983e3c419a92f 1a4baf536d705b9c814847cb7a708a0e63d5b976 M	a/d
+ok 4 - diff-index --cached --exit-code
+
+expecting success of 4040.5 'diff-index -b -p --cached --exit-code': 
+	git diff -b --cached --exit-code HEAD &&
+	git diff-index -b -p --cached --exit-code HEAD
+
+ok 5 - diff-index -b -p --cached --exit-code
+
+expecting success of 4040.6 'diff-index --exit-code': 
+	test_must_fail git diff --exit-code HEAD &&
+	test_must_fail git diff-index --exit-code HEAD
+
+diff --git a/a/d b/a/d
+index 8d1c8b6..1a4baf5 100644
+--- a/a/d
++++ b/a/d
+@@ -1 +1 @@
+- 
++  
+diff --git a/b/e b/b/e
+index 8b13789..8d1c8b6 100644
+--- a/b/e
++++ b/b/e
+@@ -1 +1 @@
+-
++ 
+:100644 100644 8d1c8b69c3fce7bea45c73efd06983e3c419a92f 1a4baf536d705b9c814847cb7a708a0e63d5b976 M	a/d
+:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
+ok 6 - diff-index --exit-code
+
+expecting success of 4040.7 'diff-index -b -p --exit-code': 
+	git diff -b --exit-code HEAD &&
+	git diff-index -b -p --exit-code HEAD
+
+ok 7 - diff-index -b -p --exit-code
+
+expecting success of 4040.8 'diff-files --exit-code': 
+	test_must_fail git diff --exit-code &&
+	test_must_fail git diff-files --exit-code
+
+diff --git a/b/e b/b/e
+index 8b13789..8d1c8b6 100644
+--- a/b/e
++++ b/b/e
+@@ -1 +1 @@
+-
++ 
+:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
+ok 8 - diff-files --exit-code
+
+expecting success of 4040.9 'diff-files -b -p --exit-code': 
+	git diff -b --exit-code &&
+	git diff-files -b -p --exit-code
+
+ok 9 - diff-files -b -p --exit-code
+
+expecting success of 4040.10 'diff-files --diff-filter --quiet': 
+	git reset --hard &&
+	rm a/d &&
+	echo x >>b/e &&
+	test_must_fail git diff-files --diff-filter=M --quiet
+
+HEAD is now at 13a0478 second
+ok 10 - diff-files --diff-filter --quiet
+
+expecting success of 4040.11 'diff-tree --diff-filter --quiet': 
+	git commit -a -m "worktree state" &&
+	test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
+
+[master c0a31dc] worktree state
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 a/d
+ok 11 - diff-tree --diff-filter --quiet
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4043-diff-rename-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4043-diff-rename-binary/.git/
+expecting success of 4043.1 'prepare repository': 
+	git init &&
+	echo foo > foo &&
+	echo "barQ" | q_to_nul > bar &&
+	git add . &&
+	git commit -m "Initial commit"
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4043-diff-rename-binary/.git/
+[master (root-commit) 07508f6] Initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 bar
+ create mode 100644 foo
+ok 1 - prepare repository
+
+expecting success of 4043.2 'move the files into a "sub" directory': 
+	mkdir sub &&
+	git mv bar foo sub/ &&
+	git commit -m "Moved to sub/"
+
+[master ebc8afa] Moved to sub/
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename bar => sub/bar (100%)
+ rename foo => sub/foo (100%)
+ok 2 - move the files into a "sub" directory
+
+expecting success of 4043.3 'git show -C -C report renames': 
+	git show -C -C --raw --binary --numstat >patch-with-stat &&
+	tail -n 11 patch-with-stat >current &&
+	test_cmp expected current
+
+ok 3 - git show -C -C report renames
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4044-diff-index-unique-abbrev.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4044-diff-index-unique-abbrev/.git/
 expecting success of 4044.1 'setup': 
@@ -243679,104 +243682,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4050-diff-histogram.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4048-diff-combined-binary.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4048-diff-combined-binary/.git/
 expecting success of 4048.1 'setup binary merge conflict': 
@@ -243929,6 +243834,104 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4050-diff-histogram.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4041-diff-submodule-option.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4041-diff-submodule-option/.git/
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4041-diff-submodule-option/sm1/.git/
@@ -245113,8 +245116,8 @@
 Auto-merging subdir/file0
 CONFLICT (content): Merge conflict in subdir/file0
 Automatic merge failed; fix conflicts and then commit the result.
---- expected	2026-03-04 07:58:35.443352315 +0000
-+++ out	2026-03-04 07:58:35.459352315 +0000
+--- expected	2025-01-30 02:11:27.375995011 +0000
++++ out	2025-01-30 02:11:27.399995155 +0000
 @@ -1,7 +1,7 @@
 -diff --cc file0
 +diff --cc subdir/file0
@@ -245133,6 +245136,108 @@
 1..39
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4054-diff-bogus-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4051-diff-function-context.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4051-diff-function-context/.git/
 expecting success of 4051.1 'setup': 
@@ -245610,106 +245715,788 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4054-diff-bogus-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-	)
+*** t4038-diff-combined.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4038-diff-combined/.git/
+expecting success of 4038.1 'setup': 
+	>file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
 
-ok 1 - create bogus tree
+	git branch withone &&
+	git branch sansone &&
 
-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)
+	git checkout withone &&
+	setup_helper one withone sidewithone &&
 
-ok 2 - create tree with matching file
+	git checkout sansone &&
+	setup_helper "" sansone sidesansone
 
-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
+[main (root-commit) 1bd44cb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Switched to branch 'withone'
+[withone 61ad3a5] withone
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+Switched to branch 'sidewithone'
+[sidewithone 04e7a65] sidewithone
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+[sidewithone 70465e9] merge withone into sidewithone
+ Author: A U Thor <author@example.com>
+Switched to branch 'sansone'
+[sansone e4cdba2] sansone
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+Switched to branch 'sidesansone'
+[sidesansone d31bb1b] sidesansone
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+[sidesansone a02eb57] merge sansone into sidesansone
+ Author: A U Thor <author@example.com>
+ok 1 - setup
 
-ok 3 - raw diff shows null sha1 (addition)
+expecting success of 4038.2 'check combined output (1)': 
+	git show sidewithone -- >sidewithone &&
+	verify_helper sidewithone
 
-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 2 - check combined output (1)
 
-ok 4 - raw diff shows null sha1 (removal)
+expecting success of 4038.3 'check combined output (1) with git diff <rev>^!': 
+	git diff sidewithone^! -- >sidewithone &&
+	verify_helper sidewithone
 
-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 3 - check combined output (1) with git diff <rev>^!
 
-ok 5 - raw diff shows null sha1 (modification)
+expecting success of 4038.4 'check combined output (2)': 
+	git show sidesansone -- >sidesansone &&
+	verify_helper sidesansone
 
-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 4 - check combined output (2)
 
-ok 6 - raw diff shows null sha1 (other direction)
+expecting success of 4038.5 'check combined output (2) with git diff <rev>^!': 
+	git diff sidesansone^! -- >sidesansone &&
+	verify_helper sidesansone
 
-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 &&
+ok 5 - check combined output (2) with git diff <rev>^!
+
+expecting success of 4038.6 'diagnose truncated file': 
+	>file &&
+	git add file &&
+	git commit --amend -C HEAD &&
+	git show >out &&
+	grep "diff --cc file" out
+
+[sidesansone 3fd518e] merge sansone into sidesansone
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+diff --cc file
+ok 6 - diagnose truncated file
+
+expecting success of 4038.7 'setup for --cc --raw': 
+	blob=$(echo file | git hash-object --stdin -w) &&
+	base_tree=$(echo "100644 blob $blob	file" | git mktree) &&
+	trees= &&
+	for i in $(test_seq 1 40)
+	do
+		blob=$(echo file$i | git hash-object --stdin -w) &&
+		trees="$trees$(echo "100644 blob $blob	file" | git mktree)$LF" || return 1
+	done
+
+ok 7 - setup for --cc --raw
+
+expecting success of 4038.8 'check --cc --raw with four trees': 
+	four_trees=$(echo "$trees" | sed -e 4q) &&
+	git diff --cc --raw $four_trees $base_tree >out &&
+	# Check for four leading colons in the output:
+	grep "^::::[^:]" out
+
+::::100644 100644 100644 100644 100644 6c493ff 7c8ac2f bfd6a65 f73f309 e212970 MMMM	file
+ok 8 - check --cc --raw with four trees
+
+expecting success of 4038.9 'check --cc --raw with forty trees': 
+	git diff --cc --raw $trees $base_tree >out &&
+	# Check for forty leading colons in the output:
+	grep "^::::::::::::::::::::::::::::::::::::::::[^:]" out
+
+::::::::::::::::::::::::::::::::::::::::100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 6c493ff 7c8ac2f bfd6a65 4806cb9 8d80099 c52d680 efe3974 2050b92 07205b5 e1aa36f dd63810 d7a00d8 b5ac9e5 c76bce1 1d22d08 1b22815 10a5e40 e78cb60 1b9d597 e4c0bb4 536442d 9e692b7 02e835e 4bed7f0 ae12143 7202624 4c12e08 33b3d68 a633d0e a1d5983 c1288dc eb6edd8 769381d 9089a6c 83be741 3a76ef8 67335ff 834f228 62e8e47 f73f309 e212970 MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM	file
+ok 9 - check --cc --raw with forty trees
+
+expecting success of 4038.10 'setup combined ignore spaces': 
+	git checkout main &&
+	>test &&
+	git add test &&
+	git commit -m initial &&
+
+	tr -d Q <<-\EOF >test &&
+	always coalesce
+	eol space coalesce Q
+	space  change coalesce
+	all spa ces coalesce
+	eol spaces Q
+	space  change
+	all spa ces
+	EOF
+	git commit -m "test space change" -a &&
+
+	git checkout -b side HEAD^ &&
+	tr -d Q <<-\EOF >test &&
+	always coalesce
+	eol space coalesce
+	space change coalesce
+	all spaces coalesce
+	eol spaces
+	space change
+	all spaces
+	EOF
+	git commit -m "test other space changes" -a &&
+
+	test_must_fail git merge main &&
+	tr -d Q <<-\EOF >test &&
+	eol spaces Q
+	space  change
+	all spa ces
+	EOF
+	git commit -m merged -a
+
+Switched to branch 'main'
+[main ac9d179] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 test
+[main c5936ee] test space change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+Switched to a new branch 'side'
+[side 29c6253] test other space changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Automatic merge failed; fix conflicts and then commit the result.
+[side 373c494] merged
+ Author: A U Thor <author@example.com>
+ok 10 - setup combined ignore spaces
+
+expecting success of 4038.11 'check combined output (no ignore space)': 
+	git show >actual.tmp &&
+	sed -e "1,/^@@@/d" < actual.tmp >actual &&
+	tr -d Q <<-\EOF >expected &&
+	--always coalesce
+	- eol space coalesce
+	- space change coalesce
+	- all spaces coalesce
+	- eol spaces
+	- space change
+	- all spaces
+	 -eol space coalesce Q
+	 -space  change coalesce
+	 -all spa ces coalesce
+	+ eol spaces Q
+	+ space  change
+	+ all spa ces
+	EOF
+	compare_diff_patch expected actual
+
+ok 11 - check combined output (no ignore space)
+
+expecting success of 4038.12 'check combined output (ignore space at eol)': 
+	git show --ignore-space-at-eol >actual.tmp &&
+	sed -e "1,/^@@@/d" < actual.tmp >actual &&
+	tr -d Q <<-\EOF >expected &&
+	--always coalesce
+	--eol space coalesce
+	- space change coalesce
+	- all spaces coalesce
+	 -space  change coalesce
+	 -all spa ces coalesce
+	  eol spaces Q
+	- space change
+	- all spaces
+	+ space  change
+	+ all spa ces
+	EOF
+	compare_diff_patch expected actual
+
+ok 12 - check combined output (ignore space at eol)
+
+expecting success of 4038.13 'check combined output (ignore space change)': 
+	git show -b >actual.tmp &&
+	sed -e "1,/^@@@/d" < actual.tmp >actual &&
+	tr -d Q <<-\EOF >expected &&
+	--always coalesce
+	--eol space coalesce
+	--space change coalesce
+	- all spaces coalesce
+	 -all spa ces coalesce
+	  eol spaces Q
+	  space  change
+	- all spaces
+	+ all spa ces
+	EOF
+	compare_diff_patch expected actual
+
+ok 13 - check combined output (ignore space change)
+
+expecting success of 4038.14 'check combined output (ignore all spaces)': 
+	git show -w >actual.tmp &&
+	sed -e "1,/^@@@/d" < actual.tmp >actual &&
+	tr -d Q <<-\EOF >expected &&
+	--always coalesce
+	--eol space coalesce
+	--space change coalesce
+	--all spaces coalesce
+	  eol spaces Q
+	  space  change
+	  all spa ces
+	EOF
+	compare_diff_patch expected actual
+
+ok 14 - check combined output (ignore all spaces)
+
+expecting success of 4038.15 'combine diff coalesce simple': 
+	>test &&
+	git add test &&
+	git commit -m initial &&
+	test_seq 4 >test &&
+	git commit -a -m empty1 &&
+	git branch side1 &&
+	git checkout HEAD^ &&
+	test_seq 5 >test &&
+	git commit -a -m empty2 &&
+	test_must_fail git merge side1 &&
+	>test &&
+	git commit -a -m merge &&
+	git show >actual.tmp &&
+	sed -e "1,/^@@@/d" < actual.tmp >actual &&
+	tr -d Q <<-\EOF >expected &&
+	--1
+	--2
+	--3
+	--4
+	- 5
+	EOF
+	compare_diff_patch expected actual
+
+[side ca25ef5] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 deletions(-)
+[side 2f38b7d] empty1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+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 ca25ef5 initial
+[detached HEAD a65ae3c] empty2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 8ab2551] merge
+ Author: A U Thor <author@example.com>
+ok 15 - combine diff coalesce simple
+
+expecting success of 4038.16 'combine diff coalesce tricky': 
+	>test &&
+	git add test &&
+	git commit -m initial --allow-empty &&
+	cat <<-\EOF >test &&
+	3
+	1
+	2
+	3
+	4
+	EOF
+	git commit -a -m empty1 &&
+	git branch -f side1 &&
+	git checkout HEAD^ &&
+	cat <<-\EOF >test &&
+	1
+	3
+	5
+	4
+	EOF
+	git commit -a -m empty2 &&
+	git branch -f side2 &&
+	test_must_fail git merge side1 &&
+	>test &&
+	git commit -a -m merge &&
+	git show >actual.tmp &&
+	sed -e "1,/^@@@/d" < actual.tmp >actual &&
+	tr -d Q <<-\EOF >expected &&
+	 -3
+	--1
+	 -2
+	--3
+	- 5
+	--4
+	EOF
+	compare_diff_patch expected actual &&
+	git checkout -f side1 &&
+	test_must_fail git merge side2 &&
+	>test &&
+	git commit -a -m merge &&
+	git show >actual.tmp &&
+	sed -e "1,/^@@@/d" < actual.tmp >actual &&
+	tr -d Q <<-\EOF >expected &&
+	- 3
+	--1
+	- 2
+	--3
+	 -5
+	--4
+	EOF
+	compare_diff_patch expected actual
+
+[detached HEAD 567514d] initial
+ Author: A U Thor <author@example.com>
+[detached HEAD edcd94a] empty1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+Previous HEAD position was edcd94a empty1
+HEAD is now at 567514d initial
+[detached HEAD 4e10910] empty2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 2f37ae9] merge
+ Author: A U Thor <author@example.com>
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  2f37ae9 merge
+
+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> 2f37ae9
+
+Switched to branch 'side1'
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Automatic merge failed; fix conflicts and then commit the result.
+[side1 33886e5] merge
+ Author: A U Thor <author@example.com>
+ok 16 - combine diff coalesce tricky
+
+checking known breakage of 4038.17 'combine diff coalesce three parents': 
+	>test &&
+	git add test &&
+	git commit -m initial --allow-empty &&
+	cat <<-\EOF >test &&
+	3
+	1
+	2
+	3
+	4
+	EOF
+	git commit -a -m empty1 &&
+	git checkout -B side1 &&
+	git checkout HEAD^ &&
+	cat <<-\EOF >test &&
+	1
+	3
+	7
+	5
+	4
+	EOF
+	git commit -a -m empty2 &&
+	git branch -f side2 &&
+	git checkout HEAD^ &&
+	cat <<-\EOF >test &&
+	3
+	1
+	6
+	5
+	4
+	EOF
+	git commit -a -m empty3 &&
+	>test &&
+	git add test &&
+	TREE=$(git write-tree) &&
+	COMMIT=$(git commit-tree -p HEAD -p side1 -p side2 -m merge $TREE) &&
+	git show $COMMIT >actual.tmp &&
+	sed -e "1,/^@@@/d" < actual.tmp >actual &&
+	tr -d Q <<-\EOF >expected &&
+	-- 3
+	---1
+	-  6
+	 - 2
+	 --3
+	  -7
+	- -5
+	---4
+	EOF
+	compare_diff_patch expected actual
+
+[side1 562f35c] initial
+ Author: A U Thor <author@example.com>
+[side1 f31b6a2] empty1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+Reset branch 'side1'
+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 562f35c initial
+[detached HEAD 0cc2d14] empty2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+Previous HEAD position was 0cc2d14 empty2
+HEAD is now at 562f35c initial
+[detached HEAD 22de592] empty3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+--- .tmp-1	2025-01-30 02:11:26.315988654 +0000
++++ .tmp-2	2025-01-30 02:11:26.331988750 +0000
+@@ -1,8 +1,9 @@
+ -- 3
+ ---1
+ -  6
++-  5
+  - 2
+  --3
+   -7
+-- -5
++  -5
+ ---4
+not ok 17 - combine diff coalesce three parents # TODO known breakage
+
+expecting success of 4038.18 'combine diff missing delete bug': 
+	git commit -m initial --allow-empty &&
+	cat <<-\EOF >test &&
+	1
+	2
+	3
+	4
+	EOF
+	git add test &&
+	git commit -a -m side1 &&
+	git checkout -B side1 &&
+	git checkout HEAD^ &&
+	cat <<-\EOF >test &&
+	0
+	1
+	2
+	3
+	4modified
+	EOF
+	git add test &&
+	git commit -m side2 &&
+	git branch -f side2 &&
+	test_must_fail git merge --no-commit side1 &&
+	cat <<-\EOF >test &&
+	1
+	2
+	3
+	4modified
+	EOF
+	git add test &&
+	git commit -a -m merge &&
+	git diff-tree -c -p HEAD >actual.tmp &&
+	sed -e "1,/^@@@/d" < actual.tmp >actual &&
+	tr -d Q <<-\EOF >expected &&
+	- 0
+	  1
+	  2
+	  3
+	 -4
+	 +4modified
+	EOF
+	compare_diff_patch expected actual
+
+[detached HEAD 78a948b] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 deletions(-)
+[detached HEAD dd67d51] side1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+Switched to and reset branch 'side1'
+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 78a948b initial
+[detached HEAD bb8b62e] side2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 9dfd023] merge
+ Author: A U Thor <author@example.com>
+ok 18 - combine diff missing delete bug
+
+expecting success of 4038.19 'combine diff gets tree sorting right': 
+	# create a directory and a file that sort differently in trees
+	# versus byte-wise (implied "/" sorts after ".")
+	git checkout -f main &&
+	mkdir foo &&
+	echo base >foo/one &&
+	echo base >foo/two &&
+	echo base >foo.ext &&
+	git add foo foo.ext &&
+	git commit -m base &&
+
+	# one side modifies a file in the directory, along with the root
+	# file...
+	echo main >foo/one &&
+	echo main >foo.ext &&
+	git commit -a -m main &&
+
+	# the other side modifies the other file in the directory
+	git checkout -b other HEAD^ &&
+	echo other >foo/two &&
+	git commit -a -m other &&
+
+	# And now we merge. The files in the subdirectory will resolve cleanly,
+	# meaning that a combined diff will not find them interesting. But it
+	# will find the tree itself interesting, because it had to be merged.
+	git checkout main &&
+	git merge other &&
+
+	printf "MM\tfoo\n" >expect &&
+	git diff-tree -c --name-status -t HEAD >actual.tmp &&
+	sed 1d <actual.tmp >actual &&
 	test_cmp expect actual
 
-ok 7 - raw diff shows null sha1 (reverse)
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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 &&
+  9dfd023 merge
+
+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> 9dfd023
+
+Switched to branch 'main'
+[main eeef54b] base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 foo.ext
+ create mode 100644 foo/one
+ create mode 100644 foo/two
+[main 181761f] main
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'other'
+[other 387c20f] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ foo/two | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 19 - combine diff gets tree sorting right
+
+expecting success of 4038.20 'setup for --combined-all-paths': 
+	git branch side1c &&
+	git branch side2c &&
+	git checkout side1c &&
+	test_seq 1 10 >filename-side1c &&
+	side1cf=$(git hash-object filename-side1c) &&
+	git add filename-side1c &&
+	git commit -m with &&
+	git checkout side2c &&
+	test_seq 1 9 >filename-side2c &&
+	echo ten >>filename-side2c &&
+	side2cf=$(git hash-object filename-side2c) &&
+	git add filename-side2c &&
+	git commit -m iam &&
+	git checkout -b mergery side1c &&
+	git merge --no-commit side2c &&
+	git rm filename-side1c &&
+	echo eleven >>filename-side2c &&
+	git mv filename-side2c filename-merged &&
+	mergedf=$(git hash-object filename-merged) &&
+	git add filename-merged &&
+	git commit
+
+Switched to branch 'side1c'
+[side1c 7d5dd18] with
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 filename-side1c
+Switched to branch 'side2c'
+[side2c aa5d645] iam
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 filename-side2c
+Switched to a new branch 'mergery'
+Automatic merge went well; stopped before committing as requested
+rm 'filename-side1c'
+[mergery 187df53] Merge branch 'side2c' into mergery
+ Author: A U Thor <author@example.com>
+ok 20 - setup for --combined-all-paths
+
+expecting success of 4038.21 '--combined-all-paths and --raw': 
+	cat <<-EOF >expect &&
+	::100644 100644 100644 $side1cf $side2cf $mergedf RR	filename-side1c	filename-side2c	filename-merged
+	EOF
+	git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp &&
+	sed 1d <actual.tmp >actual &&
 	test_cmp expect actual
 
-ok 8 - raw diff shows null sha1 (index)
+ok 21 - --combined-all-paths and --raw
 
-expecting success of 4054.9 'patch fails due to bogus sha1 (addition)': 
-	test_must_fail git diff-tree -p $EMPTY_TREE $bogus_tree
+expecting success of 4038.22 '--combined-all-paths and --cc': 
+	cat <<-\EOF >expect &&
+	--- a/filename-side1c
+	--- a/filename-side2c
+	+++ b/filename-merged
+	EOF
+	git diff-tree --cc -M --combined-all-paths HEAD >actual.tmp &&
+	grep ^[-+][-+][-+] <actual.tmp >actual &&
+	test_cmp expect actual
 
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 9 - patch fails due to bogus sha1 (addition)
+ok 22 - --combined-all-paths and --cc
 
-expecting success of 4054.10 'patch fails due to bogus sha1 (removal)': 
-	test_must_fail git diff-tree -p $bogus_tree $EMPTY_TREE
+checking prerequisite: FUNNYNAMES
 
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 10 - patch fails due to bogus sha1 (removal)
+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
 
-expecting success of 4054.11 'patch fails due to bogus sha1 (modification)': 
-	test_must_fail git diff-tree -p $good_tree $bogus_tree
+)
+prerequisite FUNNYNAMES ok
+expecting success of 4038.23 'setup for --combined-all-paths with funny names': 
+	git branch side1d &&
+	git branch side2d &&
+	git checkout side1d &&
+	test_seq 1 10 >"$(printf "file\twith\ttabs")" &&
+	git add file* &&
+	side1df=$(git hash-object *tabs) &&
+	git commit -m with &&
+	git checkout side2d &&
+	test_seq 1 9 >"$(printf "i\tam\ttabbed")" &&
+	echo ten >>"$(printf "i\tam\ttabbed")" &&
+	git add *tabbed &&
+	side2df=$(git hash-object *tabbed) &&
+	git commit -m iam &&
+	git checkout -b funny-names-mergery side1d &&
+	git merge --no-commit side2d &&
+	git rm *tabs &&
+	echo eleven >>"$(printf "i\tam\ttabbed")" &&
+	git mv "$(printf "i\tam\ttabbed")" "$(printf "fickle\tnaming")" &&
+	git add fickle* &&
+	headf=$(git hash-object fickle*) &&
+	git commit &&
+	head=$(git rev-parse HEAD)
 
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 11 - patch fails due to bogus sha1 (modification)
+Switched to branch 'side1d'
+[side1d 5a91728] with
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 "file\twith\ttabs"
+Switched to branch 'side2d'
+[side2d 794a3e3] iam
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 "i\tam\ttabbed"
+Switched to a new branch 'funny-names-mergery'
+Automatic merge went well; stopped before committing as requested
+rm 'file	with	tabs'
+[funny-names-mergery 371ce66] Merge branch 'side2d' into funny-names-mergery
+ Author: A U Thor <author@example.com>
+ok 23 - setup for --combined-all-paths with funny names
 
-expecting success of 4054.12 'patch fails due to bogus sha1 (other direction)': 
-	test_must_fail git diff-tree -p $bogus_tree $good_tree
+expecting success of 4038.24 '--combined-all-paths and --raw and funny names': 
+	cat <<-EOF >expect &&
+	::100644 100644 100644 $side1df $side2df $headf RR	"file\twith\ttabs"	"i\tam\ttabbed"	"fickle\tnaming"
+	EOF
+	git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp &&
+	sed 1d <actual.tmp >actual &&
+	test_cmp expect actual
 
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 12 - patch fails due to bogus sha1 (other direction)
+ok 24 - --combined-all-paths and --raw and funny names
 
-expecting success of 4054.13 'patch fails due to bogus sha1 (reverse)': 
-	test_must_fail git diff-tree -R -p $good_tree $bogus_tree
+expecting success of 4038.25 '--combined-all-paths and --raw -and -z and funny names': 
+	printf "$head\0::100644 100644 100644 $side1df $side2df $headf RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect &&
+	git diff-tree -c -M --raw --combined-all-paths -z HEAD >actual &&
+	test_cmp expect actual
 
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 13 - patch fails due to bogus sha1 (reverse)
+ok 25 - --combined-all-paths and --raw -and -z and funny names
 
-expecting success of 4054.14 'patch fails due to bogus sha1 (index)': 
-	test_must_fail git diff-index -p $bogus_tree
+expecting success of 4038.26 '--combined-all-paths and --cc and funny names': 
+	cat <<-\EOF >expect &&
+	--- "a/file\twith\ttabs"
+	--- "a/i\tam\ttabbed"
+	+++ "b/fickle\tnaming"
+	EOF
+	git diff-tree --cc -M --combined-all-paths HEAD >actual.tmp &&
+	grep ^[-+][-+][-+] <actual.tmp >actual &&
+	test_cmp expect actual
 
-fatal: unable to read 0000000000000000000000000000000000000000
-ok 14 - patch fails due to bogus sha1 (index)
+ok 26 - --combined-all-paths and --cc and funny names
 
-# passed all 14 test(s)
-1..14
+# still have 1 known breakage(s)
+# passed all remaining 25 test(s)
+1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4034-diff-words.sh ***
@@ -246703,10 +247490,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 1052: kill: (1833970) - No such process
+./test-lib.sh: line 1053: kill: (1833969) - No such process
 ok 25 - diff --no-index reads from pipes
 
 # passed all 25 test(s)
@@ -247407,788 +248192,220 @@
 1..41
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4038-diff-combined.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4038-diff-combined/.git/
-expecting success of 4038.1 'setup': 
-	>file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-
-	git branch withone &&
-	git branch sansone &&
-
-	git checkout withone &&
-	setup_helper one withone sidewithone &&
-
-	git checkout sansone &&
-	setup_helper "" sansone sidesansone
-
-[main (root-commit) 1bd44cb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Switched to branch 'withone'
-[withone 61ad3a5] withone
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
-Switched to branch 'sidewithone'
-[sidewithone 04e7a65] sidewithone
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-[sidewithone 70465e9] merge withone into sidewithone
- Author: A U Thor <author@example.com>
-Switched to branch 'sansone'
-[sansone e4cdba2] sansone
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
-Switched to branch 'sidesansone'
-[sidesansone d31bb1b] sidesansone
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-[sidesansone a02eb57] merge sansone into sidesansone
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 4038.2 'check combined output (1)': 
-	git show sidewithone -- >sidewithone &&
-	verify_helper sidewithone
-
-ok 2 - check combined output (1)
-
-expecting success of 4038.3 'check combined output (1) with git diff <rev>^!': 
-	git diff sidewithone^! -- >sidewithone &&
-	verify_helper sidewithone
-
-ok 3 - check combined output (1) with git diff <rev>^!
-
-expecting success of 4038.4 'check combined output (2)': 
-	git show sidesansone -- >sidesansone &&
-	verify_helper sidesansone
-
-ok 4 - check combined output (2)
-
-expecting success of 4038.5 'check combined output (2) with git diff <rev>^!': 
-	git diff sidesansone^! -- >sidesansone &&
-	verify_helper sidesansone
-
-ok 5 - check combined output (2) with git diff <rev>^!
-
-expecting success of 4038.6 'diagnose truncated file': 
-	>file &&
-	git add file &&
-	git commit --amend -C HEAD &&
-	git show >out &&
-	grep "diff --cc file" out
-
-[sidesansone 3fd518e] merge sansone into sidesansone
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
-diff --cc file
-ok 6 - diagnose truncated file
-
-expecting success of 4038.7 'setup for --cc --raw': 
-	blob=$(echo file | git hash-object --stdin -w) &&
-	base_tree=$(echo "100644 blob $blob	file" | git mktree) &&
-	trees= &&
-	for i in $(test_seq 1 40)
+*** t4057-diff-combined-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4057-diff-combined-paths/.git/
+expecting success of 4057.1 'trivial merge - combine-diff empty': 
+	for i in $(test_seq 1 9)
 	do
-		blob=$(echo file$i | git hash-object --stdin -w) &&
-		trees="$trees$(echo "100644 blob $blob	file" | git mktree)$LF" || return 1
-	done
-
-ok 7 - setup for --cc --raw
-
-expecting success of 4038.8 'check --cc --raw with four trees': 
-	four_trees=$(echo "$trees" | sed -e 4q) &&
-	git diff --cc --raw $four_trees $base_tree >out &&
-	# Check for four leading colons in the output:
-	grep "^::::[^:]" out
-
-::::100644 100644 100644 100644 100644 6c493ff 7c8ac2f bfd6a65 f73f309 e212970 MMMM	file
-ok 8 - check --cc --raw with four trees
-
-expecting success of 4038.9 'check --cc --raw with forty trees': 
-	git diff --cc --raw $trees $base_tree >out &&
-	# Check for forty leading colons in the output:
-	grep "^::::::::::::::::::::::::::::::::::::::::[^:]" out
-
-::::::::::::::::::::::::::::::::::::::::100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 100644 6c493ff 7c8ac2f bfd6a65 4806cb9 8d80099 c52d680 efe3974 2050b92 07205b5 e1aa36f dd63810 d7a00d8 b5ac9e5 c76bce1 1d22d08 1b22815 10a5e40 e78cb60 1b9d597 e4c0bb4 536442d 9e692b7 02e835e 4bed7f0 ae12143 7202624 4c12e08 33b3d68 a633d0e a1d5983 c1288dc eb6edd8 769381d 9089a6c 83be741 3a76ef8 67335ff 834f228 62e8e47 f73f309 e212970 MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM	file
-ok 9 - check --cc --raw with forty trees
-
-expecting success of 4038.10 'setup combined ignore spaces': 
+		echo $i >$i.txt &&
+		git add $i.txt || return 1
+	done &&
+	git commit -m "init" &&
+	git checkout -b side &&
+	for i in $(test_seq 2 9)
+	do
+		echo $i/2 >>$i.txt || return 1
+	done &&
+	git commit -a -m "side 2-9" &&
 	git checkout main &&
-	>test &&
-	git add test &&
-	git commit -m initial &&
-
-	tr -d Q <<-\EOF >test &&
-	always coalesce
-	eol space coalesce Q
-	space  change coalesce
-	all spa ces coalesce
-	eol spaces Q
-	space  change
-	all spa ces
-	EOF
-	git commit -m "test space change" -a &&
-
-	git checkout -b side HEAD^ &&
-	tr -d Q <<-\EOF >test &&
-	always coalesce
-	eol space coalesce
-	space change coalesce
-	all spaces coalesce
-	eol spaces
-	space change
-	all spaces
-	EOF
-	git commit -m "test other space changes" -a &&
-
-	test_must_fail git merge main &&
-	tr -d Q <<-\EOF >test &&
-	eol spaces Q
-	space  change
-	all spa ces
-	EOF
-	git commit -m merged -a
+	echo 1/2 >1.txt &&
+	git commit -a -m "main 1" &&
+	git merge side &&
+	>diffc.expect &&
+	diffc_verify
 
-Switched to branch 'main'
-[main ac9d179] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 test
-[main c5936ee] test space change
+[main (root-commit) 0e4c78d] init
  Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
+ 9 files changed, 9 insertions(+)
+ create mode 100644 1.txt
+ create mode 100644 2.txt
+ create mode 100644 3.txt
+ create mode 100644 4.txt
+ create mode 100644 5.txt
+ create mode 100644 6.txt
+ create mode 100644 7.txt
+ create mode 100644 8.txt
+ create mode 100644 9.txt
 Switched to a new branch 'side'
-[side 29c6253] test other space changes
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-Auto-merging test
-CONFLICT (content): Merge conflict in test
-Automatic merge failed; fix conflicts and then commit the result.
-[side 373c494] merged
- Author: A U Thor <author@example.com>
-ok 10 - setup combined ignore spaces
-
-expecting success of 4038.11 'check combined output (no ignore space)': 
-	git show >actual.tmp &&
-	sed -e "1,/^@@@/d" < actual.tmp >actual &&
-	tr -d Q <<-\EOF >expected &&
-	--always coalesce
-	- eol space coalesce
-	- space change coalesce
-	- all spaces coalesce
-	- eol spaces
-	- space change
-	- all spaces
-	 -eol space coalesce Q
-	 -space  change coalesce
-	 -all spa ces coalesce
-	+ eol spaces Q
-	+ space  change
-	+ all spa ces
-	EOF
-	compare_diff_patch expected actual
-
-ok 11 - check combined output (no ignore space)
-
-expecting success of 4038.12 'check combined output (ignore space at eol)': 
-	git show --ignore-space-at-eol >actual.tmp &&
-	sed -e "1,/^@@@/d" < actual.tmp >actual &&
-	tr -d Q <<-\EOF >expected &&
-	--always coalesce
-	--eol space coalesce
-	- space change coalesce
-	- all spaces coalesce
-	 -space  change coalesce
-	 -all spa ces coalesce
-	  eol spaces Q
-	- space change
-	- all spaces
-	+ space  change
-	+ all spa ces
-	EOF
-	compare_diff_patch expected actual
-
-ok 12 - check combined output (ignore space at eol)
-
-expecting success of 4038.13 'check combined output (ignore space change)': 
-	git show -b >actual.tmp &&
-	sed -e "1,/^@@@/d" < actual.tmp >actual &&
-	tr -d Q <<-\EOF >expected &&
-	--always coalesce
-	--eol space coalesce
-	--space change coalesce
-	- all spaces coalesce
-	 -all spa ces coalesce
-	  eol spaces Q
-	  space  change
-	- all spaces
-	+ all spa ces
-	EOF
-	compare_diff_patch expected actual
-
-ok 13 - check combined output (ignore space change)
-
-expecting success of 4038.14 'check combined output (ignore all spaces)': 
-	git show -w >actual.tmp &&
-	sed -e "1,/^@@@/d" < actual.tmp >actual &&
-	tr -d Q <<-\EOF >expected &&
-	--always coalesce
-	--eol space coalesce
-	--space change coalesce
-	--all spaces coalesce
-	  eol spaces Q
-	  space  change
-	  all spa ces
-	EOF
-	compare_diff_patch expected actual
-
-ok 14 - check combined output (ignore all spaces)
-
-expecting success of 4038.15 'combine diff coalesce simple': 
-	>test &&
-	git add test &&
-	git commit -m initial &&
-	test_seq 4 >test &&
-	git commit -a -m empty1 &&
-	git branch side1 &&
-	git checkout HEAD^ &&
-	test_seq 5 >test &&
-	git commit -a -m empty2 &&
-	test_must_fail git merge side1 &&
-	>test &&
-	git commit -a -m merge &&
-	git show >actual.tmp &&
-	sed -e "1,/^@@@/d" < actual.tmp >actual &&
-	tr -d Q <<-\EOF >expected &&
-	--1
-	--2
-	--3
-	--4
-	- 5
-	EOF
-	compare_diff_patch expected actual
-
-[side ca25ef5] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 3 deletions(-)
-[side 2f38b7d] empty1
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
-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 ca25ef5 initial
-[detached HEAD a65ae3c] empty2
+[side 18d7b5a] side 2-9
  Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-Auto-merging test
-CONFLICT (content): Merge conflict in test
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 8ab2551] merge
+ 8 files changed, 8 insertions(+)
+Switched to branch 'main'
+[main 0d0c265] main 1
  Author: A U Thor <author@example.com>
-ok 15 - combine diff coalesce simple
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merge made by the 'ort' strategy.
+ 2.txt | 1 +
+ 3.txt | 1 +
+ 4.txt | 1 +
+ 5.txt | 1 +
+ 6.txt | 1 +
+ 7.txt | 1 +
+ 8.txt | 1 +
+ 9.txt | 1 +
+ 8 files changed, 8 insertions(+)
+ok 1 - trivial merge - combine-diff empty
 
-expecting success of 4038.16 'combine diff coalesce tricky': 
-	>test &&
-	git add test &&
-	git commit -m initial --allow-empty &&
-	cat <<-\EOF >test &&
-	3
-	1
-	2
-	3
-	4
-	EOF
-	git commit -a -m empty1 &&
-	git branch -f side1 &&
-	git checkout HEAD^ &&
-	cat <<-\EOF >test &&
-	1
-	3
-	5
+expecting success of 4057.2 'only one truly conflicting path': 
+	git checkout side &&
+	for i in $(test_seq 2 9)
+	do
+		echo $i/3 >>$i.txt || return 1
+	done &&
+	echo "4side" >>4.txt &&
+	git commit -a -m "side 2-9 +4" &&
+	git checkout main &&
+	for i in $(test_seq 1 9)
+	do
+		echo $i/3 >>$i.txt || return 1
+	done &&
+	echo "4main" >>4.txt &&
+	git commit -a -m "main 1-9 +4" &&
+	test_must_fail git merge side &&
+	cat <<-\EOF >4.txt &&
 	4
+	4/2
+	4/3
+	4main
+	4side
 	EOF
-	git commit -a -m empty2 &&
-	git branch -f side2 &&
-	test_must_fail git merge side1 &&
-	>test &&
-	git commit -a -m merge &&
-	git show >actual.tmp &&
-	sed -e "1,/^@@@/d" < actual.tmp >actual &&
-	tr -d Q <<-\EOF >expected &&
-	 -3
-	--1
-	 -2
-	--3
-	- 5
-	--4
-	EOF
-	compare_diff_patch expected actual &&
-	git checkout -f side1 &&
-	test_must_fail git merge side2 &&
-	>test &&
-	git commit -a -m merge &&
-	git show >actual.tmp &&
-	sed -e "1,/^@@@/d" < actual.tmp >actual &&
-	tr -d Q <<-\EOF >expected &&
-	- 3
-	--1
-	- 2
-	--3
-	 -5
-	--4
-	EOF
-	compare_diff_patch expected actual
+	git add 4.txt &&
+	git commit -m "merge side (2)" &&
+	echo 4.txt >diffc.expect &&
+	diffc_verify
 
-[detached HEAD 567514d] initial
- Author: A U Thor <author@example.com>
-[detached HEAD edcd94a] empty1
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-Previous HEAD position was edcd94a empty1
-HEAD is now at 567514d initial
-[detached HEAD 4e10910] empty2
+Switched to branch 'side'
+[side ff32fb3] side 2-9 +4
  Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
-Auto-merging test
-CONFLICT (content): Merge conflict in test
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 2f37ae9] merge
+ 8 files changed, 9 insertions(+)
+Switched to branch 'main'
+[main 0b5ecd8] main 1-9 +4
  Author: A U Thor <author@example.com>
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  2f37ae9 merge
-
-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> 2f37ae9
-
-Switched to branch 'side1'
-Auto-merging test
-CONFLICT (content): Merge conflict in test
+ 9 files changed, 10 insertions(+)
+Auto-merging 4.txt
+CONFLICT (content): Merge conflict in 4.txt
 Automatic merge failed; fix conflicts and then commit the result.
-[side1 33886e5] merge
- Author: A U Thor <author@example.com>
-ok 16 - combine diff coalesce tricky
-
-checking known breakage of 4038.17 'combine diff coalesce three parents': 
-	>test &&
-	git add test &&
-	git commit -m initial --allow-empty &&
-	cat <<-\EOF >test &&
-	3
-	1
-	2
-	3
-	4
-	EOF
-	git commit -a -m empty1 &&
-	git checkout -B side1 &&
-	git checkout HEAD^ &&
-	cat <<-\EOF >test &&
-	1
-	3
-	7
-	5
-	4
-	EOF
-	git commit -a -m empty2 &&
-	git branch -f side2 &&
-	git checkout HEAD^ &&
-	cat <<-\EOF >test &&
-	3
-	1
-	6
-	5
-	4
-	EOF
-	git commit -a -m empty3 &&
-	>test &&
-	git add test &&
-	TREE=$(git write-tree) &&
-	COMMIT=$(git commit-tree -p HEAD -p side1 -p side2 -m merge $TREE) &&
-	git show $COMMIT >actual.tmp &&
-	sed -e "1,/^@@@/d" < actual.tmp >actual &&
-	tr -d Q <<-\EOF >expected &&
-	-- 3
-	---1
-	-  6
-	 - 2
-	 --3
-	  -7
-	- -5
-	---4
-	EOF
-	compare_diff_patch expected actual
-
-[side1 562f35c] initial
- Author: A U Thor <author@example.com>
-[side1 f31b6a2] empty1
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-Reset branch 'side1'
-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 562f35c initial
-[detached HEAD 0cc2d14] empty2
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-Previous HEAD position was 0cc2d14 empty2
-HEAD is now at 562f35c initial
-[detached HEAD 22de592] empty3
+[main 6619a01] merge side (2)
  Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
---- .tmp-1	2026-03-04 07:58:35.211352315 +0000
-+++ .tmp-2	2026-03-04 07:58:35.231352315 +0000
-@@ -1,8 +1,9 @@
- -- 3
- ---1
- -  6
-+-  5
-  - 2
-  --3
-   -7
--- -5
-+  -5
- ---4
-not ok 17 - combine diff coalesce three parents # TODO known breakage
+ok 2 - only one truly conflicting path
 
-expecting success of 4038.18 'combine diff missing delete bug': 
-	git commit -m initial --allow-empty &&
-	cat <<-\EOF >test &&
-	1
-	2
-	3
-	4
-	EOF
-	git add test &&
-	git commit -a -m side1 &&
-	git checkout -B side1 &&
-	git checkout HEAD^ &&
-	cat <<-\EOF >test &&
-	0
-	1
-	2
-	3
-	4modified
-	EOF
-	git add test &&
-	git commit -m side2 &&
-	git branch -f side2 &&
-	test_must_fail git merge --no-commit side1 &&
-	cat <<-\EOF >test &&
-	1
-	2
-	3
-	4modified
-	EOF
-	git add test &&
-	git commit -a -m merge &&
-	git diff-tree -c -p HEAD >actual.tmp &&
-	sed -e "1,/^@@@/d" < actual.tmp >actual &&
-	tr -d Q <<-\EOF >expected &&
-	- 0
-	  1
-	  2
-	  3
-	 -4
-	 +4modified
-	EOF
-	compare_diff_patch expected actual
+expecting success of 4057.3 'merge introduces new file': 
+	git checkout side &&
+	for i in $(test_seq 5 9)
+	do
+		echo $i/4 >>$i.txt || return 1
+	done &&
+	git commit -a -m "side 5-9" &&
+	git checkout main &&
+	for i in $(test_seq 1 3)
+	do
+		echo $i/4 >>$i.txt || return 1
+	done &&
+	git commit -a -m "main 1-3 +4hello" &&
+	git merge side &&
+	echo "Hello World" >4hello.txt &&
+	git add 4hello.txt &&
+	git commit --amend &&
+	echo 4hello.txt >diffc.expect &&
+	diffc_verify
 
-[detached HEAD 78a948b] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 5 deletions(-)
-[detached HEAD dd67d51] side1
+Switched to branch 'side'
+[side e8c29ca] side 5-9
  Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
-Switched to and reset branch 'side1'
-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 78a948b initial
-[detached HEAD bb8b62e] side2
+ 5 files changed, 5 insertions(+)
+Switched to branch 'main'
+[main 0635bd5] main 1-3 +4hello
  Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-Auto-merging test
-CONFLICT (content): Merge conflict in test
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 9dfd023] merge
+ 3 files changed, 3 insertions(+)
+Merge made by the 'ort' strategy.
+ 5.txt | 1 +
+ 6.txt | 1 +
+ 7.txt | 1 +
+ 8.txt | 1 +
+ 9.txt | 1 +
+ 5 files changed, 5 insertions(+)
+[main 7d30ccd] Merge branch 'side'
  Author: A U Thor <author@example.com>
-ok 18 - combine diff missing delete bug
-
-expecting success of 4038.19 'combine diff gets tree sorting right': 
-	# create a directory and a file that sort differently in trees
-	# versus byte-wise (implied "/" sorts after ".")
-	git checkout -f main &&
-	mkdir foo &&
-	echo base >foo/one &&
-	echo base >foo/two &&
-	echo base >foo.ext &&
-	git add foo foo.ext &&
-	git commit -m base &&
-
-	# one side modifies a file in the directory, along with the root
-	# file...
-	echo main >foo/one &&
-	echo main >foo.ext &&
-	git commit -a -m main &&
-
-	# the other side modifies the other file in the directory
-	git checkout -b other HEAD^ &&
-	echo other >foo/two &&
-	git commit -a -m other &&
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ok 3 - merge introduces new file
 
-	# And now we merge. The files in the subdirectory will resolve cleanly,
-	# meaning that a combined diff will not find them interesting. But it
-	# will find the tree itself interesting, because it had to be merged.
+expecting success of 4057.4 'merge removed a file': 
+	git checkout side &&
+	for i in $(test_seq 5 9)
+	do
+		echo $i/5 >>$i.txt || return 1
+	done &&
+	git commit -a -m "side 5-9" &&
 	git checkout main &&
-	git merge other &&
-
-	printf "MM\tfoo\n" >expect &&
-	git diff-tree -c --name-status -t HEAD >actual.tmp &&
-	sed 1d <actual.tmp >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  9dfd023 merge
-
-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> 9dfd023
+	for i in $(test_seq 1 3)
+	do
+		echo $i/4 >>$i.txt || return 1
+	done &&
+	git commit -a -m "main 1-3" &&
+	git merge side &&
+	git rm 4.txt &&
+	git commit --amend &&
+	echo 4.txt >diffc.expect &&
+	diffc_verify
 
+Switched to branch 'side'
+[side da3ab5d] side 5-9
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
 Switched to branch 'main'
-[main eeef54b] base
+[main 61e8724] main 1-3
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
- create mode 100644 foo.ext
- create mode 100644 foo/one
- create mode 100644 foo/two
-[main 181761f] main
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'other'
-[other 387c20f] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
 Merge made by the 'ort' strategy.
- foo/two | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 19 - combine diff gets tree sorting right
-
-expecting success of 4038.20 'setup for --combined-all-paths': 
-	git branch side1c &&
-	git branch side2c &&
-	git checkout side1c &&
-	test_seq 1 10 >filename-side1c &&
-	side1cf=$(git hash-object filename-side1c) &&
-	git add filename-side1c &&
-	git commit -m with &&
-	git checkout side2c &&
-	test_seq 1 9 >filename-side2c &&
-	echo ten >>filename-side2c &&
-	side2cf=$(git hash-object filename-side2c) &&
-	git add filename-side2c &&
-	git commit -m iam &&
-	git checkout -b mergery side1c &&
-	git merge --no-commit side2c &&
-	git rm filename-side1c &&
-	echo eleven >>filename-side2c &&
-	git mv filename-side2c filename-merged &&
-	mergedf=$(git hash-object filename-merged) &&
-	git add filename-merged &&
-	git commit
-
-Switched to branch 'side1c'
-[side1c 7d5dd18] with
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 filename-side1c
-Switched to branch 'side2c'
-[side2c aa5d645] iam
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 filename-side2c
-Switched to a new branch 'mergery'
-Automatic merge went well; stopped before committing as requested
-rm 'filename-side1c'
-[mergery 187df53] Merge branch 'side2c' into mergery
+ 5.txt | 1 +
+ 6.txt | 1 +
+ 7.txt | 1 +
+ 8.txt | 1 +
+ 9.txt | 1 +
+ 5 files changed, 5 insertions(+)
+rm '4.txt'
+[main dd9bbd5] Merge branch 'side'
  Author: A U Thor <author@example.com>
-ok 20 - setup for --combined-all-paths
-
-expecting success of 4038.21 '--combined-all-paths and --raw': 
-	cat <<-EOF >expect &&
-	::100644 100644 100644 $side1cf $side2cf $mergedf RR	filename-side1c	filename-side2c	filename-merged
-	EOF
-	git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp &&
-	sed 1d <actual.tmp >actual &&
-	test_cmp expect actual
-
-ok 21 - --combined-all-paths and --raw
-
-expecting success of 4038.22 '--combined-all-paths and --cc': 
-	cat <<-\EOF >expect &&
-	--- a/filename-side1c
-	--- a/filename-side2c
-	+++ b/filename-merged
-	EOF
-	git diff-tree --cc -M --combined-all-paths HEAD >actual.tmp &&
-	grep ^[-+][-+][-+] <actual.tmp >actual &&
-	test_cmp expect actual
-
-ok 22 - --combined-all-paths and --cc
-
-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
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ok 4 - merge removed a file
 
-)
-prerequisite FUNNYNAMES ok
-expecting success of 4038.23 'setup for --combined-all-paths with funny names': 
-	git branch side1d &&
-	git branch side2d &&
-	git checkout side1d &&
-	test_seq 1 10 >"$(printf "file\twith\ttabs")" &&
-	git add file* &&
-	side1df=$(git hash-object *tabs) &&
-	git commit -m with &&
-	git checkout side2d &&
-	test_seq 1 9 >"$(printf "i\tam\ttabbed")" &&
-	echo ten >>"$(printf "i\tam\ttabbed")" &&
-	git add *tabbed &&
-	side2df=$(git hash-object *tabbed) &&
-	git commit -m iam &&
-	git checkout -b funny-names-mergery side1d &&
-	git merge --no-commit side2d &&
-	git rm *tabs &&
-	echo eleven >>"$(printf "i\tam\ttabbed")" &&
-	git mv "$(printf "i\tam\ttabbed")" "$(printf "fickle\tnaming")" &&
-	git add fickle* &&
-	headf=$(git hash-object fickle*) &&
-	git commit &&
-	head=$(git rev-parse HEAD)
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4062-diff-pickaxe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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"
 
-Switched to branch 'side1d'
-[side1d 5a91728] with
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 "file\twith\ttabs"
-Switched to branch 'side2d'
-[side2d 794a3e3] iam
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 "i\tam\ttabbed"
-Switched to a new branch 'funny-names-mergery'
-Automatic merge went well; stopped before committing as requested
-rm 'file	with	tabs'
-[funny-names-mergery 371ce66] Merge branch 'side2d' into funny-names-mergery
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[master 98d74df] A 4k file
  Author: A U Thor <author@example.com>
-ok 23 - setup for --combined-all-paths with funny names
-
-expecting success of 4038.24 '--combined-all-paths and --raw and funny names': 
-	cat <<-EOF >expect &&
-	::100644 100644 100644 $side1df $side2df $headf RR	"file\twith\ttabs"	"i\tam\ttabbed"	"fickle\tnaming"
-	EOF
-	git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp &&
-	sed 1d <actual.tmp >actual &&
-	test_cmp expect actual
-
-ok 24 - --combined-all-paths and --raw and funny names
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4096-zeroes.txt
+ok 1 - setup
 
-expecting success of 4038.25 '--combined-all-paths and --raw -and -z and funny names': 
-	printf "$head\0::100644 100644 100644 $side1df $side2df $headf RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect &&
-	git diff-tree -c -M --raw --combined-all-paths -z HEAD >actual &&
-	test_cmp expect actual
+expecting success of 4062.2 '-G matches': 
+	git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&
+	test 4096-zeroes.txt = "$(cat out)"
 
-ok 25 - --combined-all-paths and --raw -and -z and funny names
+ok 2 - -G matches
 
-expecting success of 4038.26 '--combined-all-paths and --cc and funny names': 
-	cat <<-\EOF >expect &&
-	--- "a/file\twith\ttabs"
-	--- "a/i\tam\ttabbed"
-	+++ "b/fickle\tnaming"
-	EOF
-	git diff-tree --cc -M --combined-all-paths HEAD >actual.tmp &&
-	grep ^[-+][-+][-+] <actual.tmp >actual &&
-	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 26 - --combined-all-paths and --cc and funny names
+ok 3 - -S --pickaxe-regex
 
-# still have 1 known breakage(s)
-# passed all remaining 25 test(s)
-1..26
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4058-diff-duplicates.sh ***
@@ -248403,222 +248620,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4057-diff-combined-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4057-diff-combined-paths/.git/
-expecting success of 4057.1 'trivial merge - combine-diff empty': 
-	for i in $(test_seq 1 9)
-	do
-		echo $i >$i.txt &&
-		git add $i.txt || return 1
-	done &&
-	git commit -m "init" &&
-	git checkout -b side &&
-	for i in $(test_seq 2 9)
-	do
-		echo $i/2 >>$i.txt || return 1
-	done &&
-	git commit -a -m "side 2-9" &&
-	git checkout main &&
-	echo 1/2 >1.txt &&
-	git commit -a -m "main 1" &&
-	git merge side &&
-	>diffc.expect &&
-	diffc_verify
-
-[main (root-commit) 0e4c78d] init
- Author: A U Thor <author@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 1.txt
- create mode 100644 2.txt
- create mode 100644 3.txt
- create mode 100644 4.txt
- create mode 100644 5.txt
- create mode 100644 6.txt
- create mode 100644 7.txt
- create mode 100644 8.txt
- create mode 100644 9.txt
-Switched to a new branch 'side'
-[side 18d7b5a] side 2-9
- Author: A U Thor <author@example.com>
- 8 files changed, 8 insertions(+)
-Switched to branch 'main'
-[main 0d0c265] main 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merge made by the 'ort' strategy.
- 2.txt | 1 +
- 3.txt | 1 +
- 4.txt | 1 +
- 5.txt | 1 +
- 6.txt | 1 +
- 7.txt | 1 +
- 8.txt | 1 +
- 9.txt | 1 +
- 8 files changed, 8 insertions(+)
-ok 1 - trivial merge - combine-diff empty
-
-expecting success of 4057.2 'only one truly conflicting path': 
-	git checkout side &&
-	for i in $(test_seq 2 9)
-	do
-		echo $i/3 >>$i.txt || return 1
-	done &&
-	echo "4side" >>4.txt &&
-	git commit -a -m "side 2-9 +4" &&
-	git checkout main &&
-	for i in $(test_seq 1 9)
-	do
-		echo $i/3 >>$i.txt || return 1
-	done &&
-	echo "4main" >>4.txt &&
-	git commit -a -m "main 1-9 +4" &&
-	test_must_fail git merge side &&
-	cat <<-\EOF >4.txt &&
-	4
-	4/2
-	4/3
-	4main
-	4side
-	EOF
-	git add 4.txt &&
-	git commit -m "merge side (2)" &&
-	echo 4.txt >diffc.expect &&
-	diffc_verify
-
-Switched to branch 'side'
-[side ff32fb3] side 2-9 +4
- Author: A U Thor <author@example.com>
- 8 files changed, 9 insertions(+)
-Switched to branch 'main'
-[main 0b5ecd8] main 1-9 +4
- Author: A U Thor <author@example.com>
- 9 files changed, 10 insertions(+)
-Auto-merging 4.txt
-CONFLICT (content): Merge conflict in 4.txt
-Automatic merge failed; fix conflicts and then commit the result.
-[main 6619a01] merge side (2)
- Author: A U Thor <author@example.com>
-ok 2 - only one truly conflicting path
-
-expecting success of 4057.3 'merge introduces new file': 
-	git checkout side &&
-	for i in $(test_seq 5 9)
-	do
-		echo $i/4 >>$i.txt || return 1
-	done &&
-	git commit -a -m "side 5-9" &&
-	git checkout main &&
-	for i in $(test_seq 1 3)
-	do
-		echo $i/4 >>$i.txt || return 1
-	done &&
-	git commit -a -m "main 1-3 +4hello" &&
-	git merge side &&
-	echo "Hello World" >4hello.txt &&
-	git add 4hello.txt &&
-	git commit --amend &&
-	echo 4hello.txt >diffc.expect &&
-	diffc_verify
-
-Switched to branch 'side'
-[side e8c29ca] side 5-9
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
-Switched to branch 'main'
-[main 0635bd5] main 1-3 +4hello
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-Merge made by the 'ort' strategy.
- 5.txt | 1 +
- 6.txt | 1 +
- 7.txt | 1 +
- 8.txt | 1 +
- 9.txt | 1 +
- 5 files changed, 5 insertions(+)
-[main 7d30ccd] Merge branch 'side'
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-ok 3 - merge introduces new file
-
-expecting success of 4057.4 'merge removed a file': 
-	git checkout side &&
-	for i in $(test_seq 5 9)
-	do
-		echo $i/5 >>$i.txt || return 1
-	done &&
-	git commit -a -m "side 5-9" &&
-	git checkout main &&
-	for i in $(test_seq 1 3)
-	do
-		echo $i/4 >>$i.txt || return 1
-	done &&
-	git commit -a -m "main 1-3" &&
-	git merge side &&
-	git rm 4.txt &&
-	git commit --amend &&
-	echo 4.txt >diffc.expect &&
-	diffc_verify
-
-Switched to branch 'side'
-[side da3ab5d] side 5-9
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
-Switched to branch 'main'
-[main 61e8724] main 1-3
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-Merge made by the 'ort' strategy.
- 5.txt | 1 +
- 6.txt | 1 +
- 7.txt | 1 +
- 8.txt | 1 +
- 9.txt | 1 +
- 5 files changed, 5 insertions(+)
-rm '4.txt'
-[main dd9bbd5] Merge branch 'side'
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-ok 4 - merge removed a file
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4062-diff-pickaxe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4062-diff-pickaxe/.git/
-expecting success of 4062.1 'setup': 
-	test_commit initial &&
-	printf "%04096d" 0 >4096-zeroes.txt &&
-	git add 4096-zeroes.txt &&
-	test_tick &&
-	git commit -m "A 4k file"
-
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[master 98d74df] A 4k file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4096-zeroes.txt
-ok 1 - setup
-
-expecting success of 4062.2 '-G matches': 
-	git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&
-	test 4096-zeroes.txt = "$(cat out)"
-
-ok 2 - -G matches
-
-expecting success of 4062.3 '-S --pickaxe-regex': 
-	git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
-	test 4096-zeroes.txt = "$(cat out)"
-
-ok 3 - -S --pickaxe-regex
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4056-diff-order.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4056-diff-order/.git/
 expecting success of 4056.1 'setup': 
@@ -250250,7 +250251,7 @@
 )
 prerequisite FILEMODE ok
 expecting success of 4102.3 'validate': test -f bar && ls -l bar | grep "^-..x......"
--rwxr-xr-x 1 pbuilder1 pbuilder1 12 Mar  4 07:58 bar
+-rwxr-xr-x 1 pbuilder2 pbuilder2 12 Jan 30 02:11 bar
 ok 3 - validate
 
 expecting success of 4102.4 'apply reverse': git apply -R --index --stat --summary --apply test-patch &&
@@ -250403,84 +250404,6 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4101-apply-nonl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4101-apply-nonl/.git/
-expecting success of 4101.1 'apply diff between 0 and 1': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 1 - apply diff between 0 and 1
-
-expecting success of 4101.2 'apply diff between 0 and 2': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 2 - apply diff between 0 and 2
-
-expecting success of 4101.3 'apply diff between 0 and 3': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 3 - apply diff between 0 and 3
-
-expecting success of 4101.4 'apply diff between 1 and 0': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 4 - apply diff between 1 and 0
-
-expecting success of 4101.5 'apply diff between 1 and 2': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 5 - apply diff between 1 and 2
-
-expecting success of 4101.6 'apply diff between 1 and 3': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 6 - apply diff between 1 and 3
-
-expecting success of 4101.7 'apply diff between 2 and 0': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 7 - apply diff between 2 and 0
-
-expecting success of 4101.8 'apply diff between 2 and 1': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 8 - apply diff between 2 and 1
-
-expecting success of 4101.9 'apply diff between 2 and 3': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 9 - apply diff between 2 and 3
-
-expecting success of 4101.10 'apply diff between 3 and 0': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 10 - apply diff between 3 and 0
-
-expecting success of 4101.11 'apply diff between 3 and 1': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 11 - apply diff between 3 and 1
-
-expecting success of 4101.12 'apply diff between 3 and 2': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 12 - apply diff between 3 and 2
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4061-diff-indent.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4061-diff-indent/.git/
 expecting success of 4061.1 'prepare': 
@@ -250903,1253 +250826,393 @@
 1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4068-diff-symmetric-merge-base.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t4101-apply-nonl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4101-apply-nonl/.git/
+expecting success of 4101.1 'apply diff between 0 and 1': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 1 - apply diff between 0 and 1
 
-expecting success of 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
+expecting success of 4101.2 'apply diff between 0 and 2': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 2 - apply diff between 0 and 2
 
-ok 2 - diff with one merge base
+expecting success of 4101.3 'apply diff between 0 and 3': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 3 - apply diff between 0 and 3
 
-expecting success of 4068.3 'diff with two merge bases': 
-	git diff br1...main >tmp 2>err &&
-	test_line_count = 7 tmp &&
-	test_line_count = 1 err
+expecting success of 4101.4 'apply diff between 1 and 0': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 4 - apply diff between 1 and 0
 
-ok 3 - diff with two merge bases
+expecting success of 4101.5 'apply diff between 1 and 2': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 5 - apply diff between 1 and 2
 
-expecting success of 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
+expecting success of 4101.6 'apply diff between 1 and 3': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 6 - apply diff between 1 and 3
 
-fatal: br2...br3: no merge base
-ok 4 - diff with no merge bases
+expecting success of 4101.7 'apply diff between 2 and 0': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 7 - apply diff between 2 and 0
 
-expecting success of 4068.5 'diff with too many symmetric differences': 
-	test_must_fail git diff br1...main br2...br3 2>err &&
-	test_grep "usage" err
+expecting success of 4101.8 'apply diff between 2 and 1': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 8 - apply diff between 2 and 1
 
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-ok 5 - diff with too many symmetric differences
+expecting success of 4101.9 'apply diff between 2 and 3': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 9 - apply diff between 2 and 3
 
-expecting success of 4068.6 'diff with symmetric difference and extraneous arg': 
-	test_must_fail git diff main br1...main 2>err &&
-	test_grep "usage" err
+expecting success of 4101.10 'apply diff between 3 and 0': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 10 - apply diff between 3 and 0
 
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-ok 6 - diff with symmetric difference and extraneous arg
+expecting success of 4101.11 'apply diff between 3 and 1': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 11 - apply diff between 3 and 1
 
-expecting success of 4068.7 'diff with two ranges': 
-	test_must_fail git diff main br1..main br2..br3 2>err &&
-	test_grep "usage" err
+expecting success of 4101.12 'apply diff between 3 and 2': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 12 - apply diff between 3 and 2
 
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-ok 7 - diff with two ranges
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4106-apply-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4106-apply-stdin/.git/
+expecting success of 4106.1 'setup': 
+	echo hello >text &&
+	git add text &&
+	echo goodbye >text &&
+	git diff >patch
 
-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
+ok 1 - setup
 
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-ok 8 - diff with ranges and extra arg
+expecting success of 4106.2 'git apply --numstat - < patch': 
+	echo "1	1	text" >expect &&
+	git apply --numstat - <patch >actual &&
+	test_cmp expect actual
 
-expecting success of 4068.9 'diff --merge-base with no commits': 
-	test_must_fail git diff --merge-base
+ok 2 - git apply --numstat - < patch
 
-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>
+expecting success of 4106.3 'git apply --numstat - < patch patch': 
+	cat >expect <<-\EOF &&
+	1	1	text
+	1	1	text
+	EOF
+	git apply --numstat - < patch patch >actual &&
+	test_cmp expect actual
 
-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 3 - git apply --numstat - < patch patch
 
-ok 9 - diff --merge-base with no commits
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4018-diff-funcname.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4018-diff-funcname/.git/
+expecting success of 4018.1 'setup': 
+	# a non-trivial custom pattern
+	git config diff.custom1.funcname "!static
+!String
+[^ 	].*s.*" &&
 
-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
+	# a custom pattern which matches to end of line
+	git config diff.custom2.funcname "......Beer\$" &&
 
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-ok 10 - diff --merge-base with three commits
+	# alternation in pattern
+	git config diff.custom3.funcname "Beer$" &&
+	git config diff.custom3.xfuncname "^[ 	]*((public|static).*)$" &&
 
-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
+	# for regexp compilation tests
+	echo A >A.java &&
+	echo B >B.java
 
-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
+ok 1 - setup
 
-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 4018.2 'setup: test-tool userdiff': 
+	# Make sure additions to builtin_drivers are sorted
+	test_when_finished "rm builtin-drivers.sorted" &&
+	test-tool userdiff list-builtin-drivers >builtin-drivers &&
+	test_file_not_empty builtin-drivers &&
+	sort <builtin-drivers >builtin-drivers.sorted &&
+	test_cmp builtin-drivers.sorted builtin-drivers &&
 
-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
+	# Ditto, but "custom" requires the .git directory and config
+	# to be setup and read.
+	test_when_finished "rm custom-drivers.sorted" &&
+	test-tool userdiff list-custom-drivers >custom-drivers &&
+	test_file_not_empty custom-drivers &&
+	sort <custom-drivers >custom-drivers.sorted &&
+	test_cmp custom-drivers.sorted custom-drivers
 
-expecting success of 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
+ok 2 - setup: test-tool userdiff
 
-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
+expecting success of 4018.3 'builtin ada pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-Already on 'main'
-error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
-ok 16 - diff-index --merge-base with non-commit
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 3 - builtin ada pattern compiles
 
-expecting success of 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
+expecting success of 4018.4 'builtin ada wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-Already on 'main'
-fatal: no merge base found
-ok 17 - diff-index --merge-base with no merge bases and one commit
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 4 - builtin ada wordRegex pattern compiles
 
-expecting success of 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 4018.5 'builtin ada pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-Already on 'main'
-fatal: multiple merge bases found
-ok 18 - diff-index --merge-base with multiple merge bases and one commit
+Switched to a new branch 'master'
+[master (root-commit) 09f480a] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 6 files changed, 31 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 A.java
+ create mode 100644 B.java
+ create mode 100644 builtin-drivers
+ create mode 100644 custom-drivers
+ create mode 100644 msg
+Switched to a new branch 'branchA'
+[branchA d2d1668] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 5 - builtin ada pattern compiles on bare repo with --attr-source
 
-expecting success of 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 4018.6 'builtin bash pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-Already on 'main'
-ok 19 - diff --merge-base with one commit
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 6 - builtin bash pattern compiles
 
-expecting success of 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 4018.7 'builtin bash wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-Already on 'main'
-ok 20 - diff --merge-base with annotated tag
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 7 - builtin bash wordRegex pattern compiles
 
-expecting success of 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 4018.8 'builtin bash pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 21 - diff --merge-base with one commit and unstaged changes
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 76aba7f] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 2a04301] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 8 - builtin bash pattern compiles on bare repo with --attr-source
 
-expecting success of 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 4018.9 'builtin bibtex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 22 - diff --merge-base with one commit and staged and unstaged changes
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 9 - builtin bibtex pattern compiles
 
-expecting success of 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 4018.10 'builtin bibtex wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 23 - diff --merge-base --cached with one commit and staged and unstaged changes
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 10 - builtin bibtex wordRegex pattern compiles
 
-expecting success of 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 4018.11 'builtin bibtex pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-Already on 'main'
-error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
-ok 24 - diff --merge-base with non-commit
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 07560b6] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 3d6becf] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 11 - builtin bibtex pattern compiles on bare repo with --attr-source
 
-expecting success of 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 4018.12 'builtin cpp pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-Already on 'main'
-fatal: no merge base found
-ok 25 - diff --merge-base with no merge bases and one commit
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 12 - builtin cpp pattern compiles
 
-expecting success of 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 4018.13 'builtin cpp wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
 	
-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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4069-remerge-diff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4069-remerge-diff/.git/
-expecting success of 4069.1 'setup basic merges': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
-	git add numbers &&
-	git commit -m base &&
-
-	git branch feature_a &&
-	git branch feature_b &&
-	git branch feature_c &&
-
-	git branch ab_resolution &&
-	git branch bc_resolution &&
-
-	git checkout feature_a &&
-	test_write_lines 1 2 three 4 5 6 7 eight 9 >numbers &&
-	git commit -a -m change_a &&
-
-	git checkout feature_b &&
-	test_write_lines 1 2 tres 4 5 6 7 8 9 >numbers &&
-	git commit -a -m change_b &&
-
-	git checkout feature_c &&
-	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
-	git commit -a -m change_c &&
-
-	git checkout bc_resolution &&
-	git merge --ff-only feature_b &&
-	# no conflict
-	git merge feature_c &&
-
-	git checkout ab_resolution &&
-	git merge --ff-only feature_a &&
-	# conflicts!
-	test_must_fail git merge feature_b &&
-	# Resolve conflict...and make another change elsewhere
-	test_write_lines 1 2 drei 4 5 6 7 acht 9 >numbers &&
-	git add numbers &&
-	git merge --continue
-
-[master (root-commit) 0f94a91] base
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 numbers
-Switched to branch 'feature_a'
-[feature_a b0ed5cb] change_a
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Switched to branch 'feature_b'
-[feature_b 6cd3f82] change_b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'feature_c'
-[feature_c b325327] change_c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'bc_resolution'
-Updating 0f94a91..6cd3f82
-Fast-forward
- numbers | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging numbers
-Merge made by the 'ort' strategy.
- numbers | 1 +
- 1 file changed, 1 insertion(+)
-Switched to branch 'ab_resolution'
-Updating 0f94a91..b0ed5cb
-Fast-forward
- numbers | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Auto-merging numbers
-CONFLICT (content): Merge conflict in numbers
-Automatic merge failed; fix conflicts and then commit the result.
-[ab_resolution 4d00047] Merge branch 'feature_b' into ab_resolution
- Author: A U Thor <author@example.com>
-ok 1 - setup basic merges
-
-expecting success of 4069.2 'remerge-diff on a clean merge': 
-	git log -1 --oneline bc_resolution >expect &&
-	git show --oneline --remerge-diff bc_resolution >actual &&
-	test_cmp expect actual
-
-ok 2 - remerge-diff on a clean merge
-
-expecting success of 4069.3 'remerge-diff on a clean merge with a filter': 
-	git show --oneline --remerge-diff --diff-filter=U bc_resolution >actual &&
-	test_must_be_empty actual
-
-ok 3 - remerge-diff on a clean merge with a filter
-
-expecting success of 4069.4 'remerge-diff with both a resolved conflict and an unrelated change': 
-	git log -1 --oneline ab_resolution >tmp &&
-	cat <<-EOF >>tmp &&
-	diff --git a/numbers b/numbers
-	remerge CONFLICT (content): Merge conflict in numbers
-	index a1fb731..6875544 100644
-	--- a/numbers
-	+++ b/numbers
-	@@ -1,13 +1,9 @@
-	 1
-	 2
-	-<<<<<<< b0ed5cb (change_a)
-	-three
-	-=======
-	-tres
-	->>>>>>> 6cd3f82 (change_b)
-	+drei
-	 4
-	 5
-	 6
-	 7
-	-eight
-	+acht
-	 9
-	EOF
-	# Hashes above are sha1; rip them out so test works with sha256
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
-
-	git show --oneline --remerge-diff ab_resolution >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 4 - remerge-diff with both a resolved conflict and an unrelated change
-
-expecting success of 4069.5 'pickaxe still includes additional headers for relevant changes': 
-	# reuses "expect" from the previous testcase
-
-	git log --oneline --remerge-diff -Sacht ab_resolution >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 5 - pickaxe still includes additional headers for relevant changes
-
-expecting success of 4069.6 'can filter out additional headers with pickaxe': 
-	git show --remerge-diff --submodule=log --find-object=HEAD ab_resolution >actual &&
-	test_must_be_empty actual &&
-
-	git show --remerge-diff -S"not present" --all >actual &&
-	test_must_be_empty actual
-
-ok 6 - can filter out additional headers with pickaxe
-
-expecting success of 4069.7 'remerge-diff also works for git-diff-tree': 
-	# With a clean merge
-	git diff-tree -r -p --remerge-diff --no-commit-id bc_resolution >actual &&
-	test_must_be_empty actual &&
-
-	# With both a resolved conflict and an unrelated change
-	cat <<-EOF >tmp &&
-	diff --git a/numbers b/numbers
-	remerge CONFLICT (content): Merge conflict in numbers
-	index a1fb731..6875544 100644
-	--- a/numbers
-	+++ b/numbers
-	@@ -1,13 +1,9 @@
-	 1
-	 2
-	-<<<<<<< b0ed5cb (change_a)
-	-three
-	-=======
-	-tres
-	->>>>>>> 6cd3f82 (change_b)
-	+drei
-	 4
-	 5
-	 6
-	 7
-	-eight
-	+acht
-	 9
-	EOF
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
-	git diff-tree -r -p --remerge-diff --no-commit-id ab_resolution >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 7 - remerge-diff also works for git-diff-tree
-
-expecting success of 4069.8 'setup non-content conflicts': 
-	git switch --orphan base &&
-
-	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
-	test_write_lines a b c d e f g h i >letters &&
-	test_write_lines in the way >content &&
-	git add numbers letters content &&
-	git commit -m base &&
-
-	git branch side1 &&
-	git branch side2 &&
-
-	git checkout side1 &&
-	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
-	git mv letters letters_side1 &&
-	git mv content file_or_directory &&
-	git add numbers &&
-	git commit -m side1 &&
-
-	git checkout side2 &&
-	git rm numbers &&
-	git mv letters letters_side2 &&
-	mkdir file_or_directory &&
-	echo hello >file_or_directory/world &&
-	git add file_or_directory/world &&
-	git commit -m side2 &&
-
-	git checkout -b resolution side1 &&
-	test_must_fail git merge side2 &&
-	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
-	git add numbers &&
-	git add letters_side1 &&
-	git rm letters &&
-	git rm letters_side2 &&
-	git add file_or_directory~HEAD &&
-	git mv file_or_directory~HEAD wanted_content &&
-	git commit -m resolved
-
-Switched to a new branch 'base'
-[base (root-commit) c2c77a3] base
- Author: A U Thor <author@example.com>
- 3 files changed, 21 insertions(+)
- create mode 100644 content
- create mode 100644 letters
- create mode 100644 numbers
-Switched to branch 'side1'
-[side1 cfe6fba] side1
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 1 deletion(-)
- rename content => file_or_directory (100%)
- rename letters => letters_side1 (100%)
-Switched to branch 'side2'
-rm 'numbers'
-[side2 6db5781] side2
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 9 deletions(-)
- create mode 100644 file_or_directory/world
- rename letters => letters_side2 (100%)
- delete mode 100644 numbers
-Switched to a new branch 'resolution'
-CONFLICT (file/directory): directory in the way of file_or_directory from HEAD; moving it to file_or_directory~HEAD instead.
-CONFLICT (rename/rename): letters renamed to letters_side1 in HEAD and to letters_side2 in side2.
-CONFLICT (modify/delete): numbers deleted in side2 and modified in HEAD.  Version HEAD of numbers left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'letters'
-rm 'letters_side2'
-[resolution 692604d] resolved
- Author: A U Thor <author@example.com>
-ok 8 - setup non-content conflicts
-
-expecting success of 4069.9 'remerge-diff with non-content conflicts': 
-	git log -1 --oneline resolution >tmp &&
-	cat <<-EOF >>tmp &&
-	diff --git a/file_or_directory~HASH (side1) b/wanted_content
-	similarity index 100%
-	rename from file_or_directory~HASH (side1)
-	rename to wanted_content
-	remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
-	diff --git a/letters b/letters
-	remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
-	diff --git a/letters_side2 b/letters_side2
-	deleted file mode 100644
-	index b236ae5..0000000
-	--- a/letters_side2
-	+++ /dev/null
-	@@ -1,9 +0,0 @@
-	-a
-	-b
-	-c
-	-d
-	-e
-	-f
-	-g
-	-h
-	-i
-	diff --git a/numbers b/numbers
-	remerge CONFLICT (modify/delete): numbers deleted in HASH (side2) and modified in HASH (side1).  Version HASH (side1) of numbers left in tree.
-	EOF
-	# We still have some sha1 hashes above; rip them out so test works
-	# with sha256
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
-
-	git show --oneline --remerge-diff resolution >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 9 - remerge-diff with non-content conflicts
-
-expecting success of 4069.10 'remerge-diff w/ diff-filter=U: all conflict headers, no diff content': 
-	git log -1 --oneline resolution >tmp &&
-	cat <<-EOF >>tmp &&
-	diff --git a/file_or_directory~HASH (side1) b/file_or_directory~HASH (side1)
-	remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
-	diff --git a/letters b/letters
-	remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
-	diff --git a/numbers b/numbers
-	remerge CONFLICT (modify/delete): numbers deleted in HASH (side2) and modified in HASH (side1).  Version HASH (side1) of numbers left in tree.
-	EOF
-	# We still have some sha1 hashes above; rip them out so test works
-	# with sha256
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
-
-	git show --oneline --remerge-diff --diff-filter=U resolution >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 10 - remerge-diff w/ diff-filter=U: all conflict headers, no diff content
-
-expecting success of 4069.11 'submodule formatting ignores additional headers': 
-	# Reuses "expect" from last testcase
-
-	git show --oneline --remerge-diff --diff-filter=U --submodule=log >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 11 - submodule formatting ignores additional headers
-
-expecting success of 4069.12 'remerge-diff w/ diff-filter=R: relevant file + conflict header': 
-	git log -1 --oneline resolution >tmp &&
-	cat <<-EOF >>tmp &&
-	diff --git a/file_or_directory~HASH (side1) b/wanted_content
-	similarity index 100%
-	rename from file_or_directory~HASH (side1)
-	rename to wanted_content
-	remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
-	EOF
-	# We still have some sha1 hashes above; rip them out so test works
-	# with sha256
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
-
-	git show --oneline --remerge-diff --diff-filter=R resolution >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 12 - remerge-diff w/ diff-filter=R: relevant file + conflict header
-
-expecting success of 4069.13 'remerge-diff w/ pathspec: limits to relevant file including conflict header': 
-	git log -1 --oneline resolution >tmp &&
-	cat <<-EOF >>tmp &&
-	diff --git a/letters b/letters
-	remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
-	diff --git a/letters_side2 b/letters_side2
-	deleted file mode 100644
-	index b236ae5..0000000
-	--- a/letters_side2
-	+++ /dev/null
-	@@ -1,9 +0,0 @@
-	-a
-	-b
-	-c
-	-d
-	-e
-	-f
-	-g
-	-h
-	-i
-	EOF
-	# We still have some sha1 hashes above; rip them out so test works
-	# with sha256
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
-
-	git show --oneline --remerge-diff resolution -- "letters*" >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 13 - remerge-diff w/ pathspec: limits to relevant file including conflict header
-
-expecting success of 4069.14 'setup non-content conflicts': 
-	git switch --orphan newbase &&
-
-	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
-	git add numbers &&
-	git commit -m base &&
-
-	git branch newside1 &&
-	git branch newside2 &&
-
-	git checkout newside1 &&
-	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
-	git add numbers &&
-	git commit -m side1 &&
-
-	git checkout newside2 &&
-	test_write_lines 1 2 drei 4 5 6 7 8 9 >numbers &&
-	git add numbers &&
-	git commit -m side2 &&
-
-	git checkout -b newresolution newside1 &&
-	test_must_fail git merge newside2 &&
-	git checkout --theirs numbers &&
-	git add -u numbers &&
-	git commit -m resolved
-
-Switched to a new branch 'newbase'
-[newbase (root-commit) 0f94a91] base
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 numbers
-Switched to branch 'newside1'
-[newside1 96f1e45] side1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'newside2'
-[newside2 4fd522f] side2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'newresolution'
-Auto-merging numbers
-CONFLICT (content): Merge conflict in numbers
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from the index
-[newresolution f8f340c] resolved
- Author: A U Thor <author@example.com>
-ok 14 - setup non-content conflicts
-
-expecting success of 4069.15 'remerge-diff turns off history simplification': 
-	git log -1 --oneline newresolution >tmp &&
-	cat <<-EOF >>tmp &&
-	diff --git a/numbers b/numbers
-	remerge CONFLICT (content): Merge conflict in numbers
-	index 070e9e7..5335e78 100644
-	--- a/numbers
-	+++ b/numbers
-	@@ -1,10 +1,6 @@
-	 1
-	 2
-	-<<<<<<< 96f1e45 (side1)
-	-three
-	-=======
-	 drei
-	->>>>>>> 4fd522f (side2)
-	 4
-	 5
-	 6
-	EOF
-	# We still have some sha1 hashes above; rip them out so test works
-	# with sha256
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
-
-	git show --oneline --remerge-diff newresolution -- numbers >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 15 - remerge-diff turns off history simplification
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4106-apply-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4106-apply-stdin/.git/
-expecting success of 4106.1 'setup': 
-	echo hello >text &&
-	git add text &&
-	echo goodbye >text &&
-	git diff >patch
-
-ok 1 - setup
-
-expecting success of 4106.2 'git apply --numstat - < patch': 
-	echo "1	1	text" >expect &&
-	git apply --numstat - <patch >actual &&
-	test_cmp expect actual
-
-ok 2 - git apply --numstat - < patch
-
-expecting success of 4106.3 'git apply --numstat - < patch patch': 
-	cat >expect <<-\EOF &&
-	1	1	text
-	1	1	text
-	EOF
-	git apply --numstat - < patch patch >actual &&
-	test_cmp expect actual
-
-ok 3 - git apply --numstat - < patch patch
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4105-apply-fuzz.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4105-apply-fuzz/.git/
-expecting success of 4105.1 'setup': 
-
-	test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 >file &&
-	git update-index --add file &&
-	test_write_lines 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12 >file &&
-	cat file >expect &&
-	git diff >O0.diff &&
-
-	sed -e "s/@@ -5,6 +5,11 @@/@@ -2,6 +2,11 @@/" >O1.diff O0.diff &&
-	sed -e "s/@@ -5,6 +5,11 @@/@@ -7,6 +7,11 @@/" >O2.diff O0.diff &&
-	sed -e "s/@@ -5,6 +5,11 @@/@@ -19,6 +19,11 @@/" >O3.diff O0.diff &&
-
-	sed -e "s/^ 5/ S/" >F0.diff O0.diff &&
-	sed -e "s/^ 5/ S/" >F1.diff O1.diff &&
-	sed -e "s/^ 5/ S/" >F2.diff O2.diff &&
-	sed -e "s/^ 5/ S/" >F3.diff O3.diff
-
-
-ok 1 - setup
-
-expecting success of 4105.2 'unmodified patch': 
-		git checkout-index -f -q -u file &&
-		git apply O0.diff &&
-		test_cmp expect file
-	
-ok 2 - unmodified patch
-
-expecting success of 4105.3 'minus offset': 
-		git checkout-index -f -q -u file &&
-		git apply O1.diff &&
-		test_cmp expect file
-	
-ok 3 - minus offset
-
-expecting success of 4105.4 'plus offset': 
-		git checkout-index -f -q -u file &&
-		git apply O2.diff &&
-		test_cmp expect file
-	
-ok 4 - plus offset
-
-expecting success of 4105.5 'big offset': 
-		git checkout-index -f -q -u file &&
-		git apply O3.diff &&
-		test_cmp expect file
-	
-ok 5 - big offset
-
-expecting success of 4105.6 'fuzz with no offset': 
-		git checkout-index -f -q -u file &&
-		git apply -C2 F0.diff &&
-		test_cmp expect file
-	
-Context reduced to (2/2) to apply fragment at 6
-ok 6 - fuzz with no offset
-
-expecting success of 4105.7 'fuzz with minus offset': 
-		git checkout-index -f -q -u file &&
-		git apply -C2 F1.diff &&
-		test_cmp expect file
-	
-Context reduced to (2/2) to apply fragment at 6
-ok 7 - fuzz with minus offset
-
-expecting success of 4105.8 'fuzz with plus offset': 
-		git checkout-index -f -q -u file &&
-		git apply -C2 F2.diff &&
-		test_cmp expect file
-	
-Context reduced to (2/2) to apply fragment at 6
-ok 8 - fuzz with plus offset
-
-expecting success of 4105.9 'fuzz with big offset': 
-		git checkout-index -f -q -u file &&
-		git apply -C2 F3.diff &&
-		test_cmp expect file
-	
-Context reduced to (2/2) to apply fragment at 6
-ok 9 - fuzz with big offset
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4018-diff-funcname.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4018-diff-funcname/.git/
-expecting success of 4018.1 'setup': 
-	# a non-trivial custom pattern
-	git config diff.custom1.funcname "!static
-!String
-[^ 	].*s.*" &&
-
-	# a custom pattern which matches to end of line
-	git config diff.custom2.funcname "......Beer\$" &&
-
-	# alternation in pattern
-	git config diff.custom3.funcname "Beer$" &&
-	git config diff.custom3.xfuncname "^[ 	]*((public|static).*)$" &&
-
-	# for regexp compilation tests
-	echo A >A.java &&
-	echo B >B.java
-
-ok 1 - setup
-
-expecting success of 4018.2 'setup: test-tool userdiff': 
-	# Make sure additions to builtin_drivers are sorted
-	test_when_finished "rm builtin-drivers.sorted" &&
-	test-tool userdiff list-builtin-drivers >builtin-drivers &&
-	test_file_not_empty builtin-drivers &&
-	sort <builtin-drivers >builtin-drivers.sorted &&
-	test_cmp builtin-drivers.sorted builtin-drivers &&
-
-	# Ditto, but "custom" requires the .git directory and config
-	# to be setup and read.
-	test_when_finished "rm custom-drivers.sorted" &&
-	test-tool userdiff list-custom-drivers >custom-drivers &&
-	test_file_not_empty custom-drivers &&
-	sort <custom-drivers >custom-drivers.sorted &&
-	test_cmp custom-drivers.sorted custom-drivers
-
-ok 2 - setup: test-tool userdiff
-
-expecting success of 4018.3 'builtin ada pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 3 - builtin ada pattern compiles
-
-expecting success of 4018.4 'builtin ada wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 4 - builtin ada wordRegex pattern compiles
-
-expecting success of 4018.5 'builtin ada pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to a new branch 'master'
-[master (root-commit) 09f480a] changing gitattributes
- Author: A U Thor <author@example.com>
- 6 files changed, 31 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 A.java
- create mode 100644 B.java
- create mode 100644 builtin-drivers
- create mode 100644 custom-drivers
- create mode 100644 msg
-Switched to a new branch 'branchA'
-[branchA d2d1668] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 5 - builtin ada pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.6 'builtin bash pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 6 - builtin bash pattern compiles
-
-expecting success of 4018.7 'builtin bash wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 7 - builtin bash wordRegex pattern compiles
-
-expecting success of 4018.8 'builtin bash pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 76aba7f] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 2a04301] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 8 - builtin bash pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.9 'builtin bibtex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 9 - builtin bibtex pattern compiles
-
-expecting success of 4018.10 'builtin bibtex wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 10 - builtin bibtex wordRegex pattern compiles
-
-expecting success of 4018.11 'builtin bibtex pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 07560b6] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 3d6becf] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 11 - builtin bibtex pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.12 'builtin cpp pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 12 - builtin cpp pattern compiles
-
-expecting success of 4018.13 'builtin cpp wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 13 - builtin cpp wordRegex pattern compiles
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 13 - builtin cpp wordRegex pattern compiles
 
 expecting success of 4018.14 'builtin cpp pattern compiles on bare repo with --attr-source': 
 		test_when_finished "rm -rf bare.git" &&
@@ -255127,6 +254190,411 @@
 1..270
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4068-diff-symmetric-merge-base.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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>
+
+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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4107-apply-ignore-whitespace.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4107-apply-ignore-whitespace/.git/
 expecting success of 4107.1 'file creation': 
@@ -255210,6 +254678,1225 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4105-apply-fuzz.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4105-apply-fuzz/.git/
+expecting success of 4105.1 'setup': 
+
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 >file &&
+	git update-index --add file &&
+	test_write_lines 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12 >file &&
+	cat file >expect &&
+	git diff >O0.diff &&
+
+	sed -e "s/@@ -5,6 +5,11 @@/@@ -2,6 +2,11 @@/" >O1.diff O0.diff &&
+	sed -e "s/@@ -5,6 +5,11 @@/@@ -7,6 +7,11 @@/" >O2.diff O0.diff &&
+	sed -e "s/@@ -5,6 +5,11 @@/@@ -19,6 +19,11 @@/" >O3.diff O0.diff &&
+
+	sed -e "s/^ 5/ S/" >F0.diff O0.diff &&
+	sed -e "s/^ 5/ S/" >F1.diff O1.diff &&
+	sed -e "s/^ 5/ S/" >F2.diff O2.diff &&
+	sed -e "s/^ 5/ S/" >F3.diff O3.diff
+
+
+ok 1 - setup
+
+expecting success of 4105.2 'unmodified patch': 
+		git checkout-index -f -q -u file &&
+		git apply O0.diff &&
+		test_cmp expect file
+	
+ok 2 - unmodified patch
+
+expecting success of 4105.3 'minus offset': 
+		git checkout-index -f -q -u file &&
+		git apply O1.diff &&
+		test_cmp expect file
+	
+ok 3 - minus offset
+
+expecting success of 4105.4 'plus offset': 
+		git checkout-index -f -q -u file &&
+		git apply O2.diff &&
+		test_cmp expect file
+	
+ok 4 - plus offset
+
+expecting success of 4105.5 'big offset': 
+		git checkout-index -f -q -u file &&
+		git apply O3.diff &&
+		test_cmp expect file
+	
+ok 5 - big offset
+
+expecting success of 4105.6 'fuzz with no offset': 
+		git checkout-index -f -q -u file &&
+		git apply -C2 F0.diff &&
+		test_cmp expect file
+	
+Context reduced to (2/2) to apply fragment at 6
+ok 6 - fuzz with no offset
+
+expecting success of 4105.7 'fuzz with minus offset': 
+		git checkout-index -f -q -u file &&
+		git apply -C2 F1.diff &&
+		test_cmp expect file
+	
+Context reduced to (2/2) to apply fragment at 6
+ok 7 - fuzz with minus offset
+
+expecting success of 4105.8 'fuzz with plus offset': 
+		git checkout-index -f -q -u file &&
+		git apply -C2 F2.diff &&
+		test_cmp expect file
+	
+Context reduced to (2/2) to apply fragment at 6
+ok 8 - fuzz with plus offset
+
+expecting success of 4105.9 'fuzz with big offset': 
+		git checkout-index -f -q -u file &&
+		git apply -C2 F3.diff &&
+		test_cmp expect file
+	
+Context reduced to (2/2) to apply fragment at 6
+ok 9 - fuzz with big offset
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4069-remerge-diff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4069-remerge-diff/.git/
+expecting success of 4069.1 'setup basic merges': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m base &&
+
+	git branch feature_a &&
+	git branch feature_b &&
+	git branch feature_c &&
+
+	git branch ab_resolution &&
+	git branch bc_resolution &&
+
+	git checkout feature_a &&
+	test_write_lines 1 2 three 4 5 6 7 eight 9 >numbers &&
+	git commit -a -m change_a &&
+
+	git checkout feature_b &&
+	test_write_lines 1 2 tres 4 5 6 7 8 9 >numbers &&
+	git commit -a -m change_b &&
+
+	git checkout feature_c &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
+	git commit -a -m change_c &&
+
+	git checkout bc_resolution &&
+	git merge --ff-only feature_b &&
+	# no conflict
+	git merge feature_c &&
+
+	git checkout ab_resolution &&
+	git merge --ff-only feature_a &&
+	# conflicts!
+	test_must_fail git merge feature_b &&
+	# Resolve conflict...and make another change elsewhere
+	test_write_lines 1 2 drei 4 5 6 7 acht 9 >numbers &&
+	git add numbers &&
+	git merge --continue
+
+[master (root-commit) 0f94a91] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 numbers
+Switched to branch 'feature_a'
+[feature_a b0ed5cb] change_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Switched to branch 'feature_b'
+[feature_b 6cd3f82] change_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'feature_c'
+[feature_c b325327] change_c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'bc_resolution'
+Updating 0f94a91..6cd3f82
+Fast-forward
+ numbers | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging numbers
+Merge made by the 'ort' strategy.
+ numbers | 1 +
+ 1 file changed, 1 insertion(+)
+Switched to branch 'ab_resolution'
+Updating 0f94a91..b0ed5cb
+Fast-forward
+ numbers | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Auto-merging numbers
+CONFLICT (content): Merge conflict in numbers
+Automatic merge failed; fix conflicts and then commit the result.
+[ab_resolution 4d00047] Merge branch 'feature_b' into ab_resolution
+ Author: A U Thor <author@example.com>
+ok 1 - setup basic merges
+
+expecting success of 4069.2 'remerge-diff on a clean merge': 
+	git log -1 --oneline bc_resolution >expect &&
+	git show --oneline --remerge-diff bc_resolution >actual &&
+	test_cmp expect actual
+
+ok 2 - remerge-diff on a clean merge
+
+expecting success of 4069.3 'remerge-diff on a clean merge with a filter': 
+	git show --oneline --remerge-diff --diff-filter=U bc_resolution >actual &&
+	test_must_be_empty actual
+
+ok 3 - remerge-diff on a clean merge with a filter
+
+expecting success of 4069.4 'remerge-diff with both a resolved conflict and an unrelated change': 
+	git log -1 --oneline ab_resolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/numbers b/numbers
+	remerge CONFLICT (content): Merge conflict in numbers
+	index a1fb731..6875544 100644
+	--- a/numbers
+	+++ b/numbers
+	@@ -1,13 +1,9 @@
+	 1
+	 2
+	-<<<<<<< b0ed5cb (change_a)
+	-three
+	-=======
+	-tres
+	->>>>>>> 6cd3f82 (change_b)
+	+drei
+	 4
+	 5
+	 6
+	 7
+	-eight
+	+acht
+	 9
+	EOF
+	# Hashes above are sha1; rip them out so test works with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff ab_resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+
+ok 4 - remerge-diff with both a resolved conflict and an unrelated change
+
+expecting success of 4069.5 'pickaxe still includes additional headers for relevant changes': 
+	# reuses "expect" from the previous testcase
+
+	git log --oneline --remerge-diff -Sacht ab_resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+
+ok 5 - pickaxe still includes additional headers for relevant changes
+
+expecting success of 4069.6 'can filter out additional headers with pickaxe': 
+	git show --remerge-diff --submodule=log --find-object=HEAD ab_resolution >actual &&
+	test_must_be_empty actual &&
+
+	git show --remerge-diff -S"not present" --all >actual &&
+	test_must_be_empty actual
+
+ok 6 - can filter out additional headers with pickaxe
+
+expecting success of 4069.7 'remerge-diff also works for git-diff-tree': 
+	# With a clean merge
+	git diff-tree -r -p --remerge-diff --no-commit-id bc_resolution >actual &&
+	test_must_be_empty actual &&
+
+	# With both a resolved conflict and an unrelated change
+	cat <<-EOF >tmp &&
+	diff --git a/numbers b/numbers
+	remerge CONFLICT (content): Merge conflict in numbers
+	index a1fb731..6875544 100644
+	--- a/numbers
+	+++ b/numbers
+	@@ -1,13 +1,9 @@
+	 1
+	 2
+	-<<<<<<< b0ed5cb (change_a)
+	-three
+	-=======
+	-tres
+	->>>>>>> 6cd3f82 (change_b)
+	+drei
+	 4
+	 5
+	 6
+	 7
+	-eight
+	+acht
+	 9
+	EOF
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+	git diff-tree -r -p --remerge-diff --no-commit-id ab_resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+
+ok 7 - remerge-diff also works for git-diff-tree
+
+expecting success of 4069.8 'setup non-content conflicts': 
+	git switch --orphan base &&
+
+	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+	test_write_lines a b c d e f g h i >letters &&
+	test_write_lines in the way >content &&
+	git add numbers letters content &&
+	git commit -m base &&
+
+	git branch side1 &&
+	git branch side2 &&
+
+	git checkout side1 &&
+	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+	git mv letters letters_side1 &&
+	git mv content file_or_directory &&
+	git add numbers &&
+	git commit -m side1 &&
+
+	git checkout side2 &&
+	git rm numbers &&
+	git mv letters letters_side2 &&
+	mkdir file_or_directory &&
+	echo hello >file_or_directory/world &&
+	git add file_or_directory/world &&
+	git commit -m side2 &&
+
+	git checkout -b resolution side1 &&
+	test_must_fail git merge side2 &&
+	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git add letters_side1 &&
+	git rm letters &&
+	git rm letters_side2 &&
+	git add file_or_directory~HEAD &&
+	git mv file_or_directory~HEAD wanted_content &&
+	git commit -m resolved
+
+Switched to a new branch 'base'
+[base (root-commit) c2c77a3] base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 21 insertions(+)
+ create mode 100644 content
+ create mode 100644 letters
+ create mode 100644 numbers
+Switched to branch 'side1'
+[side1 cfe6fba] side1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ rename content => file_or_directory (100%)
+ rename letters => letters_side1 (100%)
+Switched to branch 'side2'
+rm 'numbers'
+[side2 6db5781] side2
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 9 deletions(-)
+ create mode 100644 file_or_directory/world
+ rename letters => letters_side2 (100%)
+ delete mode 100644 numbers
+Switched to a new branch 'resolution'
+CONFLICT (file/directory): directory in the way of file_or_directory from HEAD; moving it to file_or_directory~HEAD instead.
+CONFLICT (rename/rename): letters renamed to letters_side1 in HEAD and to letters_side2 in side2.
+CONFLICT (modify/delete): numbers deleted in side2 and modified in HEAD.  Version HEAD of numbers left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'letters'
+rm 'letters_side2'
+[resolution 692604d] resolved
+ Author: A U Thor <author@example.com>
+ok 8 - setup non-content conflicts
+
+expecting success of 4069.9 'remerge-diff with non-content conflicts': 
+	git log -1 --oneline resolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/file_or_directory~HASH (side1) b/wanted_content
+	similarity index 100%
+	rename from file_or_directory~HASH (side1)
+	rename to wanted_content
+	remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
+	diff --git a/letters b/letters
+	remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
+	diff --git a/letters_side2 b/letters_side2
+	deleted file mode 100644
+	index b236ae5..0000000
+	--- a/letters_side2
+	+++ /dev/null
+	@@ -1,9 +0,0 @@
+	-a
+	-b
+	-c
+	-d
+	-e
+	-f
+	-g
+	-h
+	-i
+	diff --git a/numbers b/numbers
+	remerge CONFLICT (modify/delete): numbers deleted in HASH (side2) and modified in HASH (side1).  Version HASH (side1) of numbers left in tree.
+	EOF
+	# We still have some sha1 hashes above; rip them out so test works
+	# with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+
+ok 9 - remerge-diff with non-content conflicts
+
+expecting success of 4069.10 'remerge-diff w/ diff-filter=U: all conflict headers, no diff content': 
+	git log -1 --oneline resolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/file_or_directory~HASH (side1) b/file_or_directory~HASH (side1)
+	remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
+	diff --git a/letters b/letters
+	remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
+	diff --git a/numbers b/numbers
+	remerge CONFLICT (modify/delete): numbers deleted in HASH (side2) and modified in HASH (side1).  Version HASH (side1) of numbers left in tree.
+	EOF
+	# We still have some sha1 hashes above; rip them out so test works
+	# with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff --diff-filter=U resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+
+ok 10 - remerge-diff w/ diff-filter=U: all conflict headers, no diff content
+
+expecting success of 4069.11 'submodule formatting ignores additional headers': 
+	# Reuses "expect" from last testcase
+
+	git show --oneline --remerge-diff --diff-filter=U --submodule=log >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+
+ok 11 - submodule formatting ignores additional headers
+
+expecting success of 4069.12 'remerge-diff w/ diff-filter=R: relevant file + conflict header': 
+	git log -1 --oneline resolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/file_or_directory~HASH (side1) b/wanted_content
+	similarity index 100%
+	rename from file_or_directory~HASH (side1)
+	rename to wanted_content
+	remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
+	EOF
+	# We still have some sha1 hashes above; rip them out so test works
+	# with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff --diff-filter=R resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+
+ok 12 - remerge-diff w/ diff-filter=R: relevant file + conflict header
+
+expecting success of 4069.13 'remerge-diff w/ pathspec: limits to relevant file including conflict header': 
+	git log -1 --oneline resolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/letters b/letters
+	remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
+	diff --git a/letters_side2 b/letters_side2
+	deleted file mode 100644
+	index b236ae5..0000000
+	--- a/letters_side2
+	+++ /dev/null
+	@@ -1,9 +0,0 @@
+	-a
+	-b
+	-c
+	-d
+	-e
+	-f
+	-g
+	-h
+	-i
+	EOF
+	# We still have some sha1 hashes above; rip them out so test works
+	# with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff resolution -- "letters*" >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+
+ok 13 - remerge-diff w/ pathspec: limits to relevant file including conflict header
+
+expecting success of 4069.14 'setup non-content conflicts': 
+	git switch --orphan newbase &&
+
+	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m base &&
+
+	git branch newside1 &&
+	git branch newside2 &&
+
+	git checkout newside1 &&
+	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m side1 &&
+
+	git checkout newside2 &&
+	test_write_lines 1 2 drei 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m side2 &&
+
+	git checkout -b newresolution newside1 &&
+	test_must_fail git merge newside2 &&
+	git checkout --theirs numbers &&
+	git add -u numbers &&
+	git commit -m resolved
+
+Switched to a new branch 'newbase'
+[newbase (root-commit) 0f94a91] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 numbers
+Switched to branch 'newside1'
+[newside1 96f1e45] side1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'newside2'
+[newside2 4fd522f] side2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'newresolution'
+Auto-merging numbers
+CONFLICT (content): Merge conflict in numbers
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from the index
+[newresolution f8f340c] resolved
+ Author: A U Thor <author@example.com>
+ok 14 - setup non-content conflicts
+
+expecting success of 4069.15 'remerge-diff turns off history simplification': 
+	git log -1 --oneline newresolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/numbers b/numbers
+	remerge CONFLICT (content): Merge conflict in numbers
+	index 070e9e7..5335e78 100644
+	--- a/numbers
+	+++ b/numbers
+	@@ -1,10 +1,6 @@
+	 1
+	 2
+	-<<<<<<< 96f1e45 (side1)
+	-three
+	-=======
+	 drei
+	->>>>>>> 4fd522f (side2)
+	 4
+	 5
+	 6
+	EOF
+	# We still have some sha1 hashes above; rip them out so test works
+	# with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff newresolution -- numbers >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+
+ok 15 - remerge-diff turns off history simplification
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4067-diff-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/.git/
+expecting success of 4067.1 'git show batches blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	echo b >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure that there is exactly 1 negotiation by checking that there is
+	# only 1 "done" line sent. ("done" marks the end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) 525c234] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+Cloning into bare repository 'client'...
+commit 525c234aab2853ed2b1af6e508caf4b08300c8c7
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    x
+
+diff --git a/a b/a
+new file mode 100644
+index 0000000..7898192
+--- /dev/null
++++ b/a
+@@ -0,0 +1 @@
++a
+diff --git a/b b/b
+new file mode 100644
+index 0000000..6178079
+--- /dev/null
++++ b/b
+@@ -0,0 +1 @@
++b
+ok 1 - git show batches blobs
+
+expecting success of 4067.2 'diff batches blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	echo b >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	echo c >server/c &&
+	echo d >server/d &&
+	git -C server add c d &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure that there is exactly 1 negotiation by checking that there is
+	# only 1 "done" line sent. ("done" marks the end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) 525c234] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master f59c7b0] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c
+ create mode 100644 d
+Cloning into bare repository 'client'...
+diff --git a/c b/c
+new file mode 100644
+index 0000000..f2ad6c7
+--- /dev/null
++++ b/c
+@@ -0,0 +1 @@
++c
+diff --git a/d b/d
+new file mode 100644
+index 0000000..4bcfe98
+--- /dev/null
++++ b/d
+@@ -0,0 +1 @@
++d
+ok 2 - diff batches blobs
+
+expecting success of 4067.3 'diff skips same-OID blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	echo b >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	echo another-a >server/a &&
+	git -C server add a &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	echo a | git hash-object --stdin >hash-old-a &&
+	echo another-a | git hash-object --stdin >hash-new-a &&
+	echo b | git hash-object --stdin >hash-b &&
+
+	# Ensure that only a and another-a are fetched.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+	grep "want $(cat hash-old-a)" trace &&
+	grep "want $(cat hash-new-a)" trace &&
+	! grep "want $(cat hash-b)" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) 525c234] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 89f0cea] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'client'...
+diff --git a/a b/a
+index 7898192..594b61f 100644
+--- a/a
++++ b/a
+@@ -1 +1 @@
+-a
++another-a
+packet:        fetch> want 78981922613b2afb6025042ff6bd878ac1994e85
+packet:  upload-pack< want 78981922613b2afb6025042ff6bd878ac1994e85
+packet:        fetch> want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
+packet:  upload-pack< want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
+ok 3 - diff skips same-OID blobs
+
+expecting success of 4067.4 'when fetching missing objects, diff skips GITLINKs': 
+	test_when_finished "rm -rf sub server client trace" &&
+	test_config_global protocol.file.allow always &&
+
+	test_create_repo sub &&
+	test_commit -C sub first &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	git -C server add a &&
+	git -C server submodule add "file://$(pwd)/sub" &&
+	git -C server commit -m x &&
+
+	test_commit -C server/sub second &&
+	echo another-a >server/a &&
+	git -C server add a sub &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	echo a | git hash-object --stdin >hash-old-a &&
+	echo another-a | git hash-object --stdin >hash-new-a &&
+
+	# Ensure that a and another-a are fetched, and check (by successful
+	# execution of the diff) that no invalid OIDs are sent.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+	grep "want $(cat hash-old-a)" trace &&
+	grep "want $(cat hash-new-a)" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/sub/.git/
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/sub'...
+[master (root-commit) 29ae88e] x
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 a
+ create mode 160000 sub
+[master d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[master 3c2d722] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Cloning into bare repository 'client'...
+diff --git a/a b/a
+index 7898192..594b61f 100644
+--- a/a
++++ b/a
+@@ -1 +1 @@
+-a
++another-a
+diff --git a/sub b/sub
+index 50e526b..d662100 160000
+--- a/sub
++++ b/sub
+@@ -1 +1 @@
+-Subproject commit 50e526bb426771f6036ad3a8b0c81d511d91fc2a
++Subproject commit d66210046212a498d8c1a48eab414bc6df166f85
+packet:        fetch> want 78981922613b2afb6025042ff6bd878ac1994e85
+packet:  upload-pack< want 78981922613b2afb6025042ff6bd878ac1994e85
+packet:        fetch> want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
+packet:  upload-pack< want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
+ok 4 - when fetching missing objects, diff skips GITLINKs
+
+expecting success of 4067.5 'diff with rename detection batches blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	printf "b\nb\nb\nb\nb\n" >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	rm server/b &&
+	printf "b\nb\nb\nb\nbX\n" >server/c &&
+	git -C server add c &&
+	git -C server commit -a -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure that there is exactly 1 negotiation by checking that there is
+	# only 1 "done" line sent. ("done" marks the end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD >out &&
+	grep ":100644 100644.*R[0-9][0-9][0-9].*b.*c" out &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) a6f879b] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 263bf49] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename b => c (72%)
+Cloning into bare repository 'client'...
+:100644 100644 33db23e f46cdb7 R072	b	c
+ok 5 - diff with rename detection batches blobs
+
+expecting success of 4067.6 'diff does not fetch anything if inexact rename detection is not needed': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	printf "b\nb\nb\nb\nb\n" >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	mv server/b server/c &&
+	git -C server add c &&
+	git -C server commit -a -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure no fetches.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
+	test_path_is_missing trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) a6f879b] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 2759f1d] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => c (100%)
+Cloning into bare repository 'client'...
+:100644 100644 33db23e 33db23e R100	b	c
+ok 6 - diff does not fetch anything if inexact rename detection is not needed
+
+expecting success of 4067.7 'diff --break-rewrites fetches only if necessary, and batches blobs if it does': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	printf "b\nb\nb\nb\nb\n" >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	printf "c\nc\nc\nc\nc\n" >server/b &&
+	git -C server commit -a -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure no fetches.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
+	test_path_is_missing trace &&
+
+	# But with --break-rewrites, ensure that there is exactly 1 negotiation
+	# by checking that there is only 1 "done" line sent. ("done" marks the
+	# end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --break-rewrites --raw -M HEAD^ HEAD &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) a6f879b] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 3aba490] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Cloning into bare repository 'client'...
+:100644 100644 33db23e 6e7ada2 M	b
+:100644 100644 33db23e 6e7ada2 M	b
+ok 7 - diff --break-rewrites fetches only if necessary, and batches blobs if it does
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4103-apply-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4103-apply-binary/.git/
+expecting success of 4103.1 'setup': 
+	cat >file1 <<-\EOF &&
+	A quick brown fox jumps over the lazy dog.
+	A tiny little penguin runs around in circles.
+	There is a flag with Linux written on it.
+	A slow black-and-white panda just sits there,
+	munching on his bamboo.
+	EOF
+	cat file1 >file2 &&
+	cat file1 >file4 &&
+
+	git update-index --add --remove file1 file2 file4 &&
+	git commit -m "Initial Version" 2>/dev/null &&
+
+	git checkout -b binary &&
+	perl -pe "y/x/\000/" <file1 >file3 &&
+	cat file3 >file4 &&
+	git add file2 &&
+	perl -pe "y/\000/v/" <file3 >file1 &&
+	rm -f file2 &&
+	git update-index --add --remove file1 file2 file3 file4 &&
+	git commit -m "Second Version" &&
+
+	git diff-tree -p main binary >B.diff &&
+	git diff-tree -p -C main binary >C.diff &&
+
+	git diff-tree -p --binary main binary >BF.diff &&
+	git diff-tree -p --binary -C main binary >CF.diff &&
+
+	git diff-tree -p --full-index main binary >B-index.diff &&
+	git diff-tree -p -C --full-index main binary >C-index.diff &&
+
+	git diff-tree -p --binary --no-prefix main binary -- file3 >B0.diff &&
+
+	git init other-repo &&
+	(
+		cd other-repo &&
+		git fetch .. main &&
+		git reset --hard FETCH_HEAD
+	)
+
+[main (root-commit) 8985c5f] Initial Version
+ Author: A U Thor <author@example.com>
+ 3 files changed, 15 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+ create mode 100644 file4
+Switched to a new branch 'binary'
+[binary 749e5f6] Second Version
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+ rename file2 => file3 (57%)
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4103-apply-binary/other-repo/.git/
+From ..
+ * branch            main       -> FETCH_HEAD
+HEAD is now at 8985c5f Initial Version
+ok 1 - setup
+
+expecting success of 4103.2 'stat binary diff -- should not fail.': git checkout main &&
+	 git apply --stat --summary B.diff
+Switched to branch 'main'
+ file1 |    4 ++--
+ file2 |    5 -----
+ file3 |  Bin
+ file4 |  Bin
+ 4 files changed, 2 insertions(+), 7 deletions(-)
+ delete mode 100644 file2
+ create mode 100644 file3
+ok 2 - stat binary diff -- should not fail.
+
+expecting success of 4103.3 'stat binary -p0 diff -- should not fail.': 
+	 git checkout main &&
+	 git apply --stat -p0 B0.diff
+
+Already on 'main'
+ file3 |  Bin
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 3 - stat binary -p0 diff -- should not fail.
+
+expecting success of 4103.4 'stat binary diff (copy) -- should not fail.': git checkout main &&
+	 git apply --stat --summary C.diff
+Already on 'main'
+ file1 |    4 ++--
+ file3 |  Bin
+ file4 |  Bin
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+ rename file2 => file3 (57%)
+ok 4 - stat binary diff (copy) -- should not fail.
+
+expecting success of 4103.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 '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 '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 '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 '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 '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 '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 '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 '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 '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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4109-apply-multifrag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4110-apply-scan.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4112-apply-renames.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4112-apply-renames/.git/
+expecting success of 4112.1 'check rename/copy patch': git apply --check patch
+ok 1 - check rename/copy patch
+
+expecting success of 4112.2 'apply rename/copy patch': git apply --index patch
+ok 2 - apply rename/copy patch
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4014-format-patch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4014-format-patch/.git/
 expecting success of 4014.1 'setup': 
@@ -259636,8 +260323,8 @@
 	! test_cmp fail actual2
 
 Switched to branch 'patchid'
---- fail	2026-03-04 07:58:40.079352315 +0000
-+++ actual1	2026-03-04 07:58:39.751352315 +0000
+--- fail	2025-01-30 02:11:33.056029074 +0000
++++ actual1	2025-01-30 02:11:32.712027011 +0000
 @@ -1,7 +1,7 @@
  
  base-commit: 18ed22aae56367787c36a882bd61281e07994f11
@@ -259648,8 +260335,8 @@
  -- 
  2.47.2
  
---- fail	2026-03-04 07:58:40.079352315 +0000
-+++ actual2	2026-03-04 07:58:39.799352315 +0000
+--- fail	2025-01-30 02:11:33.056029074 +0000
++++ actual2	2025-01-30 02:11:32.744027203 +0000
 @@ -1,7 +1,7 @@
  
  base-commit: 18ed22aae56367787c36a882bd61281e07994f11
@@ -260121,692 +260808,25 @@
 1..212
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4109-apply-multifrag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+*** t4113-apply-ending.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4113-apply-ending/.git/
+expecting success of 4113.1 'setup': git update-index --add file
+ok 1 - setup
 
-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 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
 
-patch1.patch:28: new blank line at EOF.
-+
-warning: 1 line adds whitespace errors.
-ok 3 - git apply (3)
+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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4067-diff-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/.git/
-expecting success of 4067.1 'git show batches blobs': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure that there is exactly 1 negotiation by checking that there is
-	# only 1 "done" line sent. ("done" marks the end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) 525c234] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-Cloning into bare repository 'client'...
-commit 525c234aab2853ed2b1af6e508caf4b08300c8c7
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    x
-
-diff --git a/a b/a
-new file mode 100644
-index 0000000..7898192
---- /dev/null
-+++ b/a
-@@ -0,0 +1 @@
-+a
-diff --git a/b b/b
-new file mode 100644
-index 0000000..6178079
---- /dev/null
-+++ b/b
-@@ -0,0 +1 @@
-+b
-ok 1 - git show batches blobs
-
-expecting success of 4067.2 'diff batches blobs': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	echo c >server/c &&
-	echo d >server/d &&
-	git -C server add c d &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure that there is exactly 1 negotiation by checking that there is
-	# only 1 "done" line sent. ("done" marks the end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) 525c234] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master f59c7b0] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 c
- create mode 100644 d
-Cloning into bare repository 'client'...
-diff --git a/c b/c
-new file mode 100644
-index 0000000..f2ad6c7
---- /dev/null
-+++ b/c
-@@ -0,0 +1 @@
-+c
-diff --git a/d b/d
-new file mode 100644
-index 0000000..4bcfe98
---- /dev/null
-+++ b/d
-@@ -0,0 +1 @@
-+d
-ok 2 - diff batches blobs
-
-expecting success of 4067.3 'diff skips same-OID blobs': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	echo another-a >server/a &&
-	git -C server add a &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	echo a | git hash-object --stdin >hash-old-a &&
-	echo another-a | git hash-object --stdin >hash-new-a &&
-	echo b | git hash-object --stdin >hash-b &&
-
-	# Ensure that only a and another-a are fetched.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
-	grep "want $(cat hash-old-a)" trace &&
-	grep "want $(cat hash-new-a)" trace &&
-	! grep "want $(cat hash-b)" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) 525c234] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 89f0cea] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'client'...
-diff --git a/a b/a
-index 7898192..594b61f 100644
---- a/a
-+++ b/a
-@@ -1 +1 @@
--a
-+another-a
-packet:        fetch> want 78981922613b2afb6025042ff6bd878ac1994e85
-packet:  upload-pack< want 78981922613b2afb6025042ff6bd878ac1994e85
-packet:        fetch> want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
-packet:  upload-pack< want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
-ok 3 - diff skips same-OID blobs
-
-expecting success of 4067.4 'when fetching missing objects, diff skips GITLINKs': 
-	test_when_finished "rm -rf sub server client trace" &&
-	test_config_global protocol.file.allow always &&
-
-	test_create_repo sub &&
-	test_commit -C sub first &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	git -C server add a &&
-	git -C server submodule add "file://$(pwd)/sub" &&
-	git -C server commit -m x &&
-
-	test_commit -C server/sub second &&
-	echo another-a >server/a &&
-	git -C server add a sub &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	echo a | git hash-object --stdin >hash-old-a &&
-	echo another-a | git hash-object --stdin >hash-new-a &&
-
-	# Ensure that a and another-a are fetched, and check (by successful
-	# execution of the diff) that no invalid OIDs are sent.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
-	grep "want $(cat hash-old-a)" trace &&
-	grep "want $(cat hash-new-a)" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/sub/.git/
-[master (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/sub'...
-[master (root-commit) 29ae88e] x
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 a
- create mode 160000 sub
-[master d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[master 3c2d722] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Cloning into bare repository 'client'...
-diff --git a/a b/a
-index 7898192..594b61f 100644
---- a/a
-+++ b/a
-@@ -1 +1 @@
--a
-+another-a
-diff --git a/sub b/sub
-index 50e526b..d662100 160000
---- a/sub
-+++ b/sub
-@@ -1 +1 @@
--Subproject commit 50e526bb426771f6036ad3a8b0c81d511d91fc2a
-+Subproject commit d66210046212a498d8c1a48eab414bc6df166f85
-packet:        fetch> want 78981922613b2afb6025042ff6bd878ac1994e85
-packet:  upload-pack< want 78981922613b2afb6025042ff6bd878ac1994e85
-packet:        fetch> want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
-packet:  upload-pack< want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
-ok 4 - when fetching missing objects, diff skips GITLINKs
-
-expecting success of 4067.5 'diff with rename detection batches blobs': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	printf "b\nb\nb\nb\nb\n" >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	rm server/b &&
-	printf "b\nb\nb\nb\nbX\n" >server/c &&
-	git -C server add c &&
-	git -C server commit -a -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure that there is exactly 1 negotiation by checking that there is
-	# only 1 "done" line sent. ("done" marks the end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD >out &&
-	grep ":100644 100644.*R[0-9][0-9][0-9].*b.*c" out &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) a6f879b] x
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 263bf49] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename b => c (72%)
-Cloning into bare repository 'client'...
-:100644 100644 33db23e f46cdb7 R072	b	c
-ok 5 - diff with rename detection batches blobs
-
-expecting success of 4067.6 'diff does not fetch anything if inexact rename detection is not needed': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	printf "b\nb\nb\nb\nb\n" >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	mv server/b server/c &&
-	git -C server add c &&
-	git -C server commit -a -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure no fetches.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
-	test_path_is_missing trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) a6f879b] x
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 2759f1d] x
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename b => c (100%)
-Cloning into bare repository 'client'...
-:100644 100644 33db23e 33db23e R100	b	c
-ok 6 - diff does not fetch anything if inexact rename detection is not needed
-
-expecting success of 4067.7 'diff --break-rewrites fetches only if necessary, and batches blobs if it does': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	printf "b\nb\nb\nb\nb\n" >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	printf "c\nc\nc\nc\nc\n" >server/b &&
-	git -C server commit -a -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure no fetches.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
-	test_path_is_missing trace &&
-
-	# But with --break-rewrites, ensure that there is exactly 1 negotiation
-	# by checking that there is only 1 "done" line sent. ("done" marks the
-	# end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --break-rewrites --raw -M HEAD^ HEAD &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) a6f879b] x
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 3aba490] x
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+), 5 deletions(-)
-Cloning into bare repository 'client'...
-:100644 100644 33db23e 6e7ada2 M	b
-:100644 100644 33db23e 6e7ada2 M	b
-ok 7 - diff --break-rewrites fetches only if necessary, and batches blobs if it does
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4103-apply-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4103-apply-binary/.git/
-expecting success of 4103.1 'setup': 
-	cat >file1 <<-\EOF &&
-	A quick brown fox jumps over the lazy dog.
-	A tiny little penguin runs around in circles.
-	There is a flag with Linux written on it.
-	A slow black-and-white panda just sits there,
-	munching on his bamboo.
-	EOF
-	cat file1 >file2 &&
-	cat file1 >file4 &&
-
-	git update-index --add --remove file1 file2 file4 &&
-	git commit -m "Initial Version" 2>/dev/null &&
-
-	git checkout -b binary &&
-	perl -pe "y/x/\000/" <file1 >file3 &&
-	cat file3 >file4 &&
-	git add file2 &&
-	perl -pe "y/\000/v/" <file3 >file1 &&
-	rm -f file2 &&
-	git update-index --add --remove file1 file2 file3 file4 &&
-	git commit -m "Second Version" &&
-
-	git diff-tree -p main binary >B.diff &&
-	git diff-tree -p -C main binary >C.diff &&
-
-	git diff-tree -p --binary main binary >BF.diff &&
-	git diff-tree -p --binary -C main binary >CF.diff &&
-
-	git diff-tree -p --full-index main binary >B-index.diff &&
-	git diff-tree -p -C --full-index main binary >C-index.diff &&
-
-	git diff-tree -p --binary --no-prefix main binary -- file3 >B0.diff &&
-
-	git init other-repo &&
-	(
-		cd other-repo &&
-		git fetch .. main &&
-		git reset --hard FETCH_HEAD
-	)
-
-[main (root-commit) 8985c5f] Initial Version
- Author: A U Thor <author@example.com>
- 3 files changed, 15 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
- create mode 100644 file4
-Switched to a new branch 'binary'
-[binary 749e5f6] Second Version
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+), 2 deletions(-)
- rename file2 => file3 (57%)
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4103-apply-binary/other-repo/.git/
-From ..
- * branch            main       -> FETCH_HEAD
-HEAD is now at 8985c5f Initial Version
-ok 1 - setup
-
-expecting success of 4103.2 'stat binary diff -- should not fail.': git checkout main &&
-	 git apply --stat --summary B.diff
-Switched to branch 'main'
- file1 |    4 ++--
- file2 |    5 -----
- file3 |  Bin
- file4 |  Bin
- 4 files changed, 2 insertions(+), 7 deletions(-)
- delete mode 100644 file2
- create mode 100644 file3
-ok 2 - stat binary diff -- should not fail.
-
-expecting success of 4103.3 'stat binary -p0 diff -- should not fail.': 
-	 git checkout main &&
-	 git apply --stat -p0 B0.diff
-
-Already on 'main'
- file3 |  Bin
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 3 - stat binary -p0 diff -- should not fail.
-
-expecting success of 4103.4 'stat binary diff (copy) -- should not fail.': git checkout main &&
-	 git apply --stat --summary C.diff
-Already on 'main'
- file1 |    4 ++--
- file3 |  Bin
- file4 |  Bin
- 3 files changed, 2 insertions(+), 2 deletions(-)
- rename file2 => file3 (57%)
-ok 4 - stat binary diff (copy) -- should not fail.
-
-expecting success of 4103.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 '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 '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 '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 '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 '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 '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 '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 '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 '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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4110-apply-scan.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4112-apply-renames.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4112-apply-renames/.git/
-expecting success of 4112.1 'check rename/copy patch': git apply --check patch
-ok 1 - check rename/copy patch
-
-expecting success of 4112.2 'apply rename/copy patch': git apply --index patch
-ok 2 - apply rename/copy patch
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4104-apply-boundary.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4104-apply-boundary/.git/
 expecting success of 4104.1 'setup': 
@@ -261058,129 +261078,6 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4113-apply-ending.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4116-apply-reverse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4116-apply-reverse/.git/
-expecting success of 4116.1 'setup': 
-
-	test_write_lines a b c d e f g h i j k l m n >file1 &&
-	perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
-
-	git add file1 file2 &&
-	git commit -m initial &&
-	git tag initial &&
-
-	test_write_lines a b c g h i J K L m o n p q >file1 &&
-	perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
-
-	git commit -a -m second &&
-	git tag second &&
-
-	git diff --binary initial second >patch
-
-
-[master (root-commit) 40ea0d8] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-[master 09f0b7a] second
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+), 6 deletions(-)
-ok 1 - setup
-
-expecting success of 4116.2 'apply in forward': 
-
-	T0=$(git rev-parse "second^{tree}") &&
-	git reset --hard initial &&
-	git apply --index --binary patch &&
-	T1=$(git write-tree) &&
-	test "$T0" = "$T1"
-
-HEAD is now at 40ea0d8 initial
-ok 2 - apply in forward
-
-expecting success of 4116.3 'apply in reverse': 
-
-	git reset --hard second &&
-	git apply --reverse --binary --index patch &&
-	git diff >diff &&
-	test_must_be_empty diff
-
-
-HEAD is now at 09f0b7a second
-ok 3 - apply in reverse
-
-expecting success of 4116.4 'setup separate repository lacking postimage': 
-
-	git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
-	(
-		cd initial && git init && git add .
-	) &&
-
-	git archive --format=tar --prefix=second/ second | $TAR xf - &&
-	(
-		cd second && git init && git add .
-	)
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4116-apply-reverse/initial/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4116-apply-reverse/second/.git/
-ok 4 - setup separate repository lacking postimage
-
-expecting success of 4116.5 'apply in forward without postimage': 
-
-	T0=$(git rev-parse "second^{tree}") &&
-	(
-		cd initial &&
-		git apply --index --binary ../patch &&
-		T1=$(git write-tree) &&
-		test "$T0" = "$T1"
-	)
-
-ok 5 - apply in forward without postimage
-
-expecting success of 4116.6 'apply in reverse without postimage': 
-
-	T0=$(git rev-parse "initial^{tree}") &&
-	(
-		cd second &&
-		git apply --index --binary --reverse ../patch &&
-		T1=$(git write-tree) &&
-		test "$T0" = "$T1"
-	)
-
-ok 6 - apply in reverse without postimage
-
-expecting success of 4116.7 'reversing a whitespace introduction': 
-	sed "s/a/a /" < file1 > file1.new &&
-	mv file1.new file1 &&
-	git diff | git apply --reverse --whitespace=error
-
-ok 7 - reversing a whitespace introduction
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4060-diff-submodule-option-diff-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4060-diff-submodule-option-diff-format/.git/
 expecting success of 4060.1 'setup repository': 
@@ -262150,52 +262047,108 @@
 1..50
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4118-apply-empty-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4118-apply-empty-context/.git/
-expecting success of 4118.1 'setup': 
-	test_write_lines "" "" A B C "" >file1 &&
-	cat file1 >file1.orig &&
-	{
-		cat file1 &&
-		echo Q | tr -d "\\012"
-	} >file2 &&
-	cat file2 >file2.orig &&
+*** t4116-apply-reverse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4116-apply-reverse/.git/
+expecting success of 4116.1 'setup': 
+
+	test_write_lines a b c d e f g h i j k l m n >file1 &&
+	perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
+
 	git add file1 file2 &&
-	sed -e "/^B/d" <file1.orig >file1 &&
-	cat file1 > file2 &&
-	echo Q | tr -d "\\012" >>file2 &&
-	cat file1 >file1.mods &&
-	cat file2 >file2.mods &&
-	git diff |
-	sed -e "s/^ \$//" >diff.output
+	git commit -m initial &&
+	git tag initial &&
+
+	test_write_lines a b c g h i J K L m o n p q >file1 &&
+	perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
+
+	git commit -a -m second &&
+	git tag second &&
+
+	git diff --binary initial second >patch
+
 
+[master (root-commit) 40ea0d8] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 14 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[master 09f0b7a] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 ok 1 - setup
 
-expecting success of 4118.2 'apply --numstat': 
+expecting success of 4116.2 'apply in forward': 
 
-	git apply --numstat diff.output >actual &&
-	{
-		echo "0	1	file1" &&
-		echo "0	1	file2"
-	} >expect &&
-	test_cmp expect actual
+	T0=$(git rev-parse "second^{tree}") &&
+	git reset --hard initial &&
+	git apply --index --binary patch &&
+	T1=$(git write-tree) &&
+	test "$T0" = "$T1"
 
+HEAD is now at 40ea0d8 initial
+ok 2 - apply in forward
 
-ok 2 - apply --numstat
+expecting success of 4116.3 'apply in reverse': 
 
-expecting success of 4118.3 'apply --apply': 
+	git reset --hard second &&
+	git apply --reverse --binary --index patch &&
+	git diff >diff &&
+	test_must_be_empty diff
 
-	cat file1.orig >file1 &&
-	cat file2.orig >file2 &&
-	git update-index file1 file2 &&
-	git apply --index diff.output &&
-	test_cmp file1.mods file1 &&
-	test_cmp file2.mods file2
 
-ok 3 - apply --apply
+HEAD is now at 09f0b7a second
+ok 3 - apply in reverse
 
-# passed all 3 test(s)
-1..3
+expecting success of 4116.4 'setup separate repository lacking postimage': 
+
+	git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
+	(
+		cd initial && git init && git add .
+	) &&
+
+	git archive --format=tar --prefix=second/ second | $TAR xf - &&
+	(
+		cd second && git init && git add .
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4116-apply-reverse/initial/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4116-apply-reverse/second/.git/
+ok 4 - setup separate repository lacking postimage
+
+expecting success of 4116.5 'apply in forward without postimage': 
+
+	T0=$(git rev-parse "second^{tree}") &&
+	(
+		cd initial &&
+		git apply --index --binary ../patch &&
+		T1=$(git write-tree) &&
+		test "$T0" = "$T1"
+	)
+
+ok 5 - apply in forward without postimage
+
+expecting success of 4116.6 'apply in reverse without postimage': 
+
+	T0=$(git rev-parse "initial^{tree}") &&
+	(
+		cd second &&
+		git apply --index --binary --reverse ../patch &&
+		T1=$(git write-tree) &&
+		test "$T0" = "$T1"
+	)
+
+ok 6 - apply in reverse without postimage
+
+expecting success of 4116.7 'reversing a whitespace introduction': 
+	sed "s/a/a /" < file1 > file1.new &&
+	mv file1.new file1 &&
+	git diff | git apply --reverse --whitespace=error
+
+ok 7 - reversing a whitespace introduction
+
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4117-apply-reject.sh ***
@@ -262391,197 +262344,52 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4115-apply-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4115-apply-symlink/.git/
-expecting success of 4115.1 'setup': 
-
-	test_ln_s_add path1/path2/path3/path4/path5 link1 &&
-	git commit -m initial &&
-
-	git branch side &&
-
-	rm -f link? &&
-
-	test_ln_s_add htap6 link1 &&
-	git commit -m second &&
-
-	git diff-tree -p HEAD^ HEAD >patch  &&
-	git apply --stat --summary patch
-
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+*** t4118-apply-empty-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4118-apply-empty-context/.git/
+expecting success of 4118.1 'setup': 
+	test_write_lines "" "" A B C "" >file1 &&
+	cat file1 >file1.orig &&
+	{
+		cat file1 &&
+		echo Q | tr -d "\\012"
+	} >file2 &&
+	cat file2 >file2.orig &&
+	git add file1 file2 &&
+	sed -e "/^B/d" <file1.orig >file1 &&
+	cat file1 > file2 &&
+	echo Q | tr -d "\\012" >>file2 &&
+	cat file1 >file1.mods &&
+	cat file2 >file2.mods &&
+	git diff |
+	sed -e "s/^ \$//" >diff.output
 
-)
-prerequisite SYMLINKS ok
-[master (root-commit) b8ef636] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 link1
-[master 3f5d5e0] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- link1 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 4115.2 'apply symlink patch': 
-
-	git checkout side &&
-	git apply patch &&
-	git diff-files -p >patched &&
-	test_cmp patch patched
-
-
-Switched to branch 'side'
-ok 2 - apply symlink patch
-
-expecting success of 4115.3 'apply --index symlink patch': 
-
-	git checkout -f side &&
-	git apply --index patch &&
-	git diff-index --cached -p HEAD >patched &&
-	test_cmp patch patched
-
-
-Already on 'side'
-ok 3 - apply --index symlink patch
-
-expecting success of 4115.4 'symlink setup': 
-	ln -s .git symlink &&
-	git add symlink &&
-	git commit -m "add symlink"
-
-[side 3bf7232] add symlink
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 120000 symlink
-ok 4 - symlink setup
-
-expecting success of 4115.5 'symlink escape when creating new files': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
-
-	cat >patch <<-EOF &&
-	diff --git a/symlink b/renamed-symlink
-	similarity index 100%
-	rename from symlink
-	rename to renamed-symlink
-	--
-	diff --git /dev/null b/renamed-symlink/create-me
-	new file mode 100644
-	index 0000000..039727e
-	--- /dev/null
-	+++ b/renamed-symlink/create-me
-	@@ -0,0 +1,1 @@
-	+busted
-	EOF
-
-	test_must_fail git apply patch 2>stderr &&
-	cat >expected_stderr <<-EOF &&
-	error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link
-	EOF
-	test_cmp expected_stderr stderr &&
-	test_path_is_missing .git/create-me
-
-HEAD is now at 3bf7232 add symlink
-Removing expected_stderr
-Removing patch
-Removing patched
-Removing renamed-symlink
-Removing stderr
-ok 5 - symlink escape when creating new files
-
-expecting success of 4115.6 'symlink escape when modifying file': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
-	touch .git/modify-me &&
-
-	cat >patch <<-EOF &&
-	diff --git a/symlink b/renamed-symlink
-	similarity index 100%
-	rename from symlink
-	rename to renamed-symlink
-	--
-	diff --git a/renamed-symlink/modify-me b/renamed-symlink/modify-me
-	index 1111111..2222222 100644
-	--- a/renamed-symlink/modify-me
-	+++ b/renamed-symlink/modify-me
-	@@ -0,0 +1,1 @@
-	+busted
-	EOF
-
-	test_must_fail git apply patch 2>stderr &&
-	cat >expected_stderr <<-EOF &&
-	error: renamed-symlink/modify-me: No such file or directory
-	EOF
-	test_cmp expected_stderr stderr &&
-	test_must_be_empty .git/modify-me
-
-HEAD is now at 3bf7232 add symlink
-Removing expected_stderr
-Removing patch
-Removing stderr
-ok 6 - symlink escape when modifying file
-
-expecting success of 4115.7 'symlink escape when deleting file': 
-	test_when_finished "git reset --hard && git clean -dfx && rm .git/delete-me" &&
-	touch .git/delete-me &&
-
-	cat >patch <<-EOF &&
-	diff --git a/symlink b/renamed-symlink
-	similarity index 100%
-	rename from symlink
-	rename to renamed-symlink
-	--
-	diff --git a/renamed-symlink/delete-me b/renamed-symlink/delete-me
-	deleted file mode 100644
-	index 1111111..0000000 100644
-	EOF
+expecting success of 4118.2 'apply --numstat': 
 
-	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
+	git apply --numstat diff.output >actual &&
+	{
+		echo "0	1	file1" &&
+		echo "0	1	file2"
+	} >expect &&
+	test_cmp expect actual
 
-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" &&
+ok 2 - apply --numstat
 
-	test_commit file &&
-	echo modified >file.t &&
-	git diff -- file.t >patch &&
-	echo modified-again >file.t &&
+expecting success of 4118.3 'apply --apply': 
 
-	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
+	cat file1.orig >file1 &&
+	cat file2.orig >file2 &&
+	git update-index file1 file2 &&
+	git apply --index diff.output &&
+	test_cmp file1.mods file1 &&
+	test_cmp file2.mods file2
 
-[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 3 - apply --apply
 
-# passed all 8 test(s)
-1..8
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4121-apply-diffs.sh ***
@@ -262608,113 +262416,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4120-apply-popt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4120-apply-popt/.git/
-expecting success of 4120.1 'setup': 
-	mkdir sub &&
-	echo A >sub/file1 &&
-	cp sub/file1 file1.saved &&
-	git add sub/file1 &&
-	echo B >sub/file1 &&
-	git diff >patch.file &&
-	git checkout -- sub/file1 &&
-	git mv sub süb &&
-	echo B >süb/file1 &&
-	git diff >patch.escaped &&
-	grep "[\]" patch.escaped &&
-	rm süb/file1 &&
-	rmdir süb
-
-diff --git "a/s\303\274b/file1" "b/s\303\274b/file1"
---- "a/s\303\274b/file1"
-+++ "b/s\303\274b/file1"
-ok 1 - setup
-
-expecting success of 4120.2 'apply git diff with -p2': 
-	cp file1.saved file1 &&
-	git apply -p2 patch.file
-
-ok 2 - apply git diff with -p2
-
-expecting success of 4120.3 'apply with too large -p': 
-	cp file1.saved file1 &&
-	test_must_fail git apply --stat -p3 patch.file 2>err &&
-	test_grep "removing 3 leading" err
-
-error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
-ok 3 - apply with too large -p
-
-expecting success of 4120.4 'apply (-p2) traditional diff with funny filenames': 
-	cat >patch.quotes <<-\EOF &&
-	diff -u "a/"sub/file1 "b/"sub/file1
-	--- "a/"sub/file1
-	+++ "b/"sub/file1
-	@@ -1 +1 @@
-	-A
-	+B
-	EOF
-	echo B >expected &&
-
-	cp file1.saved file1 &&
-	git apply -p2 patch.quotes &&
-	test_cmp expected file1
-
-ok 4 - apply (-p2) traditional diff with funny filenames
-
-expecting success of 4120.5 'apply with too large -p and fancy filename': 
-	cp file1.saved file1 &&
-	test_must_fail git apply --stat -p3 patch.escaped 2>err &&
-	test_grep "removing 3 leading" err
-
-error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
-ok 5 - apply with too large -p and fancy filename
-
-expecting success of 4120.6 'apply (-p2) diff, mode change only': 
-	cat >patch.chmod <<-\EOF &&
-	diff --git a/sub/file1 b/sub/file1
-	old mode 100644
-	new mode 100755
-	EOF
-	test_chmod -x file1 &&
-	git apply --index -p2 patch.chmod &&
-	case $(git ls-files -s file1) in 100755*) : good;; *) false;; esac
-
-ok 6 - apply (-p2) diff, mode change only
-
-checking prerequisite: FILEMODE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-	test "$(git config --bool core.filemode)" = true
-
-)
-prerequisite FILEMODE ok
-expecting success of 4120.7 'file mode was changed': 
-	test -x file1
-
-ok 7 - file mode was changed
-
-expecting success of 4120.8 'apply (-p2) diff, rename': 
-	cat >patch.rename <<-\EOF &&
-	diff --git a/sub/file1 b/sub/file2
-	similarity index 100%
-	rename from sub/file1
-	rename to sub/file2
-	EOF
-	echo A >expected &&
-
-	cp file1.saved file1 &&
-	rm -f file2 &&
-	git apply -p2 patch.rename &&
-	test_cmp expected file2
-
-ok 8 - apply (-p2) diff, rename
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4114-apply-typechange.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4114-apply-typechange/.git/
 expecting success of 4114.1 'setup repository and commits': 
@@ -262879,211 +262580,1285 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4013-diff-various.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4013-diff-various/.git/
-expecting success of 4013.1 'setup': 
+*** t4120-apply-popt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4120-apply-popt/.git/
+expecting success of 4120.1 'setup': 
+	mkdir sub &&
+	echo A >sub/file1 &&
+	cp sub/file1 file1.saved &&
+	git add sub/file1 &&
+	echo B >sub/file1 &&
+	git diff >patch.file &&
+	git checkout -- sub/file1 &&
+	git mv sub süb &&
+	echo B >süb/file1 &&
+	git diff >patch.escaped &&
+	grep "[\]" patch.escaped &&
+	rm süb/file1 &&
+	rmdir süb
 
-	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
-	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
-	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+diff --git "a/s\303\274b/file1" "b/s\303\274b/file1"
+--- "a/s\303\274b/file1"
++++ "b/s\303\274b/file1"
+ok 1 - setup
 
-	mkdir dir &&
-	mkdir dir2 &&
-	test_write_lines 1 2 3 >file0 &&
-	test_write_lines A B >dir/sub &&
-	cat file0 >file2 &&
-	git add file0 file2 dir/sub &&
-	git commit -m Initial &&
+expecting success of 4120.2 'apply git diff with -p2': 
+	cp file1.saved file1 &&
+	git apply -p2 patch.file
 
-	git branch initial &&
-	git branch side &&
+ok 2 - apply git diff with -p2
 
-	GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
-	GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
-	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+expecting success of 4120.3 'apply with too large -p': 
+	cp file1.saved file1 &&
+	test_must_fail git apply --stat -p3 patch.file 2>err &&
+	test_grep "removing 3 leading" err
 
-	test_write_lines 4 5 6 >>file0 &&
-	test_write_lines C D >>dir/sub &&
-	rm -f file2 &&
-	git update-index --remove file0 file2 dir/sub &&
-	git commit -m "Second${LF}${LF}This is the second commit." &&
+error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
+ok 3 - apply with too large -p
 
-	GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
-	GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
-	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+expecting success of 4120.4 'apply (-p2) traditional diff with funny filenames': 
+	cat >patch.quotes <<-\EOF &&
+	diff -u "a/"sub/file1 "b/"sub/file1
+	--- "a/"sub/file1
+	+++ "b/"sub/file1
+	@@ -1 +1 @@
+	-A
+	+B
+	EOF
+	echo B >expected &&
 
-	test_write_lines A B C >file1 &&
-	git add file1 &&
-	test_write_lines E F >>dir/sub &&
-	git update-index dir/sub &&
-	git commit -m Third &&
+	cp file1.saved file1 &&
+	git apply -p2 patch.quotes &&
+	test_cmp expected file1
 
-	GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
-	GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
-	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+ok 4 - apply (-p2) traditional diff with funny filenames
 
-	git checkout side &&
-	test_write_lines A B C >>file0 &&
-	test_write_lines 1 2 >>dir/sub &&
-	cat dir/sub >file3 &&
-	git add file3 &&
-	git update-index file0 dir/sub &&
-	git commit -m Side &&
+expecting success of 4120.5 'apply with too large -p and fancy filename': 
+	cp file1.saved file1 &&
+	test_must_fail git apply --stat -p3 patch.escaped 2>err &&
+	test_grep "removing 3 leading" err
 
-	GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
-	GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
-	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
+ok 5 - apply with too large -p and fancy filename
 
-	git checkout master &&
-	git pull -s ours --no-rebase . side &&
+expecting success of 4120.6 'apply (-p2) diff, mode change only': 
+	cat >patch.chmod <<-\EOF &&
+	diff --git a/sub/file1 b/sub/file1
+	old mode 100644
+	new mode 100755
+	EOF
+	test_chmod -x file1 &&
+	git apply --index -p2 patch.chmod &&
+	case $(git ls-files -s file1) in 100755*) : good;; *) false;; esac
 
-	GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
-	GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
-	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+ok 6 - apply (-p2) diff, mode change only
 
-	test_write_lines A B C >>file0 &&
-	test_write_lines 1 2 >>dir/sub &&
-	git update-index file0 dir/sub &&
+checking prerequisite: FILEMODE
 
-	mkdir dir3 &&
-	cp dir/sub dir3/sub &&
-	test-tool chmtime +1 dir3/sub &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+	test "$(git config --bool core.filemode)" = true
 
-	git config log.showroot false &&
-	git commit --amend &&
+)
+prerequisite FILEMODE ok
+expecting success of 4120.7 'file mode was changed': 
+	test -x file1
 
-	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
-	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
-	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
-	git checkout -b rearrange initial &&
-	test_write_lines B A >dir/sub &&
-	git add dir/sub &&
-	git commit -m "Rearranged lines in dir/sub" &&
-	git checkout master &&
+ok 7 - file mode was changed
 
-	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
-	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
-	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
-	git checkout -b mode initial &&
-	git update-index --chmod=+x file0 &&
-	git commit -m "update mode" &&
-	git checkout -f master &&
+expecting success of 4120.8 'apply (-p2) diff, rename': 
+	cat >patch.rename <<-\EOF &&
+	diff --git a/sub/file1 b/sub/file2
+	similarity index 100%
+	rename from sub/file1
+	rename to sub/file2
+	EOF
+	echo A >expected &&
 
-	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
-	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
-	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
-	git checkout -b note initial &&
-	git update-index --chmod=+x file2 &&
-	git commit -m "update mode (file2)" &&
-	git notes add -m "note" &&
-	git checkout -f master &&
+	cp file1.saved file1 &&
+	rm -f file2 &&
+	git apply -p2 patch.rename &&
+	test_cmp expected file2
 
-	# Same merge as master, but with parents reversed. Hide it in a
-	# pseudo-ref to avoid impacting tests with --all.
-	commit=$(echo reverse |
-		 git commit-tree -p master^2 -p master^1 master^{tree}) &&
-	git update-ref REVERSE $commit &&
+ok 8 - apply (-p2) diff, rename
 
-	git config diff.renames false &&
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4115-apply-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4115-apply-symlink/.git/
+expecting success of 4115.1 'setup': 
 
-	git show-branch
+	test_ln_s_add path1/path2/path3/path4/path5 link1 &&
+	git commit -m initial &&
 
-[master (root-commit) 444ac55] Initial
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 dir/sub
- create mode 100644 file0
- create mode 100644 file2
-[master 1bde4ae] Second
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+), 3 deletions(-)
- delete mode 100644 file2
-[master 9a6d494] Third
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 file1
-Switched to branch 'side'
-[side c7a2ab9] Side
- Author: A U Thor <author@example.com>
- 3 files changed, 9 insertions(+)
- create mode 100644 file3
-Switched to branch 'master'
-From .
- * branch            side       -> FETCH_HEAD
-Merge made by the 'ours' strategy.
-[master 59d314a] Merge branch 'side'
+	git branch side &&
+
+	rm -f link? &&
+
+	test_ln_s_add htap6 link1 &&
+	git commit -m second &&
+
+	git diff-tree -p HEAD^ HEAD >patch  &&
+	git apply --stat --summary patch
+
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master (root-commit) b8ef636] initial
  Author: A U Thor <author@example.com>
- Date: Mon Jun 26 00:04:00 2006 +0000
-Switched to a new branch 'rearrange'
-[rearrange cd4e72f] Rearranged lines in dir/sub
+ 1 file changed, 1 insertion(+)
+ create mode 120000 link1
+[master 3f5d5e0] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-Switched to a new branch 'mode'
-[mode b7e0bc6] update mode
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 file0
-Switched to branch 'master'
-Switched to a new branch 'note'
-[note a6f3643] update mode (file2)
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 file2
-Switched to branch 'master'
-! [initial] Initial
- * [master] Merge branch 'side'
-  ! [mode] update mode
-   ! [note] update mode (file2)
-    ! [rearrange] Rearranged lines in dir/sub
-     ! [side] Side
-------
-    +  [rearrange] Rearranged lines in dir/sub
-   +   [note] update mode (file2)
-  +    [mode] update mode
- -     [master] Merge branch 'side'
- *   + [side] Side
- *     [master^] Third
- *     [master~2] Second
-+*++++ [initial] Initial
+ link1 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 4013.2 'git diff-tree initial # magic is (not used)': 
-		{
-			echo "$ git $cmd"
-			case "$magic" in
-			"")
-				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
-			noellipses)
-				git $cmd ;;
-			esac |
-			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
-			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
-			echo "\$"
-		} >"$actual" &&
-		if test -f "$expect"
-		then
-			process_diffs "$actual" >actual &&
-			process_diffs "$expect" >expect &&
-			case $cmd in
-			*format-patch* | *-stat*)
-				test_cmp expect actual;;
-			*)
-				test_cmp expect actual;;
-			esac &&
-			rm -f "$actual" actual expect
-		else
-			# this is to help developing new tests.
-			cp "$actual" "$expect"
-			false
-		fi
-	
-ok 2 - git diff-tree initial # magic is (not used)
+expecting success of 4115.2 'apply symlink patch': 
 
-expecting success of 4013.3 'git diff-tree -r initial # magic is (not used)': 
-		{
-			echo "$ git $cmd"
-			case "$magic" in
+	git checkout side &&
+	git apply patch &&
+	git diff-files -p >patched &&
+	test_cmp patch patched
+
+
+Switched to branch 'side'
+ok 2 - apply symlink patch
+
+expecting success of 4115.3 'apply --index symlink patch': 
+
+	git checkout -f side &&
+	git apply --index patch &&
+	git diff-index --cached -p HEAD >patched &&
+	test_cmp patch patched
+
+
+Already on 'side'
+ok 3 - apply --index symlink patch
+
+expecting success of 4115.4 'symlink setup': 
+	ln -s .git symlink &&
+	git add symlink &&
+	git commit -m "add symlink"
+
+[side 3bf7232] add symlink
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 120000 symlink
+ok 4 - symlink setup
+
+expecting success of 4115.5 'symlink escape when creating new files': 
+	test_when_finished "git reset --hard && git clean -dfx" &&
+
+	cat >patch <<-EOF &&
+	diff --git a/symlink b/renamed-symlink
+	similarity index 100%
+	rename from symlink
+	rename to renamed-symlink
+	--
+	diff --git /dev/null b/renamed-symlink/create-me
+	new file mode 100644
+	index 0000000..039727e
+	--- /dev/null
+	+++ b/renamed-symlink/create-me
+	@@ -0,0 +1,1 @@
+	+busted
+	EOF
+
+	test_must_fail git apply patch 2>stderr &&
+	cat >expected_stderr <<-EOF &&
+	error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link
+	EOF
+	test_cmp expected_stderr stderr &&
+	test_path_is_missing .git/create-me
+
+HEAD is now at 3bf7232 add symlink
+Removing expected_stderr
+Removing patch
+Removing patched
+Removing renamed-symlink
+Removing stderr
+ok 5 - symlink escape when creating new files
+
+expecting success of 4115.6 'symlink escape when modifying file': 
+	test_when_finished "git reset --hard && git clean -dfx" &&
+	touch .git/modify-me &&
+
+	cat >patch <<-EOF &&
+	diff --git a/symlink b/renamed-symlink
+	similarity index 100%
+	rename from symlink
+	rename to renamed-symlink
+	--
+	diff --git a/renamed-symlink/modify-me b/renamed-symlink/modify-me
+	index 1111111..2222222 100644
+	--- a/renamed-symlink/modify-me
+	+++ b/renamed-symlink/modify-me
+	@@ -0,0 +1,1 @@
+	+busted
+	EOF
+
+	test_must_fail git apply patch 2>stderr &&
+	cat >expected_stderr <<-EOF &&
+	error: renamed-symlink/modify-me: No such file or directory
+	EOF
+	test_cmp expected_stderr stderr &&
+	test_must_be_empty .git/modify-me
+
+HEAD is now at 3bf7232 add symlink
+Removing expected_stderr
+Removing patch
+Removing stderr
+ok 6 - symlink escape when modifying file
+
+expecting success of 4115.7 'symlink escape when deleting file': 
+	test_when_finished "git reset --hard && git clean -dfx && rm .git/delete-me" &&
+	touch .git/delete-me &&
+
+	cat >patch <<-EOF &&
+	diff --git a/symlink b/renamed-symlink
+	similarity index 100%
+	rename from symlink
+	rename to renamed-symlink
+	--
+	diff --git a/renamed-symlink/delete-me b/renamed-symlink/delete-me
+	deleted file mode 100644
+	index 1111111..0000000 100644
+	EOF
+
+	test_must_fail git apply patch 2>stderr &&
+	cat >expected_stderr <<-EOF &&
+	error: renamed-symlink/delete-me: No such file or directory
+	EOF
+	test_cmp expected_stderr stderr &&
+	test_path_is_file .git/delete-me
+
+HEAD is now at 3bf7232 add symlink
+Removing expected_stderr
+Removing patch
+Removing stderr
+ok 7 - symlink escape when deleting file
+
+expecting success of 4115.8 '--reject removes .rej symlink if it exists': 
+	test_when_finished "git reset --hard && git clean -dfx" &&
+
+	test_commit file &&
+	echo modified >file.t &&
+	git diff -- file.t >patch &&
+	echo modified-again >file.t &&
+
+	ln -s foo file.t.rej &&
+	test_must_fail git apply patch --reject 2>err &&
+	test_grep "Rejected hunk" err &&
+	test_path_is_missing foo &&
+	test_path_is_file file.t.rej
+
+[side 3ecff08] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+Rejected hunk #1.
+HEAD is now at 3ecff08 file
+Removing err
+Removing file.t.rej
+Removing patch
+ok 8 - --reject removes .rej symlink if it exists
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4111-apply-subdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4111-apply-subdir/.git/
+expecting success of 4111.1 'setup': 
+	cat >patch <<-\EOF &&
+	diff file.orig file
+	--- a/file.orig
+	+++ b/file
+	@@ -1 +1,2 @@
+	 1
+	+2
+	EOF
+	patch="$(pwd)/patch" &&
+
+	echo 1 >preimage &&
+	printf "%s\n" 1 2 >postimage &&
+	echo 3 >other &&
+
+	test_tick &&
+	git commit --allow-empty -m basis
+
+[master (root-commit) 2fa880c] basis
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 4111.2 'setup: subdir': 
+	reset_subdir() {
+		git reset &&
+		mkdir -p sub/dir/b &&
+		mkdir -p objects &&
+		cp "$1" file &&
+		cp "$1" objects/file &&
+		cp "$1" sub/dir/file &&
+		cp "$1" sub/dir/b/file &&
+		git add file sub/dir/file sub/dir/b/file objects/file &&
+		cp "$2" file &&
+		cp "$2" sub/dir/file &&
+		cp "$2" sub/dir/b/file &&
+		cp "$2" objects/file &&
+		test_might_fail git update-index --refresh -q
+	}
+
+ok 2 - setup: subdir
+
+expecting success of 4111.3 'apply from subdir of toplevel': 
+	cp postimage expected &&
+	reset_subdir other preimage &&
+	(
+		cd sub/dir &&
+		git apply "$patch"
+	) &&
+	test_cmp expected sub/dir/file
+
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+ok 3 - apply from subdir of toplevel
+
+expecting success of 4111.4 'apply --cached from subdir of toplevel': 
+	cp postimage expected &&
+	cp other expected.working &&
+	reset_subdir preimage other &&
+	(
+		cd sub/dir &&
+		git apply --cached "$patch"
+	) &&
+	git show :sub/dir/file >actual &&
+	test_cmp expected actual &&
+	test_cmp expected.working sub/dir/file
+
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+ok 4 - apply --cached from subdir of toplevel
+
+expecting success of 4111.5 'apply --index from subdir of toplevel': 
+	cp postimage expected &&
+	reset_subdir preimage other &&
+	(
+		cd sub/dir &&
+		test_must_fail git apply --index "$patch"
+	) &&
+	reset_subdir other preimage &&
+	(
+		cd sub/dir &&
+		test_must_fail git apply --index "$patch"
+	) &&
+	reset_subdir preimage preimage &&
+	(
+		cd sub/dir &&
+		git apply --index "$patch"
+	) &&
+	git show :sub/dir/file >actual &&
+	test_cmp expected actual &&
+	test_cmp expected sub/dir/file
+
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+error: sub/dir/file: does not match index
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+error: sub/dir/file: does not match index
+ok 5 - apply --index from subdir of toplevel
+
+expecting success of 4111.6 'apply half-broken patch from subdir of toplevel': 
+	(
+		cd sub/dir &&
+		test_must_fail git apply <<-EOF
+		--- sub/dir/file
+		+++ sub/dir/file
+		@@ -1,0 +1,0 @@
+		--- file_in_root
+		+++ file_in_root
+		@@ -1,0 +1,0 @@
+		EOF
+	)
+
+error: corrupt patch at line 4
+ok 6 - apply half-broken patch from subdir of toplevel
+
+expecting success of 4111.7 'apply from .git dir': 
+	cp postimage expected &&
+	cp preimage .git/file &&
+	cp preimage .git/objects/file &&
+	(
+		cd .git &&
+		git apply "$patch"
+	) &&
+	test_cmp expected .git/file
+
+ok 7 - apply from .git dir
+
+expecting success of 4111.8 'apply from subdir of .git dir': 
+	cp postimage expected &&
+	cp preimage .git/file &&
+	cp preimage .git/objects/file &&
+	(
+		cd .git/objects &&
+		git apply "$patch"
+	) &&
+	test_cmp expected .git/objects/file
+
+ok 8 - apply from subdir of .git dir
+
+expecting success of 4111.9 'apply --cached from .git dir': 
+	cp postimage expected &&
+	cp other expected.working &&
+	cp other .git/file &&
+	reset_subdir preimage other &&
+	(
+		cd .git &&
+		git apply --cached "$patch"
+	) &&
+	git show :file >actual &&
+	test_cmp expected actual &&
+	test_cmp expected.working file &&
+	test_cmp expected.working .git/file
+
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+ok 9 - apply --cached from .git dir
+
+expecting success of 4111.10 'apply --cached from subdir of .git dir': 
+	cp postimage expected &&
+	cp preimage expected.subdir &&
+	cp other .git/file &&
+	cp other .git/objects/file &&
+	reset_subdir preimage other &&
+	(
+		cd .git/objects &&
+		git apply --cached "$patch"
+	) &&
+	git show :file >actual &&
+	git show :objects/file >actual.subdir &&
+	test_cmp expected actual &&
+	test_cmp expected.subdir actual.subdir
+
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+ok 10 - apply --cached from subdir of .git dir
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4119-apply-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4119-apply-config/.git/
+expecting success of 4119.1 'setup': 
+	mkdir sub &&
+	echo A >sub/file1 &&
+	cp sub/file1 saved &&
+	git add sub/file1 &&
+	echo "B " >sub/file1 &&
+	git diff >patch.file
+
+ok 1 - setup
+
+expecting success of 4119.2 'apply --whitespace=strip': 
+
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	git apply --whitespace=strip patch.file &&
+	check_result sub/file1
+
+patch.file:7: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 2 - apply --whitespace=strip
+
+expecting success of 4119.3 'apply --whitespace=strip from config': 
+
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	git config apply.whitespace strip &&
+	git apply patch.file &&
+	check_result sub/file1
+
+patch.file:7: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 3 - apply --whitespace=strip from config
+
+expecting success of 4119.4 'apply --whitespace=strip in subdir': 
+
+	cd "$D" &&
+	git config --unset-all apply.whitespace &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply --whitespace=strip ../patch.file &&
+	check_result file1
+
+sub/../patch.file:7: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 4 - apply --whitespace=strip in subdir
+
+expecting success of 4119.5 'apply --whitespace=strip from config in subdir': 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply ../patch.file &&
+	check_result file1
+
+sub/../patch.file:7: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 5 - apply --whitespace=strip from config in subdir
+
+expecting success of 4119.6 'same in subdir but with traditional patch input': 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply ../gpatch.file &&
+	check_result file1
+
+sub/../gpatch.file:5: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 6 - same in subdir but with traditional patch input
+
+expecting success of 4119.7 'same but with traditional patch input of depth 1': 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply ../gpatch-sub.file &&
+	check_result file1
+
+sub/../gpatch-sub.file:5: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 7 - same but with traditional patch input of depth 1
+
+expecting success of 4119.8 'same but with traditional patch input of depth 2': 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply ../gpatch-ab-sub.file &&
+	check_result file1
+
+sub/../gpatch-ab-sub.file:5: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 8 - same but with traditional patch input of depth 2
+
+expecting success of 4119.9 'same but with traditional patch input of depth 1': 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	git apply -p0 gpatch-sub.file &&
+	check_result sub/file1
+
+gpatch-sub.file:5: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 9 - same but with traditional patch input of depth 1
+
+expecting success of 4119.10 'same but with traditional patch input of depth 2': 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	git apply gpatch-ab-sub.file &&
+	check_result sub/file1
+
+gpatch-ab-sub.file:5: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 10 - same but with traditional patch input of depth 2
+
+expecting success of 4119.11 'in subdir with traditional patch input': 
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	cat >.gitattributes <<-EOF &&
+	/* whitespace=blank-at-eol
+	sub/* whitespace=-blank-at-eol
+	EOF
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply ../gpatch.file &&
+	echo "B " >expect &&
+	test_cmp expect file1
+
+ok 11 - in subdir with traditional patch input
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4123-apply-shrink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4125-apply-ws-fuzz.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4125-apply-ws-fuzz/.git/
+expecting success of 4125.1 'setup': 
+
+	>file &&
+	git add file &&
+
+	# file-0 is full of whitespace breakages
+	printf "%s \n" a bb c d eeee f ggg h >file-0 &&
+
+	# patch-0 creates a whitespace broken file
+	cat file-0 >file &&
+	git diff >patch-0 &&
+	git add file &&
+
+	# file-1 is still full of whitespace breakages,
+	# but has one line updated, without fixing any
+	# whitespaces.
+	# patch-1 records that change.
+	sed -e "s/d/D/" file-0 >file-1 &&
+	cat file-1 >file &&
+	git diff >patch-1 &&
+
+	# patch-all is the effect of both patch-0 and patch-1
+	>file &&
+	git add file &&
+	cat file-1 >file &&
+	git diff >patch-all &&
+
+	# patch-2 is the same as patch-1 but is based
+	# on a version that already has whitespace fixed,
+	# and does not introduce whitespace breakages.
+	sed -e "s/ \$//" patch-1 >patch-2 &&
+
+	# If all whitespace breakages are fixed the contents
+	# should look like file-fixed
+	sed -e "s/ \$//" file-1 >file-fixed
+
+
+ok 1 - setup
+
+expecting success of 4125.2 'nofix': 
+
+	>file &&
+	git add file &&
+
+	# Baseline.  Applying without fixing any whitespace
+	# breakages.
+	git apply --whitespace=nowarn patch-0 &&
+	git apply --whitespace=nowarn patch-1 &&
+
+	# The result should obviously match.
+	test_cmp file-1 file
+
+ok 2 - nofix
+
+expecting success of 4125.3 'withfix (forward)': 
+
+	>file &&
+	git add file &&
+
+	# The first application will munge the context lines
+	# the second patch depends on.  We should be able to
+	# adjust and still apply.
+	git apply --whitespace=fix patch-0 &&
+	git apply --whitespace=fix patch-1 &&
+
+	test_cmp file-fixed file
+
+patch-0:6: trailing whitespace.
+a 
+patch-0:7: trailing whitespace.
+bb 
+patch-0:8: trailing whitespace.
+c 
+patch-0:9: trailing whitespace.
+d 
+patch-0:10: trailing whitespace.
+eeee 
+warning: squelched 3 whitespace errors
+warning: 8 lines applied after fixing whitespace errors.
+patch-1:6: trailing whitespace.
+a 
+patch-1:7: trailing whitespace.
+bb 
+patch-1:8: trailing whitespace.
+c 
+patch-1:10: trailing whitespace.
+D 
+patch-1:11: trailing whitespace.
+eeee 
+warning: squelched 2 whitespace errors
+warning: 1 line applied after fixing whitespace errors.
+ok 3 - withfix (forward)
+
+expecting success of 4125.4 'withfix (backward)': 
+
+	>file &&
+	git add file &&
+
+	# Now we have a whitespace breakages on our side.
+	git apply --whitespace=nowarn patch-0 &&
+
+	# And somebody sends in a patch based on image
+	# with whitespace already fixed.
+	git apply --whitespace=fix patch-2 &&
+
+	# The result should accept the whitespace fixed
+	# postimage.  But the line with "h" is beyond context
+	# horizon and left unfixed.
+
+	sed -e /h/d file-fixed >fixed-head &&
+	sed -e /h/d file >file-head &&
+	test_cmp fixed-head file-head &&
+
+	sed -n -e /h/p file-fixed >fixed-tail &&
+	sed -n -e /h/p file >file-tail &&
+
+	! test_cmp fixed-tail file-tail
+
+
+--- fixed-tail	2025-01-30 02:11:41.040076954 +0000
++++ file-tail	2025-01-30 02:11:41.052077026 +0000
+@@ -1 +1 @@
+-h
++h 
+ok 4 - withfix (backward)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4122-apply-symlink-inside.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4013-diff-various.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4013-diff-various/.git/
+expecting success of 4013.1 'setup': 
+
+	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+
+	mkdir dir &&
+	mkdir dir2 &&
+	test_write_lines 1 2 3 >file0 &&
+	test_write_lines A B >dir/sub &&
+	cat file0 >file2 &&
+	git add file0 file2 dir/sub &&
+	git commit -m Initial &&
+
+	git branch initial &&
+	git branch side &&
+
+	GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+
+	test_write_lines 4 5 6 >>file0 &&
+	test_write_lines C D >>dir/sub &&
+	rm -f file2 &&
+	git update-index --remove file0 file2 dir/sub &&
+	git commit -m "Second${LF}${LF}This is the second commit." &&
+
+	GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+
+	test_write_lines A B C >file1 &&
+	git add file1 &&
+	test_write_lines E F >>dir/sub &&
+	git update-index dir/sub &&
+	git commit -m Third &&
+
+	GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+
+	git checkout side &&
+	test_write_lines A B C >>file0 &&
+	test_write_lines 1 2 >>dir/sub &&
+	cat dir/sub >file3 &&
+	git add file3 &&
+	git update-index file0 dir/sub &&
+	git commit -m Side &&
+
+	GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+
+	git checkout master &&
+	git pull -s ours --no-rebase . side &&
+
+	GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+
+	test_write_lines A B C >>file0 &&
+	test_write_lines 1 2 >>dir/sub &&
+	git update-index file0 dir/sub &&
+
+	mkdir dir3 &&
+	cp dir/sub dir3/sub &&
+	test-tool chmtime +1 dir3/sub &&
+
+	git config log.showroot false &&
+	git commit --amend &&
+
+	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+	git checkout -b rearrange initial &&
+	test_write_lines B A >dir/sub &&
+	git add dir/sub &&
+	git commit -m "Rearranged lines in dir/sub" &&
+	git checkout master &&
+
+	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+	git checkout -b mode initial &&
+	git update-index --chmod=+x file0 &&
+	git commit -m "update mode" &&
+	git checkout -f master &&
+
+	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+	git checkout -b note initial &&
+	git update-index --chmod=+x file2 &&
+	git commit -m "update mode (file2)" &&
+	git notes add -m "note" &&
+	git checkout -f master &&
+
+	# Same merge as master, but with parents reversed. Hide it in a
+	# pseudo-ref to avoid impacting tests with --all.
+	commit=$(echo reverse |
+		 git commit-tree -p master^2 -p master^1 master^{tree}) &&
+	git update-ref REVERSE $commit &&
+
+	git config diff.renames false &&
+
+	git show-branch
+
+[master (root-commit) 444ac55] Initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 100644 dir/sub
+ create mode 100644 file0
+ create mode 100644 file2
+[master 1bde4ae] Second
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+ delete mode 100644 file2
+[master 9a6d494] Third
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 file1
+Switched to branch 'side'
+[side c7a2ab9] Side
+ Author: A U Thor <author@example.com>
+ 3 files changed, 9 insertions(+)
+ create mode 100644 file3
+Switched to branch 'master'
+From .
+ * branch            side       -> FETCH_HEAD
+Merge made by the 'ours' strategy.
+[master 59d314a] Merge branch 'side'
+ Author: A U Thor <author@example.com>
+ Date: Mon Jun 26 00:04:00 2006 +0000
+Switched to a new branch 'rearrange'
+[rearrange cd4e72f] Rearranged lines in dir/sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+Switched to a new branch 'mode'
+[mode b7e0bc6] update mode
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 file0
+Switched to branch 'master'
+Switched to a new branch 'note'
+[note a6f3643] update mode (file2)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 file2
+Switched to branch 'master'
+! [initial] Initial
+ * [master] Merge branch 'side'
+  ! [mode] update mode
+   ! [note] update mode (file2)
+    ! [rearrange] Rearranged lines in dir/sub
+     ! [side] Side
+------
+    +  [rearrange] Rearranged lines in dir/sub
+   +   [note] update mode (file2)
+  +    [mode] update mode
+ -     [master] Merge branch 'side'
+ *   + [side] Side
+ *     [master^] Third
+ *     [master~2] Second
++*++++ [initial] Initial
+ok 1 - setup
+
+expecting success of 4013.2 'git diff-tree initial # magic is (not used)': 
+		{
+			echo "$ git $cmd"
+			case "$magic" in
+			"")
+				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
+			noellipses)
+				git $cmd ;;
+			esac |
+			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
+			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
+			echo "\$"
+		} >"$actual" &&
+		if test -f "$expect"
+		then
+			process_diffs "$actual" >actual &&
+			process_diffs "$expect" >expect &&
+			case $cmd in
+			*format-patch* | *-stat*)
+				test_cmp expect actual;;
+			*)
+				test_cmp expect actual;;
+			esac &&
+			rm -f "$actual" actual expect
+		else
+			# this is to help developing new tests.
+			cp "$actual" "$expect"
+			false
+		fi
+	
+ok 2 - git diff-tree initial # magic is (not used)
+
+expecting success of 4013.3 'git diff-tree -r initial # magic is (not used)': 
+		{
+			echo "$ git $cmd"
+			case "$magic" in
 			"")
 				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
 			noellipses)
@@ -269536,554 +270311,292 @@
 1..227
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4111-apply-subdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4111-apply-subdir/.git/
-expecting success of 4111.1 'setup': 
-	cat >patch <<-\EOF &&
-	diff file.orig file
-	--- a/file.orig
-	+++ b/file
-	@@ -1 +1,2 @@
-	 1
-	+2
-	EOF
-	patch="$(pwd)/patch" &&
+*** t4128-apply-root.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4128-apply-root/.git/
+expecting success of 4128.1 'setup': 
 
-	echo 1 >preimage &&
-	printf "%s\n" 1 2 >postimage &&
-	echo 3 >other &&
+	mkdir -p some/sub/dir &&
+	echo Hello > some/sub/dir/file &&
+	git add some/sub/dir/file &&
+	git commit -m initial &&
+	git tag initial
 
-	test_tick &&
-	git commit --allow-empty -m basis
 
-[master (root-commit) 2fa880c] basis
+[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 4111.2 'setup: subdir': 
-	reset_subdir() {
-		git reset &&
-		mkdir -p sub/dir/b &&
-		mkdir -p objects &&
-		cp "$1" file &&
-		cp "$1" objects/file &&
-		cp "$1" sub/dir/file &&
-		cp "$1" sub/dir/b/file &&
-		git add file sub/dir/file sub/dir/b/file objects/file &&
-		cp "$2" file &&
-		cp "$2" sub/dir/file &&
-		cp "$2" sub/dir/b/file &&
-		cp "$2" objects/file &&
-		test_might_fail git update-index --refresh -q
-	}
-
-ok 2 - setup: subdir
-
-expecting success of 4111.3 'apply from subdir of toplevel': 
-	cp postimage expected &&
-	reset_subdir other preimage &&
-	(
-		cd sub/dir &&
-		git apply "$patch"
-	) &&
-	test_cmp expected sub/dir/file
-
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-ok 3 - apply from subdir of toplevel
-
-expecting success of 4111.4 'apply --cached from subdir of toplevel': 
-	cp postimage expected &&
-	cp other expected.working &&
-	reset_subdir preimage other &&
-	(
-		cd sub/dir &&
-		git apply --cached "$patch"
-	) &&
-	git show :sub/dir/file >actual &&
-	test_cmp expected actual &&
-	test_cmp expected.working sub/dir/file
-
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-ok 4 - apply --cached from subdir of toplevel
-
-expecting success of 4111.5 'apply --index from subdir of toplevel': 
-	cp postimage expected &&
-	reset_subdir preimage other &&
-	(
-		cd sub/dir &&
-		test_must_fail git apply --index "$patch"
-	) &&
-	reset_subdir other preimage &&
-	(
-		cd sub/dir &&
-		test_must_fail git apply --index "$patch"
-	) &&
-	reset_subdir preimage preimage &&
-	(
-		cd sub/dir &&
-		git apply --index "$patch"
-	) &&
-	git show :sub/dir/file >actual &&
-	test_cmp expected actual &&
-	test_cmp expected sub/dir/file
-
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-error: sub/dir/file: does not match index
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-error: sub/dir/file: does not match index
-ok 5 - apply --index from subdir of toplevel
-
-expecting success of 4111.6 'apply half-broken patch from subdir of toplevel': 
-	(
-		cd sub/dir &&
-		test_must_fail git apply <<-EOF
-		--- sub/dir/file
-		+++ sub/dir/file
-		@@ -1,0 +1,0 @@
-		--- file_in_root
-		+++ file_in_root
-		@@ -1,0 +1,0 @@
-		EOF
-	)
-
-error: corrupt patch at line 4
-ok 6 - apply half-broken patch from subdir of toplevel
+expecting success of 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
 
-expecting success of 4111.7 'apply from .git dir': 
-	cp postimage expected &&
-	cp preimage .git/file &&
-	cp preimage .git/objects/file &&
-	(
-		cd .git &&
-		git apply "$patch"
-	) &&
-	test_cmp expected .git/file
 
-ok 7 - apply from .git dir
+ok 2 - apply --directory -p (1)
 
-expecting success of 4111.8 'apply from subdir of .git dir': 
-	cp postimage expected &&
-	cp preimage .git/file &&
-	cp preimage .git/objects/file &&
-	(
-		cd .git/objects &&
-		git apply "$patch"
-	) &&
-	test_cmp expected .git/objects/file
+expecting success of 4128.3 'apply --directory -p (2) ': 
 
-ok 8 - apply from subdir of .git dir
+	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
 
-expecting success of 4111.9 'apply --cached from .git dir': 
-	cp postimage expected &&
-	cp other expected.working &&
-	cp other .git/file &&
-	reset_subdir preimage other &&
-	(
-		cd .git &&
-		git apply --cached "$patch"
-	) &&
-	git show :file >actual &&
-	test_cmp expected actual &&
-	test_cmp expected.working file &&
-	test_cmp expected.working .git/file
 
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-ok 9 - apply --cached from .git dir
+HEAD is now at dcaa43e initial
+ok 3 - apply --directory -p (2) 
 
-expecting success of 4111.10 'apply --cached from subdir of .git dir': 
-	cp postimage expected &&
-	cp preimage expected.subdir &&
-	cp other .git/file &&
-	cp other .git/objects/file &&
-	reset_subdir preimage other &&
-	(
-		cd .git/objects &&
-		git apply --cached "$patch"
-	) &&
-	git show :file >actual &&
-	git show :objects/file >actual.subdir &&
-	test_cmp expected actual &&
-	test_cmp expected.subdir actual.subdir
+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
 
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-ok 10 - apply --cached from subdir of .git dir
+HEAD is now at dcaa43e initial
+ok 4 - apply --directory (new file)
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4123-apply-shrink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4123-apply-shrink/.git/
-expecting success of 4123.1 'setup': 
+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
 
-	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
+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
 
-ok 1 - setup
+HEAD is now at dcaa43e initial
+ok 6 - apply --directory (delete file)
 
-expecting success of 4123.2 'apply should fail gracefully': 
-	test_must_fail git apply --index patch &&
-	test_path_is_missing .git/index.lock
+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
 
-error: patch failed: F:14
-error: F: patch does not apply
-ok 2 - apply should fail gracefully
+HEAD is now at dcaa43e initial
+ok 7 - apply --directory (quoted filename)
 
-# passed all 2 test(s)
-1..2
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4119-apply-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4119-apply-config/.git/
-expecting success of 4119.1 'setup': 
-	mkdir sub &&
-	echo A >sub/file1 &&
-	cp sub/file1 saved &&
-	git add sub/file1 &&
-	echo "B " >sub/file1 &&
-	git diff >patch.file
+*** t4130-apply-criss-cross-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4130-apply-criss-cross-rename/.git/
+expecting success of 4130.1 'setup': 
+	# Ensure that file sizes are different, because on Windows
+	# lstat() does not discover inode numbers, and we need
+	# other properties to discover swapped files
+	# (mtime is not always different, either).
+	create_file file1 "some content" &&
+	create_file file2 "some other content" &&
+	create_file file3 "again something else" &&
+	git add file1 file2 file3 &&
+	git commit -m 1
 
+[master (root-commit) 5cfe986] 1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 303 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+ create mode 100644 file3
 ok 1 - setup
 
-expecting success of 4119.2 'apply --whitespace=strip': 
-
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	git apply --whitespace=strip patch.file &&
-	check_result sub/file1
-
-patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 2 - apply --whitespace=strip
-
-expecting success of 4119.3 'apply --whitespace=strip from config': 
-
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	git config apply.whitespace strip &&
-	git apply patch.file &&
-	check_result sub/file1
-
-patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 3 - apply --whitespace=strip from config
-
-expecting success of 4119.4 'apply --whitespace=strip in subdir': 
-
-	cd "$D" &&
-	git config --unset-all apply.whitespace &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	cd sub &&
-	git apply --whitespace=strip ../patch.file &&
-	check_result file1
-
-sub/../patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 4 - apply --whitespace=strip in subdir
-
-expecting success of 4119.5 'apply --whitespace=strip from config in subdir': 
-
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	cd sub &&
-	git apply ../patch.file &&
-	check_result file1
-
-sub/../patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 5 - apply --whitespace=strip from config in subdir
-
-expecting success of 4119.6 'same in subdir but with traditional patch input': 
-
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	cd sub &&
-	git apply ../gpatch.file &&
-	check_result file1
-
-sub/../gpatch.file:5: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 6 - same in subdir but with traditional patch input
-
-expecting success of 4119.7 'same but with traditional patch input of depth 1': 
-
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	cd sub &&
-	git apply ../gpatch-sub.file &&
-	check_result file1
-
-sub/../gpatch-sub.file:5: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 7 - same but with traditional patch input of depth 1
-
-expecting success of 4119.8 'same but with traditional patch input of depth 2': 
-
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	cd sub &&
-	git apply ../gpatch-ab-sub.file &&
-	check_result file1
+expecting success of 4130.2 'criss-cross rename': 
+	mv file1 tmp &&
+	mv file2 file1 &&
+	mv tmp file2 &&
+	cp file1 file1-swapped &&
+	cp file2 file2-swapped
 
-sub/../gpatch-ab-sub.file:5: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 8 - same but with traditional patch input of depth 2
+ok 2 - criss-cross rename
 
-expecting success of 4119.9 'same but with traditional patch input of depth 1': 
+expecting success of 4130.3 'diff -M -B': 
+	git diff -M -B > diff &&
+	git reset --hard
 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
 
-	git apply -p0 gpatch-sub.file &&
-	check_result sub/file1
+HEAD is now at 5cfe986 1
+ok 3 - diff -M -B
 
-gpatch-sub.file:5: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 9 - same but with traditional patch input of depth 1
+expecting success of 4130.4 'apply': 
+	git apply diff &&
+	test_cmp file1 file1-swapped &&
+	test_cmp file2 file2-swapped
 
-expecting success of 4119.10 'same but with traditional patch input of depth 2': 
+ok 4 - apply
 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+expecting success of 4130.5 'criss-cross rename': 
+	git reset --hard &&
+	mv file1 tmp &&
+	mv file2 file1 &&
+	mv file3 file2 &&
+	mv tmp file3 &&
+	cp file1 file1-swapped &&
+	cp file2 file2-swapped &&
+	cp file3 file3-swapped
 
-	git apply gpatch-ab-sub.file &&
-	check_result sub/file1
+HEAD is now at 5cfe986 1
+ok 5 - criss-cross rename
 
-gpatch-ab-sub.file:5: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 10 - same but with traditional patch input of depth 2
+expecting success of 4130.6 'diff -M -B': 
+	git diff -M -B > diff &&
+	git reset --hard
 
-expecting success of 4119.11 'in subdir with traditional patch input': 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	cat >.gitattributes <<-EOF &&
-	/* whitespace=blank-at-eol
-	sub/* whitespace=-blank-at-eol
-	EOF
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+HEAD is now at 5cfe986 1
+ok 6 - diff -M -B
 
-	cd sub &&
-	git apply ../gpatch.file &&
-	echo "B " >expect &&
-	test_cmp expect file1
+expecting success of 4130.7 'apply': 
+	git apply diff &&
+	test_cmp file1 file1-swapped &&
+	test_cmp file2 file2-swapped &&
+	test_cmp file3 file3-swapped
 
-ok 11 - in subdir with traditional patch input
+ok 7 - apply
 
-# passed all 11 test(s)
-1..11
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4125-apply-ws-fuzz.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4125-apply-ws-fuzz/.git/
-expecting success of 4125.1 'setup': 
-
-	>file &&
-	git add file &&
-
-	# file-0 is full of whitespace breakages
-	printf "%s \n" a bb c d eeee f ggg h >file-0 &&
-
-	# patch-0 creates a whitespace broken file
-	cat file-0 >file &&
-	git diff >patch-0 &&
-	git add file &&
-
-	# file-1 is still full of whitespace breakages,
-	# but has one line updated, without fixing any
-	# whitespaces.
-	# patch-1 records that change.
-	sed -e "s/d/D/" file-0 >file-1 &&
-	cat file-1 >file &&
-	git diff >patch-1 &&
-
-	# patch-all is the effect of both patch-0 and patch-1
-	>file &&
-	git add file &&
-	cat file-1 >file &&
-	git diff >patch-all &&
-
-	# patch-2 is the same as patch-1 but is based
-	# on a version that already has whitespace fixed,
-	# and does not introduce whitespace breakages.
-	sed -e "s/ \$//" patch-1 >patch-2 &&
-
-	# If all whitespace breakages are fixed the contents
-	# should look like file-fixed
-	sed -e "s/ \$//" file-1 >file-fixed
-
+*** t4126-apply-empty.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4126-apply-empty/.git/
+expecting success of 4126.1 'setup': 
+	>empty &&
+	git add empty &&
+	test_tick &&
+	git commit -m initial &&
+	git commit --allow-empty -m "empty commit" &&
+	git format-patch --always HEAD~ >empty.patch &&
+	test_write_lines a b c d e >empty &&
+	cat empty >expect &&
+	git diff |
+	sed -e "/^diff --git/d" \
+	    -e "/^index /d" \
+	    -e "s|a/empty|empty.orig|" \
+	    -e "s|b/empty|empty|" >patch0 &&
+	sed -e "s|empty|missing|" patch0 >patch1 &&
+	>empty &&
+	git update-index --refresh
 
+[master (root-commit) e3f79fd] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty
+[master 3401d02] empty commit
+ Author: A U Thor <author@example.com>
 ok 1 - setup
 
-expecting success of 4125.2 'nofix': 
+expecting success of 4126.2 'apply empty': 
+	rm -f missing &&
+	test_when_finished "git reset --hard" &&
+	git apply patch0 &&
+	test_cmp expect empty
 
-	>file &&
-	git add file &&
+HEAD is now at 3401d02 empty commit
+ok 2 - apply empty
 
-	# Baseline.  Applying without fixing any whitespace
-	# breakages.
-	git apply --whitespace=nowarn patch-0 &&
-	git apply --whitespace=nowarn patch-1 &&
+expecting success of 4126.3 'apply empty patch fails': 
+	test_when_finished "git reset --hard" &&
+	test_must_fail git apply empty.patch &&
+	test_must_fail git apply - </dev/null
 
-	# The result should obviously match.
-	test_cmp file-1 file
+error: No valid patches in input (allow with "--allow-empty")
+error: No valid patches in input (allow with "--allow-empty")
+HEAD is now at 3401d02 empty commit
+ok 3 - apply empty patch fails
 
-ok 2 - nofix
+expecting success of 4126.4 'apply with --allow-empty succeeds': 
+	test_when_finished "git reset --hard" &&
+	git apply --allow-empty empty.patch &&
+	git apply --allow-empty - </dev/null
 
-expecting success of 4125.3 'withfix (forward)': 
+HEAD is now at 3401d02 empty commit
+ok 4 - apply with --allow-empty succeeds
 
-	>file &&
-	git add file &&
+expecting success of 4126.5 'apply --index empty': 
+	rm -f missing &&
+	test_when_finished "git reset --hard" &&
+	git apply --index patch0 &&
+	test_cmp expect empty &&
+	git diff --exit-code
 
-	# The first application will munge the context lines
-	# the second patch depends on.  We should be able to
-	# adjust and still apply.
-	git apply --whitespace=fix patch-0 &&
-	git apply --whitespace=fix patch-1 &&
+HEAD is now at 3401d02 empty commit
+ok 5 - apply --index empty
 
-	test_cmp file-fixed file
+expecting success of 4126.6 'apply create': 
+	rm -f missing &&
+	test_when_finished "git reset --hard" &&
+	git apply patch1 &&
+	test_cmp expect missing
 
-patch-0:6: trailing whitespace.
-a 
-patch-0:7: trailing whitespace.
-bb 
-patch-0:8: trailing whitespace.
-c 
-patch-0:9: trailing whitespace.
-d 
-patch-0:10: trailing whitespace.
-eeee 
-warning: squelched 3 whitespace errors
-warning: 8 lines applied after fixing whitespace errors.
-patch-1:6: trailing whitespace.
-a 
-patch-1:7: trailing whitespace.
-bb 
-patch-1:8: trailing whitespace.
-c 
-patch-1:10: trailing whitespace.
-D 
-patch-1:11: trailing whitespace.
-eeee 
-warning: squelched 2 whitespace errors
-warning: 1 line applied after fixing whitespace errors.
-ok 3 - withfix (forward)
+HEAD is now at 3401d02 empty commit
+ok 6 - apply create
 
-expecting success of 4125.4 'withfix (backward)': 
+expecting success of 4126.7 'apply --index create': 
+	rm -f missing &&
+	test_when_finished "git reset --hard" &&
+	git apply --index patch1 &&
+	test_cmp expect missing &&
+	git diff --exit-code
 
-	>file &&
-	git add file &&
+HEAD is now at 3401d02 empty commit
+ok 7 - apply --index create
 
-	# Now we have a whitespace breakages on our side.
-	git apply --whitespace=nowarn patch-0 &&
+expecting success of 4126.8 'apply with no-contents and a funny pathname': 
+	test_when_finished "rm -fr \"funny \"; git reset --hard" &&
 
-	# And somebody sends in a patch based on image
-	# with whitespace already fixed.
-	git apply --whitespace=fix patch-2 &&
+	mkdir "funny " &&
+	>"funny /empty" &&
+	git add "funny /empty" &&
+	git diff HEAD -- "funny /" >sample.patch &&
+	git diff -R HEAD -- "funny /" >elpmas.patch &&
 
-	# The result should accept the whitespace fixed
-	# postimage.  But the line with "h" is beyond context
-	# horizon and left unfixed.
+	git reset --hard &&
 
-	sed -e /h/d file-fixed >fixed-head &&
-	sed -e /h/d file >file-head &&
-	test_cmp fixed-head file-head &&
+	git apply --stat --check --apply sample.patch &&
+	test_must_be_empty "funny /empty" &&
 
-	sed -n -e /h/p file-fixed >fixed-tail &&
-	sed -n -e /h/p file >file-tail &&
+	git apply --stat --check --apply elpmas.patch &&
+	test_path_is_missing "funny /empty" &&
 
-	! test_cmp fixed-tail file-tail
+	git apply -R --stat --check --apply elpmas.patch &&
+	test_must_be_empty "funny /empty" &&
 
+	git apply -R --stat --check --apply sample.patch &&
+	test_path_is_missing "funny /empty"
 
---- fixed-tail	2026-03-04 07:58:48.267352315 +0000
-+++ file-tail	2026-03-04 07:58:48.283352315 +0000
-@@ -1 +1 @@
--h
-+h 
-ok 4 - withfix (backward)
+HEAD is now at 3401d02 empty commit
+ funny /empty |    0 
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ funny /empty |    0 
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ funny /empty |    0 
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ funny /empty |    0 
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+HEAD is now at 3401d02 empty commit
+ok 8 - apply with no-contents and a funny pathname
 
-# passed all 4 test(s)
-1..4
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4108-apply-threeway.sh ***
@@ -270606,459 +271119,87 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4122-apply-symlink-inside.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t4131-apply-fake-ancestor.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4131-apply-fake-ancestor/.git/
+expecting success of 4131.1 'setup': 
+	test_commit 1 &&
+	test_commit 2 &&
+	mkdir sub &&
+	test_commit 3 sub/3.t &&
+	test_commit 4
 
-)
-prerequisite SYMLINKS ok
-[main (root-commit) f9acfaa] initial
+[master (root-commit) d0dcf97] 1
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 82335b2] 2
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master 0015c90] 3
  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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4133-apply-filenames.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4133-apply-filenames/.git/
-expecting success of 4133.1 'setup': 
-	cat > bad1.patch <<EOF &&
-diff --git a/f b/f
-new file mode 100644
-index 0000000..d00491f
---- /dev/null
-+++ b/f-blah
-@@ -0,0 +1 @@
-+1
-EOF
-	cat > bad2.patch <<EOF
-diff --git a/f b/f
-deleted file mode 100644
-index d00491f..0000000
---- b/f-blah
-+++ /dev/null
-@@ -1 +0,0 @@
--1
-EOF
-
-ok 1 - setup
-
-expecting success of 4133.2 'apply diff with inconsistent filenames in headers': 
-	test_must_fail git apply bad1.patch 2>err &&
-	test_grep "inconsistent new filename" err &&
-	test_must_fail git apply bad2.patch 2>err &&
-	test_grep "inconsistent old filename" err
-
-error: git apply: bad git-diff - inconsistent new filename on line 2
-error: git apply: bad git-diff - inconsistent old filename on line 2
-ok 2 - apply diff with inconsistent filenames in headers
-
-expecting success of 4133.3 'apply diff with new filename missing from headers': 
-	cat >missing_new_filename.diff <<-\EOF &&
-	diff --git a/f b/f
-	index 0000000..d00491f
-	--- a/f
-	@@ -0,0 +1 @@
-	+1
-	EOF
-	test_must_fail git apply missing_new_filename.diff 2>err &&
-	test_grep "lacks filename information" err
-
-error: git diff header lacks filename information (line 4)
-ok 3 - apply diff with new filename missing from headers
-
-expecting success of 4133.4 'apply diff with old filename missing from headers': 
-	cat >missing_old_filename.diff <<-\EOF &&
-	diff --git a/f b/f
-	index d00491f..0000000
-	+++ b/f
-	@@ -1 +0,0 @@
-	-1
-	EOF
-	test_must_fail git apply missing_old_filename.diff 2>err &&
-	test_grep "lacks filename information" err
-
-error: git diff header lacks filename information (line 4)
-ok 4 - apply diff with old filename missing from headers
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4128-apply-root.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/3.t
+[master 8d74a78] 4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 some/sub/dir/file
+ create mode 100644 4.t
 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4130-apply-criss-cross-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4130-apply-criss-cross-rename/.git/
-expecting success of 4130.1 'setup': 
-	# Ensure that file sizes are different, because on Windows
-	# lstat() does not discover inode numbers, and we need
-	# other properties to discover swapped files
-	# (mtime is not always different, either).
-	create_file file1 "some content" &&
-	create_file file2 "some other content" &&
-	create_file file3 "again something else" &&
-	git add file1 file2 file3 &&
-	git commit -m 1
+expecting success of 4131.2 'apply --build-fake-ancestor': 
+	git checkout 2 &&
+	echo "A" > 1.t &&
+	git diff > 1.patch &&
+	git reset --hard &&
+	git checkout 1 &&
+	git apply --build-fake-ancestor 1.ancestor 1.patch
 
-[master (root-commit) 5cfe986] 1
- Author: A U Thor <author@example.com>
- 3 files changed, 303 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
- create mode 100644 file3
-ok 1 - setup
+Note: switching to '2'.
 
-expecting success of 4130.2 'criss-cross rename': 
-	mv file1 tmp &&
-	mv file2 file1 &&
-	mv tmp file2 &&
-	cp file1 file1-swapped &&
-	cp file2 file2-swapped
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 2 - criss-cross rename
+If you want to 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 4130.3 'diff -M -B': 
-	git diff -M -B > diff &&
-	git reset --hard
+  git switch -c <new-branch-name>
 
+Or undo this operation with:
 
-HEAD is now at 5cfe986 1
-ok 3 - diff -M -B
+  git switch -
 
-expecting success of 4130.4 'apply': 
-	git apply diff &&
-	test_cmp file1 file1-swapped &&
-	test_cmp file2 file2-swapped
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 4 - apply
+HEAD is now at 82335b2 2
+HEAD is now at 82335b2 2
+Previous HEAD position was 82335b2 2
+HEAD is now at d0dcf97 1
+ok 2 - apply --build-fake-ancestor
 
-expecting success of 4130.5 'criss-cross rename': 
+expecting success of 4131.3 'apply --build-fake-ancestor in a subdirectory': 
+	git checkout 3 &&
+	echo "C" > sub/3.t &&
+	git diff > 3.patch &&
 	git reset --hard &&
-	mv file1 tmp &&
-	mv file2 file1 &&
-	mv file3 file2 &&
-	mv tmp file3 &&
-	cp file1 file1-swapped &&
-	cp file2 file2-swapped &&
-	cp file3 file3-swapped
-
-HEAD is now at 5cfe986 1
-ok 5 - criss-cross rename
-
-expecting success of 4130.6 'diff -M -B': 
-	git diff -M -B > diff &&
-	git reset --hard
-
-HEAD is now at 5cfe986 1
-ok 6 - diff -M -B
-
-expecting success of 4130.7 'apply': 
-	git apply diff &&
-	test_cmp file1 file1-swapped &&
-	test_cmp file2 file2-swapped &&
-	test_cmp file3 file3-swapped
+	git checkout 4 &&
+	(
+		cd sub &&
+		git apply --build-fake-ancestor 3.ancestor ../3.patch &&
+		test -f 3.ancestor
+	) &&
+	git apply --build-fake-ancestor 3.ancestor 3.patch &&
+	test_cmp sub/3.ancestor 3.ancestor
 
-ok 7 - apply
+Previous HEAD position was d0dcf97 1
+HEAD is now at 0015c90 3
+HEAD is now at 0015c90 3
+Previous HEAD position was 0015c90 3
+HEAD is now at 8d74a78 4
+ok 3 - apply --build-fake-ancestor in a subdirectory
 
-# passed all 7 test(s)
-1..7
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4127-apply-same-fn.sh ***
@@ -271178,210 +271319,182 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4131-apply-fake-ancestor.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4131-apply-fake-ancestor/.git/
-expecting success of 4131.1 'setup': 
-	test_commit 1 &&
-	test_commit 2 &&
-	mkdir sub &&
-	test_commit 3 sub/3.t &&
-	test_commit 4
+*** t4134-apply-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 82335b2] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master 0015c90] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/3.t
-[master 8d74a78] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
 ok 1 - setup
 
-expecting success of 4131.2 'apply --build-fake-ancestor': 
-	git checkout 2 &&
-	echo "A" > 1.t &&
-	git diff > 1.patch &&
-	git reset --hard &&
-	git checkout 1 &&
-	git apply --build-fake-ancestor 1.ancestor 1.patch
-
-Note: switching to '2'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 2 - removing a submodule also removes all leading subdirectories
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4133-apply-filenames.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4133-apply-filenames/.git/
+expecting success of 4133.1 'setup': 
+	cat > bad1.patch <<EOF &&
+diff --git a/f b/f
+new file mode 100644
+index 0000000..d00491f
+--- /dev/null
++++ b/f-blah
+@@ -0,0 +1 @@
++1
+EOF
+	cat > bad2.patch <<EOF
+diff --git a/f b/f
+deleted file mode 100644
+index d00491f..0000000
+--- b/f-blah
++++ /dev/null
+@@ -1 +0,0 @@
+-1
+EOF
 
-  git switch -c <new-branch-name>
+ok 1 - setup
 
-Or undo this operation with:
+expecting success of 4133.2 'apply diff with inconsistent filenames in headers': 
+	test_must_fail git apply bad1.patch 2>err &&
+	test_grep "inconsistent new filename" err &&
+	test_must_fail git apply bad2.patch 2>err &&
+	test_grep "inconsistent old filename" err
 
-  git switch -
+error: git apply: bad git-diff - inconsistent new filename on line 2
+error: git apply: bad git-diff - inconsistent old filename on line 2
+ok 2 - apply diff with inconsistent filenames in headers
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 4133.3 'apply diff with new filename missing from headers': 
+	cat >missing_new_filename.diff <<-\EOF &&
+	diff --git a/f b/f
+	index 0000000..d00491f
+	--- a/f
+	@@ -0,0 +1 @@
+	+1
+	EOF
+	test_must_fail git apply missing_new_filename.diff 2>err &&
+	test_grep "lacks filename information" err
 
-HEAD is now at 82335b2 2
-HEAD is now at 82335b2 2
-Previous HEAD position was 82335b2 2
-HEAD is now at d0dcf97 1
-ok 2 - apply --build-fake-ancestor
+error: git diff header lacks filename information (line 4)
+ok 3 - apply diff with new filename missing from headers
 
-expecting success of 4131.3 'apply --build-fake-ancestor in a subdirectory': 
-	git checkout 3 &&
-	echo "C" > sub/3.t &&
-	git diff > 3.patch &&
-	git reset --hard &&
-	git checkout 4 &&
-	(
-		cd sub &&
-		git apply --build-fake-ancestor 3.ancestor ../3.patch &&
-		test -f 3.ancestor
-	) &&
-	git apply --build-fake-ancestor 3.ancestor 3.patch &&
-	test_cmp sub/3.ancestor 3.ancestor
+expecting success of 4133.4 'apply diff with old filename missing from headers': 
+	cat >missing_old_filename.diff <<-\EOF &&
+	diff --git a/f b/f
+	index d00491f..0000000
+	+++ b/f
+	@@ -1 +0,0 @@
+	-1
+	EOF
+	test_must_fail git apply missing_old_filename.diff 2>err &&
+	test_grep "lacks filename information" err
 
-Previous HEAD position was d0dcf97 1
-HEAD is now at 0015c90 3
-HEAD is now at 0015c90 3
-Previous HEAD position was 0015c90 3
-HEAD is now at 8d74a78 4
-ok 3 - apply --build-fake-ancestor in a subdirectory
+error: git diff header lacks filename information (line 4)
+ok 4 - apply diff with old filename missing from headers
 
-# passed all 3 test(s)
-1..3
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4126-apply-empty.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4126-apply-empty/.git/
-expecting success of 4126.1 'setup': 
-	>empty &&
-	git add empty &&
-	test_tick &&
-	git commit -m initial &&
-	git commit --allow-empty -m "empty commit" &&
-	git format-patch --always HEAD~ >empty.patch &&
-	test_write_lines a b c d e >empty &&
-	cat empty >expect &&
-	git diff |
-	sed -e "/^diff --git/d" \
-	    -e "/^index /d" \
-	    -e "s|a/empty|empty.orig|" \
-	    -e "s|b/empty|empty|" >patch0 &&
-	sed -e "s|empty|missing|" patch0 >patch1 &&
-	>empty &&
-	git update-index --refresh
+*** t4136-apply-check.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4136-apply-check/.git/
+expecting success of 4136.1 'setup': 
+	test_commit 1
 
-[master (root-commit) e3f79fd] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty
-[master 3401d02] empty commit
+[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 4126.2 'apply empty': 
-	rm -f missing &&
-	test_when_finished "git reset --hard" &&
-	git apply patch0 &&
-	test_cmp expect empty
-
-HEAD is now at 3401d02 empty commit
-ok 2 - apply empty
-
-expecting success of 4126.3 'apply empty patch fails': 
-	test_when_finished "git reset --hard" &&
-	test_must_fail git apply empty.patch &&
-	test_must_fail git apply - </dev/null
+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")
-error: No valid patches in input (allow with "--allow-empty")
-HEAD is now at 3401d02 empty commit
-ok 3 - apply empty patch fails
-
-expecting success of 4126.4 'apply with --allow-empty succeeds': 
-	test_when_finished "git reset --hard" &&
-	git apply --allow-empty empty.patch &&
-	git apply --allow-empty - </dev/null
-
-HEAD is now at 3401d02 empty commit
-ok 4 - apply with --allow-empty succeeds
-
-expecting success of 4126.5 'apply --index empty': 
-	rm -f missing &&
-	test_when_finished "git reset --hard" &&
-	git apply --index patch0 &&
-	test_cmp expect empty &&
-	git diff --exit-code
-
-HEAD is now at 3401d02 empty commit
-ok 5 - apply --index empty
-
-expecting success of 4126.6 'apply create': 
-	rm -f missing &&
-	test_when_finished "git reset --hard" &&
-	git apply patch1 &&
-	test_cmp expect missing
-
-HEAD is now at 3401d02 empty commit
-ok 6 - apply create
-
-expecting success of 4126.7 'apply --index create': 
-	rm -f missing &&
-	test_when_finished "git reset --hard" &&
-	git apply --index patch1 &&
-	test_cmp expect missing &&
-	git diff --exit-code
-
-HEAD is now at 3401d02 empty commit
-ok 7 - apply --index create
+ok 2 - apply --check exits non-zero with unrecognized input
 
-expecting success of 4126.8 'apply with no-contents and a funny pathname': 
-	test_when_finished "rm -fr \"funny \"; git reset --hard" &&
+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
 
-	mkdir "funny " &&
-	>"funny /empty" &&
-	git add "funny /empty" &&
-	git diff HEAD -- "funny /" >sample.patch &&
-	git diff -R HEAD -- "funny /" >elpmas.patch &&
+error: corrupt patch at line 7
+error: corrupt patch at line 7
+ok 3 - apply exits non-zero with no-op patch
 
-	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
 
-	git apply --stat --check --apply sample.patch &&
-	test_must_be_empty "funny /empty" &&
+ok 4 - `apply --recount` allows no-op patch
 
-	git apply --stat --check --apply elpmas.patch &&
-	test_path_is_missing "funny /empty" &&
+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
 
-	git apply -R --stat --check --apply elpmas.patch &&
-	test_must_be_empty "funny /empty" &&
+error: inconsistent header lines 2 and 3
+ok 5 - invalid combination: create and copy
 
-	git apply -R --stat --check --apply sample.patch &&
-	test_path_is_missing "funny /empty"
+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 3401d02 empty commit
- funny /empty |    0 
- 1 file changed, 0 insertions(+), 0 deletions(-)
- funny /empty |    0 
- 1 file changed, 0 insertions(+), 0 deletions(-)
- funny /empty |    0 
- 1 file changed, 0 insertions(+), 0 deletions(-)
- funny /empty |    0 
- 1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at 3401d02 empty commit
-ok 8 - apply with no-contents and a funny pathname
+error: inconsistent header lines 2 and 3
+ok 6 - invalid combination: create and rename
 
-# passed all 8 test(s)
-1..8
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4132-apply-removal.sh ***
@@ -271947,314 +272060,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4134-apply-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4136-apply-check.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4136-apply-check/.git/
-expecting success of 4136.1 'setup': 
-	test_commit 1
-
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-ok 1 - setup
-
-expecting success of 4136.2 'apply --check exits non-zero with unrecognized input': 
-	test_must_fail git apply --check - <<-\EOF
-	I am not a patch
-	I look nothing like a patch
-	git apply must fail
-	EOF
-
-error: No valid patches in input (allow with "--allow-empty")
-ok 2 - apply --check exits non-zero with unrecognized input
-
-expecting success of 4136.3 'apply exits non-zero with no-op patch': 
-	cat >input <<-\EOF &&
-	diff --get a/1 b/1
-	index 6696ea4..606eddd 100644
-	--- a/1
-	+++ b/1
-	@@ -1,1 +1,1 @@
-	 1
-	EOF
-	test_must_fail git apply --stat input &&
-	test_must_fail git apply --check input
-
-error: corrupt patch at line 7
-error: corrupt patch at line 7
-ok 3 - apply exits non-zero with no-op patch
-
-expecting success of 4136.4 '`apply --recount` allows no-op patch': 
-	echo 1 >1 &&
-	git apply --recount --check <<-\EOF
-	diff --get a/1 b/1
-	index 6696ea4..606eddd 100644
-	--- a/1
-	+++ b/1
-	@@ -1,1 +1,1 @@
-	 1
-	EOF
-
-ok 4 - `apply --recount` allows no-op patch
-
-expecting success of 4136.5 'invalid combination: create and copy': 
-	test_must_fail git apply --check - <<-\EOF
-	diff --git a/1 b/2
-	new file mode 100644
-	copy from 1
-	copy to 2
-	EOF
-
-error: inconsistent header lines 2 and 3
-ok 5 - invalid combination: create and copy
-
-expecting success of 4136.6 'invalid combination: create and rename': 
-	test_must_fail git apply --check - <<-\EOF
-	diff --git a/1 b/2
-	new file mode 100644
-	rename from 1
-	rename to 2
-	EOF
-
-error: inconsistent header lines 2 and 3
-ok 6 - invalid combination: create and rename
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4138-apply-ws-expansion.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4138-apply-ws-expansion/.git/
-expecting success of 4138.1 'setup': 
-	#
-	## create test-N, patchN.patch, expect-N files
-	#
-
-	# test 1
-	printf "\t%s\n" 1 2 3 4 5 6 >before &&
-	printf "\t%s\n" 1 2 3 >after &&
-	printf "%64s\n" a b c >>after &&
-	printf "\t%s\n" 4 5 6 >>after &&
-	test_expect_code 1 git diff --no-index before after >patch1.patch.raw &&
-	sed -e "s/before/test-1/" -e "s/after/test-1/" patch1.patch.raw >patch1.patch &&
-	printf "%64s\n" 1 2 3 4 5 6 >test-1 &&
-	printf "%64s\n" 1 2 3 a b c 4 5 6 >expect-1 &&
-
-	# test 2
-	printf "\t%s\n" a b c d e f >before &&
-	printf "\t%s\n" a b c >after &&
-	n=10 &&
-	x=1 &&
-	while test $x -lt $n
-	do
-		printf "%63s%d\n" "" $x >>after &&
-		x=$(( $x + 1 )) || return 1
-	done &&
-	printf "\t%s\n" d e f >>after &&
-	test_expect_code 1 git diff --no-index before after >patch2.patch.raw &&
-	sed -e "s/before/test-2/" -e "s/after/test-2/" patch2.patch.raw >patch2.patch &&
-	printf "%64s\n" a b c d e f >test-2 &&
-	printf "%64s\n" a b c >expect-2 &&
-	x=1 &&
-	while test $x -lt $n
-	do
-		printf "%63s%d\n" "" $x >>expect-2 &&
-		x=$(( $x + 1 )) || return 1
-	done &&
-	printf "%64s\n" d e f >>expect-2 &&
-
-	# test 3
-	printf "\t%s\n" a b c d e f >before &&
-	printf "\t%s\n" a b c >after &&
-	n=100 &&
-	x=0 &&
-	while test $x -lt $n
-	do
-		printf "%63s%02d\n" "" $x >>after &&
-		x=$(( $x + 1 )) || return 1
-	done &&
-	printf "\t%s\n" d e f >>after &&
-	test_expect_code 1 git diff --no-index before after >patch3.patch.raw &&
-	sed -e "s/before/test-3/" -e "s/after/test-3/" patch3.patch.raw >patch3.patch &&
-	printf "%64s\n" a b c d e f >test-3 &&
-	printf "%64s\n" a b c >expect-3 &&
-	x=0 &&
-	while test $x -lt $n
-	do
-		printf "%63s%02d\n" "" $x >>expect-3 &&
-		x=$(( $x + 1 )) || return 1
-	done &&
-	printf "%64s\n" d e f >>expect-3 &&
-
-	# test 4
-	>before &&
-	x=0 &&
-	while test $x -lt 50
-	do
-		printf "\t%02d\n" $x >>before &&
-		x=$(( $x + 1 )) || return 1
-	done &&
-	cat before >after &&
-	printf "%64s\n" a b c >>after &&
-	while test $x -lt 100
-	do
-		printf "\t%02d\n" $x >>before &&
-		printf "\t%02d\n" $x >>after &&
-		x=$(( $x + 1 )) || return 1
-	done &&
-	test_expect_code 1 git diff --no-index before after >patch4.patch.raw &&
-	sed -e "s/before/test-4/" -e "s/after/test-4/" patch4.patch.raw >patch4.patch &&
-	>test-4 &&
-	x=0 &&
-	while test $x -lt 50
-	do
-		printf "%63s%02d\n" "" $x >>test-4 &&
-		x=$(( $x + 1 )) || return 1
-	done &&
-	cat test-4 >expect-4 &&
-	printf "%64s\n" a b c >>expect-4 &&
-	while test $x -lt 100
-	do
-		printf "%63s%02d\n" "" $x >>test-4 &&
-		printf "%63s%02d\n" "" $x >>expect-4 &&
-		x=$(( $x + 1 )) || return 1
-	done &&
-
-	git config core.whitespace tab-in-indent,tabwidth=63 &&
-	git config apply.whitespace fix
-
-
-ok 1 - setup
-
-expecting success of 4138.2 'apply with ws expansion (t=$t)': 
-		git apply patch$t.patch &&
-		test_cmp expect-$t test-$t
-	
-patch1.patch:6: tab in indent.
-	1
-patch1.patch:7: tab in indent.
-	2
-patch1.patch:8: tab in indent.
-	3
-patch1.patch:12: tab in indent.
-	4
-patch1.patch:13: tab in indent.
-	5
-warning: squelched 1 whitespace error
-warning: 6 lines add whitespace errors.
-ok 2 - apply with ws expansion (t=$t)
-
-expecting success of 4138.3 'apply with ws expansion (t=$t)': 
-		git apply patch$t.patch &&
-		test_cmp expect-$t test-$t
-	
-patch2.patch:6: tab in indent.
-	a
-patch2.patch:7: tab in indent.
-	b
-patch2.patch:8: tab in indent.
-	c
-patch2.patch:18: tab in indent.
-	d
-patch2.patch:19: tab in indent.
-	e
-warning: squelched 1 whitespace error
-warning: 6 lines add whitespace errors.
-ok 3 - apply with ws expansion (t=$t)
-
-expecting success of 4138.4 'apply with ws expansion (t=$t)': 
-		git apply patch$t.patch &&
-		test_cmp expect-$t test-$t
-	
-patch3.patch:6: tab in indent.
-	a
-patch3.patch:7: tab in indent.
-	b
-patch3.patch:8: tab in indent.
-	c
-patch3.patch:109: tab in indent.
-	d
-patch3.patch:110: tab in indent.
-	e
-warning: squelched 1 whitespace error
-warning: 6 lines add whitespace errors.
-ok 4 - apply with ws expansion (t=$t)
-
-expecting success of 4138.5 'apply with ws expansion (t=$t)': 
-		git apply patch$t.patch &&
-		test_cmp expect-$t test-$t
-	
-patch4.patch:6: tab in indent.
-	47
-patch4.patch:7: tab in indent.
-	48
-patch4.patch:8: tab in indent.
-	49
-patch4.patch:12: tab in indent.
-	50
-patch4.patch:13: tab in indent.
-	51
-warning: squelched 1 whitespace error
-warning: 6 lines add whitespace errors.
-ok 5 - apply with ws expansion (t=$t)
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4141-apply-too-large.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4141-apply-too-large/.git/
-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 1 # skip git apply rejects patches that are too large (missing EXPENSIVE)
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4129-apply-samemode.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4129-apply-samemode/.git/
 expecting success of 4129.1 'setup': 
@@ -272455,7 +272260,7 @@
 	test_grep "^-rw-rw-rw" worktree
 
 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	non-canon
--rw-rw-rw- 1 pbuilder1 pbuilder1 0 Mar  4 07:58 non-canon
+-rw-rw-rw- 1 pbuilder2 pbuilder2 0 Jan 30 02:11 non-canon
 HEAD is now at 7ddccb0 Add script
 ok 12 - patch mode for new file is canonicalized
 
@@ -272503,7 +272308,7 @@
 	test_grep "^-rwxrwxrwx" worktree
 
 100755 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	non-canon
--rwxrwxrwx 1 pbuilder1 pbuilder1 8 Mar  4 07:58 non-canon
+-rwxrwxrwx 1 pbuilder2 pbuilder2 8 Jan 30 02:11 non-canon
 HEAD is now at 7ddccb0 Add script
 ok 14 - patch mode for mode change is canonicalized
 
@@ -272511,6 +272316,202 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4138-apply-ws-expansion.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4138-apply-ws-expansion/.git/
+expecting success of 4138.1 'setup': 
+	#
+	## create test-N, patchN.patch, expect-N files
+	#
+
+	# test 1
+	printf "\t%s\n" 1 2 3 4 5 6 >before &&
+	printf "\t%s\n" 1 2 3 >after &&
+	printf "%64s\n" a b c >>after &&
+	printf "\t%s\n" 4 5 6 >>after &&
+	test_expect_code 1 git diff --no-index before after >patch1.patch.raw &&
+	sed -e "s/before/test-1/" -e "s/after/test-1/" patch1.patch.raw >patch1.patch &&
+	printf "%64s\n" 1 2 3 4 5 6 >test-1 &&
+	printf "%64s\n" 1 2 3 a b c 4 5 6 >expect-1 &&
+
+	# test 2
+	printf "\t%s\n" a b c d e f >before &&
+	printf "\t%s\n" a b c >after &&
+	n=10 &&
+	x=1 &&
+	while test $x -lt $n
+	do
+		printf "%63s%d\n" "" $x >>after &&
+		x=$(( $x + 1 )) || return 1
+	done &&
+	printf "\t%s\n" d e f >>after &&
+	test_expect_code 1 git diff --no-index before after >patch2.patch.raw &&
+	sed -e "s/before/test-2/" -e "s/after/test-2/" patch2.patch.raw >patch2.patch &&
+	printf "%64s\n" a b c d e f >test-2 &&
+	printf "%64s\n" a b c >expect-2 &&
+	x=1 &&
+	while test $x -lt $n
+	do
+		printf "%63s%d\n" "" $x >>expect-2 &&
+		x=$(( $x + 1 )) || return 1
+	done &&
+	printf "%64s\n" d e f >>expect-2 &&
+
+	# test 3
+	printf "\t%s\n" a b c d e f >before &&
+	printf "\t%s\n" a b c >after &&
+	n=100 &&
+	x=0 &&
+	while test $x -lt $n
+	do
+		printf "%63s%02d\n" "" $x >>after &&
+		x=$(( $x + 1 )) || return 1
+	done &&
+	printf "\t%s\n" d e f >>after &&
+	test_expect_code 1 git diff --no-index before after >patch3.patch.raw &&
+	sed -e "s/before/test-3/" -e "s/after/test-3/" patch3.patch.raw >patch3.patch &&
+	printf "%64s\n" a b c d e f >test-3 &&
+	printf "%64s\n" a b c >expect-3 &&
+	x=0 &&
+	while test $x -lt $n
+	do
+		printf "%63s%02d\n" "" $x >>expect-3 &&
+		x=$(( $x + 1 )) || return 1
+	done &&
+	printf "%64s\n" d e f >>expect-3 &&
+
+	# test 4
+	>before &&
+	x=0 &&
+	while test $x -lt 50
+	do
+		printf "\t%02d\n" $x >>before &&
+		x=$(( $x + 1 )) || return 1
+	done &&
+	cat before >after &&
+	printf "%64s\n" a b c >>after &&
+	while test $x -lt 100
+	do
+		printf "\t%02d\n" $x >>before &&
+		printf "\t%02d\n" $x >>after &&
+		x=$(( $x + 1 )) || return 1
+	done &&
+	test_expect_code 1 git diff --no-index before after >patch4.patch.raw &&
+	sed -e "s/before/test-4/" -e "s/after/test-4/" patch4.patch.raw >patch4.patch &&
+	>test-4 &&
+	x=0 &&
+	while test $x -lt 50
+	do
+		printf "%63s%02d\n" "" $x >>test-4 &&
+		x=$(( $x + 1 )) || return 1
+	done &&
+	cat test-4 >expect-4 &&
+	printf "%64s\n" a b c >>expect-4 &&
+	while test $x -lt 100
+	do
+		printf "%63s%02d\n" "" $x >>test-4 &&
+		printf "%63s%02d\n" "" $x >>expect-4 &&
+		x=$(( $x + 1 )) || return 1
+	done &&
+
+	git config core.whitespace tab-in-indent,tabwidth=63 &&
+	git config apply.whitespace fix
+
+
+ok 1 - setup
+
+expecting success of 4138.2 'apply with ws expansion (t=$t)': 
+		git apply patch$t.patch &&
+		test_cmp expect-$t test-$t
+	
+patch1.patch:6: tab in indent.
+	1
+patch1.patch:7: tab in indent.
+	2
+patch1.patch:8: tab in indent.
+	3
+patch1.patch:12: tab in indent.
+	4
+patch1.patch:13: tab in indent.
+	5
+warning: squelched 1 whitespace error
+warning: 6 lines add whitespace errors.
+ok 2 - apply with ws expansion (t=$t)
+
+expecting success of 4138.3 'apply with ws expansion (t=$t)': 
+		git apply patch$t.patch &&
+		test_cmp expect-$t test-$t
+	
+patch2.patch:6: tab in indent.
+	a
+patch2.patch:7: tab in indent.
+	b
+patch2.patch:8: tab in indent.
+	c
+patch2.patch:18: tab in indent.
+	d
+patch2.patch:19: tab in indent.
+	e
+warning: squelched 1 whitespace error
+warning: 6 lines add whitespace errors.
+ok 3 - apply with ws expansion (t=$t)
+
+expecting success of 4138.4 'apply with ws expansion (t=$t)': 
+		git apply patch$t.patch &&
+		test_cmp expect-$t test-$t
+	
+patch3.patch:6: tab in indent.
+	a
+patch3.patch:7: tab in indent.
+	b
+patch3.patch:8: tab in indent.
+	c
+patch3.patch:109: tab in indent.
+	d
+patch3.patch:110: tab in indent.
+	e
+warning: squelched 1 whitespace error
+warning: 6 lines add whitespace errors.
+ok 4 - apply with ws expansion (t=$t)
+
+expecting success of 4138.5 'apply with ws expansion (t=$t)': 
+		git apply patch$t.patch &&
+		test_cmp expect-$t test-$t
+	
+patch4.patch:6: tab in indent.
+	47
+patch4.patch:7: tab in indent.
+	48
+patch4.patch:8: tab in indent.
+	49
+patch4.patch:12: tab in indent.
+	50
+patch4.patch:13: tab in indent.
+	51
+warning: squelched 1 whitespace error
+warning: 6 lines add whitespace errors.
+ok 5 - apply with ws expansion (t=$t)
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4141-apply-too-large.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4141-apply-too-large/.git/
+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 1 # skip git apply rejects patches that are too large (missing EXPENSIVE)
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4140-apply-ita.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4140-apply-ita/.git/
 expecting success of 4140.1 'setup': 
@@ -273415,6 +273416,491 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4201-shortlog.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4201-shortlog/.git/
+expecting success of 4201.1 'setup': 
+	test_tick &&
+	echo 1 >a1 &&
+	git add a1 &&
+	tree=$(git write-tree) &&
+	commit=$(printf "%s\n" "Test" "" | git commit-tree "$tree") &&
+	git update-ref HEAD "$commit" &&
+
+	echo 2 >a1 &&
+	git commit --quiet -m "This is a very, very long first line for the commit message to see if it is wrapped correctly" a1 &&
+
+	# test if the wrapping is still valid
+	# when replacing all is by treble clefs.
+	echo 3 >a1 &&
+	git commit --quiet -m "$(
+		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
+		sed "s/i/1234/g" |
+		tr 1234 "\360\235\204\236")" a1 &&
+
+	# now fsck up the utf8
+	git config i18n.commitencoding non-utf-8 &&
+	echo 4 >a1 &&
+	git commit --quiet -m "$(
+		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
+		sed "s/i/1234/g" |
+		tr 1234 "\370\235\204\236")" a1 &&
+
+	echo 5 >a1 &&
+	git commit --quiet -m "a								12	34	56	78" a1 &&
+
+	echo 6 >a1 &&
+	git commit --quiet -m "Commit by someone else" \
+		--author="Someone else <not!me>" a1 &&
+
+	cat >expect.template <<-\EOF
+	A U Thor (5):
+	      SUBJECT
+	      SUBJECT
+	      SUBJECT
+	      SUBJECT
+	      SUBJECT
+
+	Someone else (1):
+	      SUBJECT
+
+	EOF
+
+ok 1 - setup
+
+expecting success of 4201.2 'default output format': 
+	git shortlog HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect.template log.predictable
+
+ok 2 - default output format
+
+expecting success of 4201.3 'pretty format': 
+	sed s/SUBJECT/OBJECT_NAME/ expect.template >expect &&
+	git shortlog --format="%H" HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 3 - pretty format
+
+expecting success of 4201.4 'pretty format (with --date)': 
+	sed "s/SUBJECT/2005-04-07 OBJECT_NAME/" expect.template >expect &&
+	git shortlog --format="%ad %H" --date=short HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 4 - pretty format (with --date)
+
+expecting success of 4201.5 '--abbrev': 
+	sed s/SUBJECT/OBJID/ expect.template >expect &&
+	git shortlog --format="%h" --abbrev=35 HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 5 - --abbrev
+
+expecting success of 4201.6 'output from user-defined format is re-wrapped': 
+	sed "s/SUBJECT/two lines/" expect.template >expect &&
+	git shortlog --format="two%nlines" HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 6 - output from user-defined format is re-wrapped
+
+expecting success of 4201.7 'shortlog wrapping': 
+	cat >expect <<\EOF &&
+A U Thor (5):
+      Test
+      This is a very, very long first line for the commit message to see if
+         it is wrapped correctly
+      Th�s �s a very, very long f�rst l�ne for the comm�t message to see �f
+         �t �s wrapped correctly
+      Thø�„žs ø�„žs a very, very long fø�„žrst lø�„žne for the commø�„žt
+         message to see ø�„žf ø�„žt ø�„žs wrapped correctly
+      a								12	34
+         56	78
+
+Someone else (1):
+      Commit by someone else
+
+EOF
+	git shortlog -w HEAD >out &&
+	test_cmp expect out
+
+ok 7 - shortlog wrapping
+
+expecting success of 4201.8 'shortlog from non-git directory': 
+	git log --no-expand-tabs HEAD >log &&
+	GIT_DIR=non-existing git shortlog -w <log >out &&
+	test_cmp expect out
+
+ok 8 - shortlog from non-git directory
+
+expecting success of 4201.9 'shortlog can read --format=raw output': 
+	git log --format=raw HEAD >log &&
+	GIT_DIR=non-existing git shortlog -w <log >out &&
+	test_cmp expect out
+
+ok 9 - shortlog can read --format=raw output
+
+expecting success of 4201.10 'shortlog from non-git directory refuses extra arguments': 
+	test_must_fail env GIT_DIR=non-existing git shortlog foo 2>out &&
+	test_grep "too many arguments" out
+
+error: too many arguments given outside repository
+ok 10 - shortlog from non-git directory refuses extra arguments
+
+expecting success of 4201.11 'shortlog should add newline when input line matches wraplen': 
+	cat >expect <<\EOF &&
+A U Thor (2):
+      bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
+      aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
+
+EOF
+	git shortlog -w >out <<\EOF &&
+commit 0000000000000000000000000000000000000001
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
+
+commit 0000000000000000000000000000000000000002
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
+
+EOF
+	test_cmp expect out
+
+ok 11 - shortlog should add newline when input line matches wraplen
+
+expecting success of 4201.12 'shortlog encoding': 
+	git reset --hard "$commit" &&
+	git config --unset i18n.commitencoding &&
+	echo 2 > a1 &&
+	git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 &&
+	git config i18n.commitencoding "ISO8859-1" &&
+	echo 3 > a1 &&
+	git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \
+		--author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 &&
+	git config --unset i18n.commitencoding &&
+	git shortlog HEAD~2.. > out &&
+test_cmp expect out
+HEAD is now at aa97132 Test
+ok 12 - shortlog encoding
+
+expecting success of 4201.13 'shortlog with revision pseudo options': 
+	git shortlog --all &&
+	git shortlog --branches &&
+	git shortlog --exclude=refs/heads/m* --all
+
+A U Thor (1):
+      Test
+
+Jöhännës "Dschö" Schindëlin (2):
+      set a1 to 2 and some non-ASCII chars: Äßø
+      set a1 to 3 and some non-ASCII chars: áæï
+
+A U Thor (1):
+      Test
+
+Jöhännës "Dschö" Schindëlin (2):
+      set a1 to 2 and some non-ASCII chars: Äßø
+      set a1 to 3 and some non-ASCII chars: áæï
+
+A U Thor (1):
+      Test
+
+Jöhännës "Dschö" Schindëlin (2):
+      set a1 to 2 and some non-ASCII chars: Äßø
+      set a1 to 3 and some non-ASCII chars: áæï
+
+ok 13 - shortlog with revision pseudo options
+
+expecting success of 4201.14 'shortlog with --output=<file>': 
+	git shortlog --output=shortlog -1 main >output &&
+	test_must_be_empty output &&
+	test_line_count = 3 shortlog
+
+ok 14 - shortlog with --output=<file>
+
+expecting success of 4201.15 'shortlog --committer (internal)': 
+	git checkout --orphan side &&
+	git commit --allow-empty -m one &&
+	git commit --allow-empty -m two &&
+	GIT_COMMITTER_NAME="Sin Nombre" git commit --allow-empty -m three &&
+
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	Sin Nombre
+	EOF
+	git shortlog -nsc HEAD >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'side'
+[side (root-commit) 9ed1028] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a1
+[side 4046e48] two
+ Author: A U Thor <author@example.com>
+[side 1c4141a] three
+ Author: A U Thor <author@example.com>
+ok 15 - shortlog --committer (internal)
+
+expecting success of 4201.16 'shortlog --committer (external)': 
+	git log --format=full | git shortlog -nsc >actual &&
+	test_cmp expect actual
+
+ok 16 - shortlog --committer (external)
+
+expecting success of 4201.17 '--group=committer is the same as --committer': 
+	git shortlog -ns --group=committer HEAD >actual &&
+	test_cmp expect actual
+
+ok 17 - --group=committer is the same as --committer
+
+expecting success of 4201.18 'shortlog --group=trailer:signed-off-by': 
+	git commit --allow-empty -m foo -s &&
+	GIT_COMMITTER_NAME="SOB One" \
+	GIT_COMMITTER_EMAIL=sob@example.com \
+		git commit --allow-empty -m foo -s &&
+	git commit --allow-empty --amend --no-edit -s &&
+	cat >expect <<-\EOF &&
+	     2	C O Mitter <committer@example.com>
+	     1	SOB One <sob@example.com>
+	EOF
+	git shortlog -nse --group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
+
+[side d645125] foo
+ Author: A U Thor <author@example.com>
+[side 4ea5894] foo
+ Author: A U Thor <author@example.com>
+[side 4d83f03] foo
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ok 18 - shortlog --group=trailer:signed-off-by
+
+expecting success of 4201.19 'shortlog --group=format': 
+	git shortlog -s --date="format:%Y" --group="format:%cN (%cd)" \
+		HEAD >actual &&
+	cat >expect <<-\EOF &&
+	     4	C O Mitter (2005)
+	     1	Sin Nombre (2005)
+	EOF
+	test_cmp expect actual
+
+ok 19 - shortlog --group=format
+
+expecting success of 4201.20 'shortlog --group=<format> DWIM': 
+	git shortlog -s --date="format:%Y" --group="%cN (%cd)" HEAD >actual &&
+	test_cmp expect actual
+
+ok 20 - shortlog --group=<format> DWIM
+
+expecting success of 4201.21 'shortlog bogus --group': 
+	test_must_fail git shortlog --group=bogus HEAD 2>err &&
+	grep "unknown group type" err
+
+error: unknown group type: bogus
+ok 21 - shortlog bogus --group
+
+expecting success of 4201.22 'trailer idents are split': 
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	SOB One
+	EOF
+	git shortlog -ns --group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
+
+ok 22 - trailer idents are split
+
+expecting success of 4201.23 'trailer idents are mailmapped': 
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	Another Name
+	EOF
+	echo "Another Name <sob@example.com>" >mail.map &&
+	git -c mailmap.file=mail.map shortlog -ns \
+		--group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
+
+ok 23 - trailer idents are mailmapped
+
+expecting success of 4201.24 'shortlog de-duplicates trailers in a single commit': 
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
+
+	this message has two distinct values, plus a repeat
+
+	Repeated-trailer: Foo
+	Repeated-trailer: Bar
+	Repeated-trailer: Foo
+	EOF
+
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
+
+	similar to the previous, but without the second distinct value
+
+	Repeated-trailer: Foo
+	Repeated-trailer: Foo
+	EOF
+
+	cat >expect <<-\EOF &&
+	     2	Foo
+	     1	Bar
+	EOF
+	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
+	test_cmp expect actual
+
+[side 0a2c930] subject one
+ Author: A U Thor <author@example.com>
+[side 45f2a27] subject two
+ Author: A U Thor <author@example.com>
+ok 24 - shortlog de-duplicates trailers in a single commit
+
+expecting success of 4201.25 'shortlog de-duplicates trailers in a single commit (folded/unfolded values)': 
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
+
+	this message has two distinct values, plus a repeat (folded)
+
+	Repeated-trailer: Foo foo foo
+	Repeated-trailer: Bar
+	Repeated-trailer: Foo
+	  foo foo
+	EOF
+
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
+
+	similar to the previous, but without the second distinct value
+
+	Repeated-trailer: Foo foo foo
+	Repeated-trailer: Foo
+	  foo foo
+	EOF
+
+	cat >expect <<-\EOF &&
+	     2	Foo foo foo
+	     1	Bar
+	EOF
+	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
+	test_cmp expect actual
+
+[side f22298e] subject one
+ Author: A U Thor <author@example.com>
+[side b178ed0] subject two
+ Author: A U Thor <author@example.com>
+ok 25 - shortlog de-duplicates trailers in a single commit (folded/unfolded values)
+
+expecting success of 4201.26 'shortlog can match multiple groups': 
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
+
+	this has two trailers that are distinct from the author; it will count
+	3 times in the output
+
+	Some-trailer: User A <a@example.com>
+	Another-trailer: User B <b@example.com>
+	EOF
+
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
+
+	this one has two trailers, one of which is a duplicate with the author;
+	it will only be counted once for them
+
+	Another-trailer: A U Thor <author@example.com>
+	Some-trailer: User B <b@example.com>
+	EOF
+
+	cat >expect <<-\EOF &&
+	     2	A U Thor
+	     2	User B
+	     1	User A
+	EOF
+	git shortlog -ns \
+		--group=author \
+		--group=trailer:some-trailer \
+		--group=trailer:another-trailer \
+		-2 HEAD >actual &&
+	test_cmp expect actual
+
+[side d95d79b] subject one
+ Author: A U Thor <author@example.com>
+[side 01085b4] subject two
+ Author: A U Thor <author@example.com>
+ok 26 - shortlog can match multiple groups
+
+expecting success of 4201.27 'shortlog can match multiple format groups': 
+	GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" \
+		git commit --allow-empty -m "identical names" &&
+	test_tick &&
+	cat >expect <<-\EOF &&
+	     2	A U Thor
+	     1	C O Mitter
+	EOF
+	git shortlog -ns --group="%cn" --group="%an" -2 HEAD >actual &&
+	test_cmp expect actual
+
+[side 409752b] identical names
+ Author: A U Thor <author@example.com>
+ok 27 - shortlog can match multiple format groups
+
+expecting success of 4201.28 'set up option selection tests': 
+	git commit --allow-empty -F - <<-\EOF
+	subject
+
+	body
+
+	Trailer-one: value-one
+	Trailer-two: value-two
+	EOF
+
+[side 581ede9] subject
+ Author: A U Thor <author@example.com>
+ok 28 - set up option selection tests
+
+expecting success of 4201.29 '--no-group resets group list to author': 
+	cat >expect <<-\EOF &&
+	     1	A U Thor
+	EOF
+	git shortlog -ns \
+		--group=committer \
+		--group=trailer:trailer-one \
+		--no-group \
+		-1 HEAD >actual &&
+	test_cmp expect actual
+
+ok 29 - --no-group resets group list to author
+
+expecting success of 4201.30 '--no-group resets trailer list': 
+	cat >expect <<-\EOF &&
+	     1	value-two
+	EOF
+	git shortlog -ns \
+		--group=trailer:trailer-one \
+		--no-group \
+		--group=trailer:trailer-two \
+		-1 HEAD >actual &&
+	test_cmp expect actual
+
+ok 30 - --no-group resets trailer list
+
+expecting success of 4201.31 'stdin with multiple groups reports error': 
+	git log >log &&
+	test_must_fail git shortlog --group=author --group=committer <log
+
+fatal: using multiple --group options with stdin is not supported
+ok 31 - stdin with multiple groups reports error
+
+# passed all 31 test(s)
+1..31
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4151-am-abort.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4151-am-abort/.git/
 expecting success of 4151.1 'setup': 
@@ -273964,652 +274450,341 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4201-shortlog.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4201-shortlog/.git/
-expecting success of 4201.1 'setup': 
-	test_tick &&
-	echo 1 >a1 &&
-	git add a1 &&
-	tree=$(git write-tree) &&
-	commit=$(printf "%s\n" "Test" "" | git commit-tree "$tree") &&
-	git update-ref HEAD "$commit" &&
+*** t4207-log-decoration-colors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4207-log-decoration-colors/.git/
+expecting success of 4207.1 'setup': 
+	git config diff.color.commit yellow &&
+	git config color.decorate.branch green &&
+	git config color.decorate.remoteBranch red &&
+	git config color.decorate.tag "reverse bold yellow" &&
+	git config color.decorate.stash magenta &&
+	git config color.decorate.grafted black &&
+	git config color.decorate.HEAD cyan &&
 
-	echo 2 >a1 &&
-	git commit --quiet -m "This is a very, very long first line for the commit message to see if it is wrapped correctly" a1 &&
+	c_reset="<RESET>" &&
 
-	# test if the wrapping is still valid
-	# when replacing all is by treble clefs.
-	echo 3 >a1 &&
-	git commit --quiet -m "$(
-		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
-		sed "s/i/1234/g" |
-		tr 1234 "\360\235\204\236")" a1 &&
+	c_commit="<YELLOW>" &&
+	c_branch="<GREEN>" &&
+	c_remoteBranch="<RED>" &&
+	c_tag="<BOLD;REVERSE;YELLOW>" &&
+	c_stash="<MAGENTA>" &&
+	c_HEAD="<CYAN>" &&
+	c_grafted="<BLACK>" &&
 
-	# now fsck up the utf8
-	git config i18n.commitencoding non-utf-8 &&
-	echo 4 >a1 &&
-	git commit --quiet -m "$(
-		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
-		sed "s/i/1234/g" |
-		tr 1234 "\370\235\204\236")" a1 &&
+	test_commit A &&
+	git clone . other &&
+	(
+		cd other &&
+		test_commit A1
+	) &&
 
-	echo 5 >a1 &&
-	git commit --quiet -m "a								12	34	56	78" a1 &&
+	git remote add -f other ./other &&
+	test_commit B &&
+	git tag v1.0 &&
+	echo >>A.t &&
+	git stash save Changes to A.t
 
-	echo 6 >a1 &&
-	git commit --quiet -m "Commit by someone else" \
-		--author="Someone else <not!me>" a1 &&
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Cloning into 'other'...
+done.
+[main ca6ed14] A1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A1.t
+Updating other
+From ./other
+ * [new branch]      main       -> other/main
+ * [new tag]         A1         -> A1
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Saved working directory and index state On main: Changes to A.t
+ok 1 - setup
 
-	cat >expect.template <<-\EOF
-	A U Thor (5):
-	      SUBJECT
-	      SUBJECT
-	      SUBJECT
-	      SUBJECT
-	      SUBJECT
+expecting success of 4207.2 'commit decorations colored correctly': 
+	cat >expect <<-EOF &&
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
+${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
+${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}A1${c_reset}${c_commit}, \
+${c_reset}${c_remoteBranch}other/main${c_reset}${c_commit})${c_reset} A1
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_stash}refs/stash${c_reset}${c_commit})${c_reset} On main: Changes to A.t
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
+	EOF
 
-	Someone else (1):
-	      SUBJECT
+	git log --first-parent --no-abbrev --decorate --oneline --color=always --all >actual &&
+	cmp_filtered_decorations
 
-	EOF
+ok 2 - commit decorations colored correctly
 
-ok 1 - setup
+expecting success of 4207.3 'test coloring with replace-objects': 
+	test_when_finished remove_replace_refs &&
+	test_commit C &&
+	test_commit D &&
 
-expecting success of 4201.2 'default output format': 
-	git shortlog HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect.template log.predictable
+	git replace HEAD~1 HEAD~2 &&
 
-ok 2 - default output format
+	cat >expect <<-EOF &&
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
+${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}D${c_reset}${c_commit})${c_reset} D
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}C${c_reset}${c_commit}, \
+${c_reset}${c_grafted}replaced${c_reset}${c_commit})${c_reset} B
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
+EOF
 
-expecting success of 4201.3 'pretty format': 
-	sed s/SUBJECT/OBJECT_NAME/ expect.template >expect &&
-	git shortlog --format="%H" HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
+	git log --first-parent --no-abbrev --decorate --oneline --color=always HEAD >actual &&
+	cmp_filtered_decorations &&
+	git replace -d HEAD~1 &&
 
-ok 3 - pretty format
+	GIT_REPLACE_REF_BASE=refs/replace2/ git replace HEAD~1 HEAD~2 &&
+	GIT_REPLACE_REF_BASE=refs/replace2/ git log --first-parent \
+		--no-abbrev --decorate --oneline --color=always HEAD >actual &&
+	cmp_filtered_decorations
 
-expecting success of 4201.4 'pretty format (with --date)': 
-	sed "s/SUBJECT/2005-04-07 OBJECT_NAME/" expect.template >expect &&
-	git shortlog --format="%ad %H" --date=short HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
+[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
+Deleted replace ref '35a8500a6c116c9ddf35e140fa3277a7fe0b4196'
+ok 3 - test coloring with replace-objects
 
-ok 4 - pretty format (with --date)
+expecting success of 4207.4 'test coloring with grafted commit': 
+	test_when_finished remove_replace_refs &&
 
-expecting success of 4201.5 '--abbrev': 
-	sed s/SUBJECT/OBJID/ expect.template >expect &&
-	git shortlog --format="%h" --abbrev=35 HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
+	git replace --graft HEAD HEAD~2 &&
 
-ok 5 - --abbrev
+	cat >expect <<-EOF &&
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
+${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}D${c_reset}${c_commit}, \
+${c_reset}${c_grafted}replaced${c_reset}${c_commit})${c_reset} D
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
+	EOF
 
-expecting success of 4201.6 'output from user-defined format is re-wrapped': 
-	sed "s/SUBJECT/two lines/" expect.template >expect &&
-	git shortlog --format="two%nlines" HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
+	git log --first-parent --no-abbrev --decorate --oneline --color=always HEAD >actual &&
+	cmp_filtered_decorations &&
+	git replace -d HEAD &&
 
-ok 6 - output from user-defined format is re-wrapped
+	GIT_REPLACE_REF_BASE=refs/replace2/ git replace --graft HEAD HEAD~2 &&
+	GIT_REPLACE_REF_BASE=refs/replace2/ git log --first-parent \
+		--no-abbrev --decorate --oneline --color=always HEAD >actual &&
+	cmp_filtered_decorations
 
-expecting success of 4201.7 'shortlog wrapping': 
-	cat >expect <<\EOF &&
-A U Thor (5):
-      Test
-      This is a very, very long first line for the commit message to see if
-         it is wrapped correctly
-      Th�s �s a very, very long f�rst l�ne for the comm�t message to see �f
-         �t �s wrapped correctly
-      Thø�„žs ø�„žs a very, very long fø�„žrst lø�„žne for the commø�„žt
-         message to see ø�„žf ø�„žt ø�„žs wrapped correctly
-      a								12	34
-         56	78
+Deleted replace ref 'be8f64ffad20e1c23faacd732a7ba726ee6f156d'
+ok 4 - test coloring with grafted commit
 
-Someone else (1):
-      Commit by someone else
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4210-log-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-EOF
-	git shortlog -w HEAD >out &&
-	test_cmp expect out
+	t${utf8_e}st
+	EOF
+	git add msg &&
+	git -c i18n.commitencoding=utf8 commit -F msg &&
+	cat >msg <<-EOF &&
+	latin1
 
-ok 7 - shortlog wrapping
+	t${latin1_e}st
+	EOF
+	git add msg &&
+	git -c i18n.commitencoding=ISO-8859-1 commit -F msg
 
-expecting success of 4201.8 'shortlog from non-git directory': 
-	git log --no-expand-tabs HEAD >log &&
-	GIT_DIR=non-existing git shortlog -w <log >out &&
-	test_cmp expect out
+[master (root-commit) cbf2796] utf8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 msg
+[master b077cf9] latin1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 1 - create commits in different encodings
 
-ok 8 - shortlog from non-git directory
+expecting success of 4210.2 'log --grep searches in log output encoding (utf8)': 
+	cat >expect <<-\EOF &&
+	latin1
+	utf8
+	EOF
+	git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
+	test_cmp expect actual
 
-expecting success of 4201.9 'shortlog can read --format=raw output': 
-	git log --format=raw HEAD >log &&
-	GIT_DIR=non-existing git shortlog -w <log >out &&
-	test_cmp expect out
+ok 2 - log --grep searches in log output encoding (utf8)
 
-ok 9 - shortlog can read --format=raw output
+expecting success of 4210.3 'log --grep searches in log output encoding (latin1)': 
+	cat >expect <<-\EOF &&
+	latin1
+	utf8
+	EOF
+	git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual &&
+	test_cmp expect actual
 
-expecting success of 4201.10 'shortlog from non-git directory refuses extra arguments': 
-	test_must_fail env GIT_DIR=non-existing git shortlog foo 2>out &&
-	test_grep "too many arguments" out
+ok 3 - log --grep searches in log output encoding (latin1)
 
-error: too many arguments given outside repository
-ok 10 - shortlog from non-git directory refuses extra arguments
+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 4201.11 'shortlog should add newline when input line matches wraplen': 
-	cat >expect <<\EOF &&
-A U Thor (2):
-      bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
-      aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
+ok 4 - log --grep does not find non-reencoded values (utf8)
 
-EOF
-	git shortlog -w >out <<\EOF &&
-commit 0000000000000000000000000000000000000001
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
+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
 
-    aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
+ok 5 - log --grep does not find non-reencoded values (latin1)
 
-commit 0000000000000000000000000000000000000002
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
+expecting success of 4210.6 'config grep.patternType=fixed': 
+		git config grep.patternType fixed
+	
+ok 6 - config grep.patternType=fixed
 
-    bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
+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)
 
-EOF
-	test_cmp expect out
+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)
 
-ok 11 - shortlog should add newline when input line matches wraplen
+expecting success of 4210.9 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
+			mismatched_git_log 'Ã()' >actual &&
+			test_must_be_empty actual
+		
+ok 9 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
 
-expecting success of 4201.12 'shortlog encoding': 
-	git reset --hard "$commit" &&
-	git config --unset i18n.commitencoding &&
-	echo 2 > a1 &&
-	git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 &&
-	git config i18n.commitencoding "ISO8859-1" &&
-	echo 3 > a1 &&
-	git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \
-		--author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 &&
-	git config --unset i18n.commitencoding &&
-	git shortlog HEAD~2.. > out &&
-test_cmp expect out
-HEAD is now at aa97132 Test
-ok 12 - shortlog encoding
+expecting success of 4210.10 'config grep.patternType=basic': 
+		git config grep.patternType basic
+	
+ok 10 - config grep.patternType=basic
 
-expecting success of 4201.13 'shortlog with revision pseudo options': 
-	git shortlog --all &&
-	git shortlog --branches &&
-	git shortlog --exclude=refs/heads/m* --all
+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)
 
-A U Thor (1):
-      Test
+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)
 
-Jöhännës "Dschö" Schindëlin (2):
-      set a1 to 2 and some non-ASCII chars: Äßø
-      set a1 to 3 and some non-ASCII chars: áæï
+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)
 
-A U Thor (1):
-      Test
+expecting success of 4210.14 'config grep.patternType=extended': 
+		git config grep.patternType extended
+	
+ok 14 - config grep.patternType=extended
 
-Jöhännës "Dschö" Schindëlin (2):
-      set a1 to 2 and some non-ASCII chars: Äßø
-      set a1 to 3 and some non-ASCII chars: áæï
+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)
 
-A U Thor (1):
-      Test
+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)
 
-Jöhännës "Dschö" Schindëlin (2):
-      set a1 to 2 and some non-ASCII chars: Äßø
-      set a1 to 3 and some non-ASCII chars: áæï
+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)
 
-ok 13 - shortlog with revision pseudo options
+expecting success of 4210.18 'config grep.patternType=perl': 
+		git config grep.patternType perl
+	
+ok 18 - config grep.patternType=perl
 
-expecting success of 4201.14 'shortlog with --output=<file>': 
-	git shortlog --output=shortlog -1 main >output &&
-	test_must_be_empty output &&
-	test_line_count = 3 shortlog
+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)
 
-ok 14 - shortlog with --output=<file>
+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 4201.15 'shortlog --committer (internal)': 
-	git checkout --orphan side &&
-	git commit --allow-empty -m one &&
-	git commit --allow-empty -m two &&
-	GIT_COMMITTER_NAME="Sin Nombre" git commit --allow-empty -m three &&
+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)
 
-	cat >expect <<-\EOF &&
-	     2	C O Mitter
-	     1	Sin Nombre
-	EOF
-	git shortlog -nsc HEAD >actual &&
-	test_cmp expect actual
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4208-log-magic-pathspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4208-log-magic-pathspec/.git/
+expecting success of 4208.1 'setup': 
+	test_commit initial &&
+	test_tick &&
+	git commit --allow-empty -m empty &&
+	mkdir sub
 
-Switched to a new branch 'side'
-[side (root-commit) 9ed1028] one
+[main (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a1
-[side 4046e48] two
- Author: A U Thor <author@example.com>
-[side 1c4141a] three
+ create mode 100644 initial.t
+[main 41d179c] empty
  Author: A U Thor <author@example.com>
-ok 15 - shortlog --committer (internal)
-
-expecting success of 4201.16 'shortlog --committer (external)': 
-	git log --format=full | git shortlog -nsc >actual &&
-	test_cmp expect actual
-
-ok 16 - shortlog --committer (external)
-
-expecting success of 4201.17 '--group=committer is the same as --committer': 
-	git shortlog -ns --group=committer HEAD >actual &&
-	test_cmp expect actual
-
-ok 17 - --group=committer is the same as --committer
-
-expecting success of 4201.18 'shortlog --group=trailer:signed-off-by': 
-	git commit --allow-empty -m foo -s &&
-	GIT_COMMITTER_NAME="SOB One" \
-	GIT_COMMITTER_EMAIL=sob@example.com \
-		git commit --allow-empty -m foo -s &&
-	git commit --allow-empty --amend --no-edit -s &&
-	cat >expect <<-\EOF &&
-	     2	C O Mitter <committer@example.com>
-	     1	SOB One <sob@example.com>
-	EOF
-	git shortlog -nse --group=trailer:signed-off-by HEAD >actual &&
-	test_cmp expect actual
-
-[side d645125] foo
- Author: A U Thor <author@example.com>
-[side 4ea5894] foo
- Author: A U Thor <author@example.com>
-[side 4d83f03] foo
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
-ok 18 - shortlog --group=trailer:signed-off-by
-
-expecting success of 4201.19 'shortlog --group=format': 
-	git shortlog -s --date="format:%Y" --group="format:%cN (%cd)" \
-		HEAD >actual &&
-	cat >expect <<-\EOF &&
-	     4	C O Mitter (2005)
-	     1	Sin Nombre (2005)
-	EOF
-	test_cmp expect actual
-
-ok 19 - shortlog --group=format
-
-expecting success of 4201.20 'shortlog --group=<format> DWIM': 
-	git shortlog -s --date="format:%Y" --group="%cN (%cd)" HEAD >actual &&
-	test_cmp expect actual
-
-ok 20 - shortlog --group=<format> DWIM
-
-expecting success of 4201.21 'shortlog bogus --group': 
-	test_must_fail git shortlog --group=bogus HEAD 2>err &&
-	grep "unknown group type" err
-
-error: unknown group type: bogus
-ok 21 - shortlog bogus --group
-
-expecting success of 4201.22 'trailer idents are split': 
-	cat >expect <<-\EOF &&
-	     2	C O Mitter
-	     1	SOB One
-	EOF
-	git shortlog -ns --group=trailer:signed-off-by HEAD >actual &&
-	test_cmp expect actual
-
-ok 22 - trailer idents are split
-
-expecting success of 4201.23 'trailer idents are mailmapped': 
-	cat >expect <<-\EOF &&
-	     2	C O Mitter
-	     1	Another Name
-	EOF
-	echo "Another Name <sob@example.com>" >mail.map &&
-	git -c mailmap.file=mail.map shortlog -ns \
-		--group=trailer:signed-off-by HEAD >actual &&
-	test_cmp expect actual
-
-ok 23 - trailer idents are mailmapped
-
-expecting success of 4201.24 'shortlog de-duplicates trailers in a single commit': 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject one
-
-	this message has two distinct values, plus a repeat
-
-	Repeated-trailer: Foo
-	Repeated-trailer: Bar
-	Repeated-trailer: Foo
-	EOF
-
-	git commit --allow-empty -F - <<-\EOF &&
-	subject two
-
-	similar to the previous, but without the second distinct value
-
-	Repeated-trailer: Foo
-	Repeated-trailer: Foo
-	EOF
-
-	cat >expect <<-\EOF &&
-	     2	Foo
-	     1	Bar
-	EOF
-	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
-	test_cmp expect actual
-
-[side 0a2c930] subject one
- Author: A U Thor <author@example.com>
-[side 45f2a27] subject two
- Author: A U Thor <author@example.com>
-ok 24 - shortlog de-duplicates trailers in a single commit
-
-expecting success of 4201.25 'shortlog de-duplicates trailers in a single commit (folded/unfolded values)': 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject one
-
-	this message has two distinct values, plus a repeat (folded)
-
-	Repeated-trailer: Foo foo foo
-	Repeated-trailer: Bar
-	Repeated-trailer: Foo
-	  foo foo
-	EOF
-
-	git commit --allow-empty -F - <<-\EOF &&
-	subject two
-
-	similar to the previous, but without the second distinct value
-
-	Repeated-trailer: Foo foo foo
-	Repeated-trailer: Foo
-	  foo foo
-	EOF
-
-	cat >expect <<-\EOF &&
-	     2	Foo foo foo
-	     1	Bar
-	EOF
-	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
-	test_cmp expect actual
-
-[side f22298e] subject one
- Author: A U Thor <author@example.com>
-[side b178ed0] subject two
- Author: A U Thor <author@example.com>
-ok 25 - shortlog de-duplicates trailers in a single commit (folded/unfolded values)
-
-expecting success of 4201.26 'shortlog can match multiple groups': 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject one
-
-	this has two trailers that are distinct from the author; it will count
-	3 times in the output
-
-	Some-trailer: User A <a@example.com>
-	Another-trailer: User B <b@example.com>
-	EOF
-
-	git commit --allow-empty -F - <<-\EOF &&
-	subject two
-
-	this one has two trailers, one of which is a duplicate with the author;
-	it will only be counted once for them
-
-	Another-trailer: A U Thor <author@example.com>
-	Some-trailer: User B <b@example.com>
-	EOF
-
-	cat >expect <<-\EOF &&
-	     2	A U Thor
-	     2	User B
-	     1	User A
-	EOF
-	git shortlog -ns \
-		--group=author \
-		--group=trailer:some-trailer \
-		--group=trailer:another-trailer \
-		-2 HEAD >actual &&
-	test_cmp expect actual
-
-[side d95d79b] subject one
- Author: A U Thor <author@example.com>
-[side 01085b4] subject two
- Author: A U Thor <author@example.com>
-ok 26 - shortlog can match multiple groups
-
-expecting success of 4201.27 'shortlog can match multiple format groups': 
-	GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" \
-		git commit --allow-empty -m "identical names" &&
-	test_tick &&
-	cat >expect <<-\EOF &&
-	     2	A U Thor
-	     1	C O Mitter
-	EOF
-	git shortlog -ns --group="%cn" --group="%an" -2 HEAD >actual &&
-	test_cmp expect actual
-
-[side 409752b] identical names
- Author: A U Thor <author@example.com>
-ok 27 - shortlog can match multiple format groups
-
-expecting success of 4201.28 'set up option selection tests': 
-	git commit --allow-empty -F - <<-\EOF
-	subject
-
-	body
-
-	Trailer-one: value-one
-	Trailer-two: value-two
-	EOF
-
-[side 581ede9] subject
- Author: A U Thor <author@example.com>
-ok 28 - set up option selection tests
-
-expecting success of 4201.29 '--no-group resets group list to author': 
-	cat >expect <<-\EOF &&
-	     1	A U Thor
-	EOF
-	git shortlog -ns \
-		--group=committer \
-		--group=trailer:trailer-one \
-		--no-group \
-		-1 HEAD >actual &&
-	test_cmp expect actual
-
-ok 29 - --no-group resets group list to author
-
-expecting success of 4201.30 '--no-group resets trailer list': 
-	cat >expect <<-\EOF &&
-	     1	value-two
-	EOF
-	git shortlog -ns \
-		--group=trailer:trailer-one \
-		--no-group \
-		--group=trailer:trailer-two \
-		-1 HEAD >actual &&
-	test_cmp expect actual
-
-ok 30 - --no-group resets trailer list
-
-expecting success of 4201.31 'stdin with multiple groups reports error': 
-	git log >log &&
-	test_must_fail git shortlog --group=author --group=committer <log
-
-fatal: using multiple --group options with stdin is not supported
-ok 31 - stdin with multiple groups reports error
-
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4207-log-decoration-colors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4207-log-decoration-colors/.git/
-expecting success of 4207.1 'setup': 
-	git config diff.color.commit yellow &&
-	git config color.decorate.branch green &&
-	git config color.decorate.remoteBranch red &&
-	git config color.decorate.tag "reverse bold yellow" &&
-	git config color.decorate.stash magenta &&
-	git config color.decorate.grafted black &&
-	git config color.decorate.HEAD cyan &&
-
-	c_reset="<RESET>" &&
-
-	c_commit="<YELLOW>" &&
-	c_branch="<GREEN>" &&
-	c_remoteBranch="<RED>" &&
-	c_tag="<BOLD;REVERSE;YELLOW>" &&
-	c_stash="<MAGENTA>" &&
-	c_HEAD="<CYAN>" &&
-	c_grafted="<BLACK>" &&
-
-	test_commit A &&
-	git clone . other &&
-	(
-		cd other &&
-		test_commit A1
-	) &&
-
-	git remote add -f other ./other &&
-	test_commit B &&
-	git tag v1.0 &&
-	echo >>A.t &&
-	git stash save Changes to A.t
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Cloning into 'other'...
-done.
-[main ca6ed14] A1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A1.t
-Updating other
-From ./other
- * [new branch]      main       -> other/main
- * [new tag]         A1         -> A1
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Saved working directory and index state On main: Changes to A.t
-ok 1 - setup
-
-expecting success of 4207.2 'commit decorations colored correctly': 
-	cat >expect <<-EOF &&
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
-${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
-${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}A1${c_reset}${c_commit}, \
-${c_reset}${c_remoteBranch}other/main${c_reset}${c_commit})${c_reset} A1
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_stash}refs/stash${c_reset}${c_commit})${c_reset} On main: Changes to A.t
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
-	EOF
-
-	git log --first-parent --no-abbrev --decorate --oneline --color=always --all >actual &&
-	cmp_filtered_decorations
-
-ok 2 - commit decorations colored correctly
-
-expecting success of 4207.3 'test coloring with replace-objects': 
-	test_when_finished remove_replace_refs &&
-	test_commit C &&
-	test_commit D &&
-
-	git replace HEAD~1 HEAD~2 &&
-
-	cat >expect <<-EOF &&
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
-${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}D${c_reset}${c_commit})${c_reset} D
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}C${c_reset}${c_commit}, \
-${c_reset}${c_grafted}replaced${c_reset}${c_commit})${c_reset} B
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
-EOF
-
-	git log --first-parent --no-abbrev --decorate --oneline --color=always HEAD >actual &&
-	cmp_filtered_decorations &&
-	git replace -d HEAD~1 &&
-
-	GIT_REPLACE_REF_BASE=refs/replace2/ git replace HEAD~1 HEAD~2 &&
-	GIT_REPLACE_REF_BASE=refs/replace2/ git log --first-parent \
-		--no-abbrev --decorate --oneline --color=always HEAD >actual &&
-	cmp_filtered_decorations
-
-[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
-Deleted replace ref '35a8500a6c116c9ddf35e140fa3277a7fe0b4196'
-ok 3 - test coloring with replace-objects
-
-expecting success of 4207.4 'test coloring with grafted commit': 
-	test_when_finished remove_replace_refs &&
-
-	git replace --graft HEAD HEAD~2 &&
-
-	cat >expect <<-EOF &&
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
-${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}D${c_reset}${c_commit}, \
-${c_reset}${c_grafted}replaced${c_reset}${c_commit})${c_reset} D
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
-	EOF
-
-	git log --first-parent --no-abbrev --decorate --oneline --color=always HEAD >actual &&
-	cmp_filtered_decorations &&
-	git replace -d HEAD &&
-
-	GIT_REPLACE_REF_BASE=refs/replace2/ git replace --graft HEAD HEAD~2 &&
-	GIT_REPLACE_REF_BASE=refs/replace2/ git log --first-parent \
-		--no-abbrev --decorate --oneline --color=always HEAD >actual &&
-	cmp_filtered_decorations
-
-Deleted replace ref 'be8f64ffad20e1c23faacd732a7ba726ee6f156d'
-ok 4 - test coloring with grafted commit
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4208-log-magic-pathspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4208-log-magic-pathspec/.git/
-expecting success of 4208.1 'setup': 
-	test_commit initial &&
-	test_tick &&
-	git commit --allow-empty -m empty &&
-	mkdir sub
-
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 41d179c] empty
- Author: A U Thor <author@example.com>
-ok 1 - setup
+ok 1 - setup
 
 expecting success of 4208.2 '"git log :/" should not be ambiguous': 
 	git log :/
@@ -274931,180 +275106,6 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4210-log-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4210-log-i18n/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-expecting success of 4210.1 'create commits in different encodings': 
-	test_tick &&
-	cat >msg <<-EOF &&
-	utf8
-
-	t${utf8_e}st
-	EOF
-	git add msg &&
-	git -c i18n.commitencoding=utf8 commit -F msg &&
-	cat >msg <<-EOF &&
-	latin1
-
-	t${latin1_e}st
-	EOF
-	git add msg &&
-	git -c i18n.commitencoding=ISO-8859-1 commit -F msg
-
-[master (root-commit) cbf2796] utf8
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 msg
-[master b077cf9] latin1
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 1 - create commits in different encodings
-
-expecting success of 4210.2 'log --grep searches in log output encoding (utf8)': 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
-	EOF
-	git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
-	test_cmp expect actual
-
-ok 2 - log --grep searches in log output encoding (utf8)
-
-expecting success of 4210.3 'log --grep searches in log output encoding (latin1)': 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
-	EOF
-	git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual &&
-	test_cmp expect actual
-
-ok 3 - log --grep searches in log output encoding (latin1)
-
-expecting success of 4210.4 'log --grep does not find non-reencoded values (utf8)': 
-	git log --encoding=utf8 --format=%s --grep=$latin1_e >actual &&
-	test_must_be_empty actual
-
-ok 4 - log --grep does not find non-reencoded values (utf8)
-
-expecting success of 4210.5 'log --grep does not find non-reencoded values (latin1)': 
-	git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
-	test_must_be_empty actual
-
-ok 5 - log --grep does not find non-reencoded values (latin1)
-
-expecting success of 4210.6 'config grep.patternType=fixed': 
-		git config grep.patternType fixed
-	
-ok 6 - config grep.patternType=fixed
-
-expecting success of 4210.7 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log 'é' >actual &&
-		test_must_be_empty actual
-	
-ok 7 - log --grep does not find non-reencoded values (latin1 + locale)
-
-expecting success of 4210.8 'log --grep searches in log output encoding (latin1 + locale)': 
-			cat >expect <<-\EOF &&
-			latin1
-			utf8
-			EOF
-			mismatched_git_log 'é' >actual &&
-			test_cmp expect actual
-		
-ok 8 - log --grep searches in log output encoding (latin1 + locale)
-
-expecting success of 4210.9 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
-			mismatched_git_log 'Ã()' >actual &&
-			test_must_be_empty actual
-		
-ok 9 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
-
-expecting success of 4210.10 'config grep.patternType=basic': 
-		git config grep.patternType basic
-	
-ok 10 - config grep.patternType=basic
-
-expecting success of 4210.11 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log '.*é' >actual &&
-		test_must_be_empty actual
-	
-ok 11 - log --grep does not find non-reencoded values (latin1 + locale)
-
-expecting success of 4210.12 'log --grep searches in log output encoding (latin1 + locale)': 
-			cat >expect <<-\EOF &&
-			latin1
-			utf8
-			EOF
-			mismatched_git_log '.*é' >actual &&
-			test_cmp expect actual
-		
-ok 12 - log --grep searches in log output encoding (latin1 + locale)
-
-expecting success of 4210.13 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
-			mismatched_git_log '.*Ã()' >actual &&
-			test_must_be_empty actual
-		
-ok 13 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
-
-expecting success of 4210.14 'config grep.patternType=extended': 
-		git config grep.patternType extended
-	
-ok 14 - config grep.patternType=extended
-
-expecting success of 4210.15 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log '.*é' >actual &&
-		test_must_be_empty actual
-	
-ok 15 - log --grep does not find non-reencoded values (latin1 + locale)
-
-expecting success of 4210.16 'log --grep searches in log output encoding (latin1 + locale)': 
-			cat >expect <<-\EOF &&
-			latin1
-			utf8
-			EOF
-			mismatched_git_log '.*é' >actual &&
-			test_cmp expect actual
-		
-ok 16 - log --grep searches in log output encoding (latin1 + locale)
-
-expecting success of 4210.17 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
-			mismatched_git_log '.*Ã()' >actual &&
-			test_must_be_empty actual
-		
-ok 17 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
-
-expecting success of 4210.18 'config grep.patternType=perl': 
-		git config grep.patternType perl
-	
-ok 18 - config grep.patternType=perl
-
-expecting success of 4210.19 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log '.*é' >actual &&
-		test_must_be_empty actual
-	
-ok 19 - log --grep does not find non-reencoded values (latin1 + locale)
-
-expecting success of 4210.20 'log --grep searches in log output encoding (latin1 + locale)': 
-			cat >expect <<-\EOF &&
-			latin1
-			utf8
-			EOF
-			mismatched_git_log '.*é' >actual &&
-			test_cmp expect actual
-		
-ok 20 - log --grep searches in log output encoding (latin1 + locale)
-
-expecting success of 4210.21 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
-			mismatched_git_log '.*Ã()' >actual &&
-			test_must_be_empty actual
-		
-ok 21 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4204-patch-id.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4204-patch-id/.git/
 expecting success of 4204.1 'setup': 
@@ -275187,8 +275188,8 @@
 	get_patch_id notsame &&
 	! test_cmp patch-id_main patch-id_notsame
 
---- patch-id_main	2026-03-04 07:58:52.863352315 +0000
-+++ patch-id_notsame	2026-03-04 07:58:52.919352315 +0000
+--- patch-id_main	2025-01-30 02:11:46.032106891 +0000
++++ patch-id_notsame	2025-01-30 02:11:46.116107395 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +6276aec15da664e9f9ce6dde29c2e2c71607e017
@@ -275222,8 +275223,8 @@
 	! test_cmp patch-id_main patch-id_notsame &&
 	test_when_finished "rm .gitattributes"
 
---- patch-id_main	2026-03-04 07:58:53.287352315 +0000
-+++ patch-id_notsame	2026-03-04 07:58:53.371352315 +0000
+--- patch-id_main	2025-01-30 02:11:46.652110610 +0000
++++ patch-id_notsame	2025-01-30 02:11:46.744111161 +0000
 @@ -1 +1 @@
 -6c46c4bc49d6541a5d8bcadf7808959c9520ae8b
 +f92e710b91f98a3598e43f302e80d3e4a9bfe874
@@ -275261,8 +275262,8 @@
 	test_patch_id_file_order relevant --unstable --unstable
 
 Already on 'same'
---- patch-id_order---unstable-relevant	2026-03-04 07:58:54.007352315 +0000
-+++ patch-id_ordered-order---unstable-relevant	2026-03-04 07:58:54.091352315 +0000
+--- patch-id_order---unstable-relevant	2025-01-30 02:11:47.572116127 +0000
++++ patch-id_ordered-order---unstable-relevant	2025-01-30 02:11:47.656116631 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +892d1d3b08f44511b1fdc7cab43c0ad907ac772b
@@ -275271,8 +275272,8 @@
 expecting success of 4204.11 'whitespace is relevant with --verbatim': 
 	test_patch_id_whitespace relevant --verbatim --verbatim
 
---- patch-id_ws---verbatim-relevant	2026-03-04 07:58:54.131352315 +0000
-+++ patch-id_ws-ws---verbatim-relevant	2026-03-04 07:58:54.155352315 +0000
+--- patch-id_ws---verbatim-relevant	2025-01-30 02:11:47.764117278 +0000
++++ patch-id_ws-ws---verbatim-relevant	2025-01-30 02:11:47.840117734 +0000
 @@ -1 +1 @@
 -bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
 +ec56d730a19f56a178db031386e5bcaabfea5677
@@ -275287,8 +275288,8 @@
 	test_patch_id relevant default
 
 Already on 'same'
---- patch-id_order-default-relevant	2026-03-04 07:58:54.315352315 +0000
-+++ patch-id_ordered-order-default-relevant	2026-03-04 07:58:54.379352315 +0000
+--- patch-id_order-default-relevant	2025-01-30 02:11:48.168119701 +0000
++++ patch-id_ordered-order-default-relevant	2025-01-30 02:11:48.300120493 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +892d1d3b08f44511b1fdc7cab43c0ad907ac772b
@@ -275306,8 +275307,8 @@
 	test_patch_id relevant patchid.stable=false
 
 Already on 'same'
---- patch-id_order-patchid.stable=false-relevant	2026-03-04 07:58:54.627352315 +0000
-+++ patch-id_ordered-order-patchid.stable=false-relevant	2026-03-04 07:58:54.735352315 +0000
+--- patch-id_order-patchid.stable=false-relevant	2025-01-30 02:11:48.664122676 +0000
++++ patch-id_ordered-order-patchid.stable=false-relevant	2025-01-30 02:11:48.760123251 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +892d1d3b08f44511b1fdc7cab43c0ad907ac772b
@@ -275318,8 +275319,8 @@
 	test_patch_id_whitespace relevant patchid.verbatim=true &&
 	test_patch_id irrelevant patchid.verbatim=true
 
---- patch-id_ws-patchid.verbatim=true-relevant	2026-03-04 07:58:54.887352315 +0000
-+++ patch-id_ws-ws-patchid.verbatim=true-relevant	2026-03-04 07:58:54.915352315 +0000
+--- patch-id_ws-patchid.verbatim=true-relevant	2025-01-30 02:11:48.888124019 +0000
++++ patch-id_ws-ws-patchid.verbatim=true-relevant	2025-01-30 02:11:48.972124523 +0000
 @@ -1 +1 @@
 -bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
 +ec56d730a19f56a178db031386e5bcaabfea5677
@@ -275331,8 +275332,8 @@
 	test_patch_id relevant patchid.verbatim=false
 
 Already on 'same'
---- patch-id_order-patchid.verbatim=false-relevant	2026-03-04 07:58:55.175352315 +0000
-+++ patch-id_ordered-order-patchid.verbatim=false-relevant	2026-03-04 07:58:55.223352315 +0000
+--- patch-id_order-patchid.verbatim=false-relevant	2025-01-30 02:11:49.308126538 +0000
++++ patch-id_ordered-order-patchid.verbatim=false-relevant	2025-01-30 02:11:49.428127257 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +892d1d3b08f44511b1fdc7cab43c0ad907ac772b
@@ -275343,8 +275344,8 @@
 	test_patch_id relevant patchid.stable=true--unstable --unstable
 
 Already on 'same'
---- patch-id_order-patchid.stable=true--unstable-relevant	2026-03-04 07:58:55.403352315 +0000
-+++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2026-03-04 07:58:55.467352315 +0000
+--- patch-id_order-patchid.stable=true--unstable-relevant	2025-01-30 02:11:49.600128289 +0000
++++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2025-01-30 02:11:49.720129009 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +892d1d3b08f44511b1fdc7cab43c0ad907ac772b
@@ -275361,8 +275362,8 @@
 	test_config patchid.stable false &&
 	test_patch_id_whitespace relevant stable=false--verbatim --verbatim
 
---- patch-id_ws-stable=false--verbatim-relevant	2026-03-04 07:58:55.727352315 +0000
-+++ patch-id_ws-ws-stable=false--verbatim-relevant	2026-03-04 07:58:55.783352315 +0000
+--- patch-id_ws-stable=false--verbatim-relevant	2025-01-30 02:11:50.164131671 +0000
++++ patch-id_ws-ws-stable=false--verbatim-relevant	2025-01-30 02:11:50.228132055 +0000
 @@ -1 +1 @@
 -bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
 +ec56d730a19f56a178db031386e5bcaabfea5677
@@ -275431,8 +275432,8 @@
 	calc_patch_id withnl-inc-ws --verbatim <withnl &&
 	! test_cmp patch-id_nonl-inc-ws patch-id_withnl-inc-ws
 
---- patch-id_nonl-inc-ws	2026-03-04 07:58:56.219352315 +0000
-+++ patch-id_withnl-inc-ws	2026-03-04 07:58:56.251352315 +0000
+--- patch-id_nonl-inc-ws	2025-01-30 02:11:51.012136757 +0000
++++ patch-id_withnl-inc-ws	2025-01-30 02:11:51.068137093 +0000
 @@ -1 +1 @@
 -7ff2bcb9c001e010d881f0fccddc20be3af94012
 +897be18d6338cd2e68bf17f3848b1c48bbc17459
@@ -275489,8 +275490,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4204-patch-id/repo-sha1/.git/
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4204-patch-id/repo-sha256/.git/
---- patch-id-sha1	2026-03-04 07:58:56.415352315 +0000
-+++ patch-id-sha256	2026-03-04 07:58:56.431352315 +0000
+--- patch-id-sha1	2025-01-30 02:11:51.388139012 +0000
++++ patch-id-sha256	2025-01-30 02:11:51.412139156 +0000
 @@ -1 +1 @@
 -412211131a680f60efe39ff97826b8a673042664 0000000000000000000000000000000000000000
 +f8e1e9607584d07254be0d54eebb3f8ce98ce90acb09c653b9bbda1ad2ffc516 0000000000000000000000000000000000000000000000000000000000000000
@@ -276072,1089 +276073,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4200-rerere.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4200-rerere/.git/
-expecting success of 4200.1 'setup': 
-	cat >a1 <<-\EOF &&
-	Some title
-	==========
-	Whether 'tis nobler in the mind to suffer
-	The slings and arrows of outrageous fortune,
-	Or to take arms against a sea of troubles,
-	And by opposing end them? To die: to sleep;
-	No more; and by a sleep to say we end
-	The heart-ache and the thousand natural shocks
-	That flesh is heir to, 'tis a consummation
-	Devoutly to be wish'd.
-	EOF
-
-	git add a1 &&
-	test_tick &&
-	git commit -q -a -m initial &&
-
-	cat >>a1 <<-\EOF &&
-	Some title
-	==========
-	To die, to sleep;
-	To sleep: perchance to dream: ay, there's the rub;
-	For in that sleep of death what dreams may come
-	When we have shuffled off this mortal coil,
-	Must give us pause: there's the respect
-	That makes calamity of so long life;
-	EOF
-
-	git checkout -b first &&
-	test_tick &&
-	git commit -q -a -m first &&
-
-	git checkout -b second main &&
-	git show first:a1 |
-	sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
-	echo "* END *" >>a1 &&
-	test_tick &&
-	git commit -q -a -m second
-
-Switched to a new branch 'first'
-Switched to a new branch 'second'
-ok 1 - setup
-
-expecting success of 4200.2 'nothing recorded without rerere': 
-	rm -rf .git/rr-cache &&
-	git config rerere.enabled false &&
-	test_must_fail git merge first &&
-	! test -d .git/rr-cache
-
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - nothing recorded without rerere
-
-expecting success of 4200.3 'activate rerere, old style (conflicting merge)': 
-	git reset --hard &&
-	mkdir .git/rr-cache &&
-	test_might_fail git config --unset rerere.enabled &&
-	test_must_fail git merge first &&
-
-	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
-	rr=.git/rr-cache/$sha1 &&
-	grep "^=======\$" $rr/preimage &&
-	! test -f $rr/postimage &&
-	! test -f $rr/thisimage
-
-HEAD is now at fcd23fa second
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Recorded preimage for 'a1'
-Automatic merge failed; fix conflicts and then commit the result.
-=======
-=======
-ok 3 - activate rerere, old style (conflicting merge)
-
-expecting success of 4200.4 'rerere.enabled works, too': 
-	rm -rf .git/rr-cache &&
-	git config rerere.enabled true &&
-	git reset --hard &&
-	test_must_fail git merge first &&
-
-	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
-	rr=.git/rr-cache/$sha1 &&
-	grep ^=======$ $rr/preimage
-
-HEAD is now at fcd23fa second
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Recorded preimage for 'a1'
-Automatic merge failed; fix conflicts and then commit the result.
-=======
-=======
-ok 4 - rerere.enabled works, too
-
-expecting success of 4200.5 'set up rr-cache': 
-	rm -rf .git/rr-cache &&
-	git config rerere.enabled true &&
-	git reset --hard &&
-	test_must_fail git merge first &&
-	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
-	rr=.git/rr-cache/$sha1
-
-HEAD is now at fcd23fa second
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Recorded preimage for 'a1'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 5 - set up rr-cache
-
-expecting success of 4200.6 'rr-cache looks sane': 
-	# no postimage or thisimage yet
-	! test -f $rr/postimage &&
-	! test -f $rr/thisimage &&
-
-	# preimage has right number of lines
-	cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
-	echo $cnt &&
-	test $cnt = 13
-
-13
-ok 6 - rr-cache looks sane
-
-expecting success of 4200.7 'rerere diff': 
-	git show first:a1 >a1 &&
-	cat >expect <<-\EOF &&
-	--- a/a1
-	+++ b/a1
-	@@ -1,4 +1,4 @@
-	-Some Title
-	+Some title
-	 ==========
-	 Whether 'tis nobler in the mind to suffer
-	 The slings and arrows of outrageous fortune,
-	@@ -8,21 +8,11 @@
-	 The heart-ache and the thousand natural shocks
-	 That flesh is heir to, 'tis a consummation
-	 Devoutly to be wish'd.
-	-<<<<<<<
-	-Some Title
-	-==========
-	-To die! To sleep;
-	-=======
-	 Some title
-	 ==========
-	 To die, to sleep;
-	->>>>>>>
-	 To sleep: perchance to dream: ay, there's the rub;
-	 For in that sleep of death what dreams may come
-	 When we have shuffled off this mortal coil,
-	 Must give us pause: there's the respect
-	 That makes calamity of so long life;
-	-<<<<<<<
-	-=======
-	-* END *
-	->>>>>>>
-	EOF
-	git rerere diff >out &&
-	test_cmp expect out
-
-ok 7 - rerere diff
-
-expecting success of 4200.8 'rerere status': 
-	echo a1 >expect &&
-	git rerere status >out &&
-	test_cmp expect out
-
-ok 8 - rerere status
-
-expecting success of 4200.9 'first postimage wins': 
-	git show first:a1 | sed "s/To die: t/To die! T/" >expect &&
-
-	git commit -q -a -m "prefer first over second" &&
-	test -f $rr/postimage &&
-
-	oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
-
-	git checkout -b third main &&
-	git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
-	git commit -q -a -m third &&
-
-	test_must_fail git merge first &&
-	# rerere kicked in
-	! grep "^=======\$" a1 &&
-	test_cmp expect a1
-
-Recorded resolution for 'a1'.
-Switched to a new branch 'third'
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Resolved 'a1' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 9 - first postimage wins
-
-expecting success of 4200.10 'rerere updates postimage timestamp': 
-	newmtimepost=$(test-tool chmtime --get $rr/postimage) &&
-	test $oldmtimepost -lt $newmtimepost
-
-ok 10 - rerere updates postimage timestamp
-
-expecting success of 4200.11 'rerere clear': 
-	mv $rr/postimage .git/post-saved &&
-	echo "$sha1	a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
-	git rerere clear &&
-	! test -d $rr
-
-ok 11 - rerere clear
-
-expecting success of 4200.12 'leftover directory': 
-	git reset --hard &&
-	mkdir -p $rr &&
-	test_must_fail git merge first &&
-	test -f $rr/preimage
-
-HEAD is now at 40cb797 third
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Recorded preimage for 'a1'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 12 - leftover directory
-
-expecting success of 4200.13 'missing preimage': 
-	git reset --hard &&
-	mkdir -p $rr &&
-	cp .git/post-saved $rr/postimage &&
-	test_must_fail git merge first &&
-	test -f $rr/preimage
-
-HEAD is now at 40cb797 third
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Resolved 'a1' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 13 - missing preimage
-
-expecting success of 4200.14 'set up for garbage collection tests': 
-	mkdir -p $rr &&
-	echo Hello >$rr/preimage &&
-	echo World >$rr/postimage &&
-
-	sha2=$(test_oid deadbeef) &&
-	rr2=.git/rr-cache/$sha2 &&
-	mkdir $rr2 &&
-	echo Hello >$rr2/preimage &&
-
-	almost_15_days_ago=$((60-15*86400)) &&
-	just_over_15_days_ago=$((-1-15*86400)) &&
-	almost_60_days_ago=$((60-60*86400)) &&
-	just_over_60_days_ago=$((-1-60*86400)) &&
-
-	test-tool chmtime =$just_over_60_days_ago $rr/preimage &&
-	test-tool chmtime =$almost_60_days_ago $rr/postimage &&
-	test-tool chmtime =$almost_15_days_ago $rr2/preimage
-
-ok 14 - set up for garbage collection tests
-
-expecting success of 4200.15 'gc preserves young or recently used records': 
-	git rerere gc &&
-	test -f $rr/preimage &&
-	test -f $rr2/preimage
-
-ok 15 - gc preserves young or recently used records
-
-expecting success of 4200.16 'old records rest in peace': 
-	test-tool chmtime =$just_over_60_days_ago $rr/postimage &&
-	test-tool chmtime =$just_over_15_days_ago $rr2/preimage &&
-	git rerere gc &&
-	! test -f $rr/preimage &&
-	! test -f $rr2/preimage
-
-ok 16 - old records rest in peace
-
-expecting success of 4200.17 'rerere gc with custom expiry (5, 0)': 
-		rm -fr .git/rr-cache &&
-		rr=.git/rr-cache/$ZERO_OID &&
-		mkdir -p "$rr" &&
-		>"$rr/preimage" &&
-		>"$rr/postimage" &&
-
-		two_days_ago=$((-2*86400)) &&
-		test-tool chmtime =$two_days_ago "$rr/preimage" &&
-		test-tool chmtime =$two_days_ago "$rr/postimage" &&
-
-		find .git/rr-cache -type f | sort >original &&
-
-		git -c "gc.rerereresolved=$five_days" \
-		    -c "gc.rerereunresolved=$five_days" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_cmp original actual &&
-
-		git -c "gc.rerereresolved=$five_days" \
-		    -c "gc.rerereunresolved=$right_now" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_cmp original actual &&
-
-		git -c "gc.rerereresolved=$right_now" \
-		    -c "gc.rerereunresolved=$right_now" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_must_be_empty actual
-	
-ok 17 - rerere gc with custom expiry (5, 0)
-
-expecting success of 4200.18 'rerere gc with custom expiry (5.days.ago, now)': 
-		rm -fr .git/rr-cache &&
-		rr=.git/rr-cache/$ZERO_OID &&
-		mkdir -p "$rr" &&
-		>"$rr/preimage" &&
-		>"$rr/postimage" &&
-
-		two_days_ago=$((-2*86400)) &&
-		test-tool chmtime =$two_days_ago "$rr/preimage" &&
-		test-tool chmtime =$two_days_ago "$rr/postimage" &&
-
-		find .git/rr-cache -type f | sort >original &&
-
-		git -c "gc.rerereresolved=$five_days" \
-		    -c "gc.rerereunresolved=$five_days" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_cmp original actual &&
-
-		git -c "gc.rerereresolved=$five_days" \
-		    -c "gc.rerereunresolved=$right_now" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_cmp original actual &&
-
-		git -c "gc.rerereresolved=$right_now" \
-		    -c "gc.rerereunresolved=$right_now" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_must_be_empty actual
-	
-ok 18 - rerere gc with custom expiry (5.days.ago, now)
-
-expecting success of 4200.19 'setup: file2 added differently in two branches': 
-	git reset --hard &&
-
-	git checkout -b fourth &&
-	echo Hallo >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m version1 &&
-
-	git checkout third &&
-	echo Bello >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m version2 &&
-
-	test_must_fail git merge fourth &&
-	echo Cello >file2 &&
-	git add file2 &&
-	git commit -m resolution
-
-HEAD is now at 40cb797 third
-Switched to a new branch 'fourth'
-[fourth 26401ec] version1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Switched to branch 'third'
-[third 1f50303] version2
- 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
-Recorded preimage for 'file2'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded resolution for 'file2'.
-[third e9acb28] resolution
- Author: A U Thor <author@example.com>
-ok 19 - setup: file2 added differently in two branches
-
-expecting success of 4200.20 'resolution was recorded properly': 
-	echo Cello >expected &&
-
-	git reset --hard HEAD~2 &&
-	git checkout -b fifth &&
-
-	echo Hallo >file3 &&
-	git add file3 &&
-	test_tick &&
-	git commit -m version1 &&
-
-	git checkout third &&
-	echo Bello >file3 &&
-	git add file3 &&
-	test_tick &&
-	git commit -m version2 &&
-	git tag version2 &&
-
-	test_must_fail git merge fifth &&
-	test_cmp expected file3 &&
-	test_must_fail git update-index --refresh
-
-HEAD is now at 40cb797 third
-Switched to a new branch 'fifth'
-[fifth 9b6b3c4] version1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Switched to branch 'third'
-[third 7eec302] version2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Auto-merging file3
-CONFLICT (add/add): Merge conflict in file3
-Resolved 'file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-file3: needs merge
-ok 20 - resolution was recorded properly
-
-expecting success of 4200.21 'rerere.autoupdate': 
-	git config rerere.autoupdate true &&
-	git reset --hard &&
-	git checkout version2 &&
-	test_must_fail git merge fifth &&
-	git update-index --refresh
-
-HEAD is now at 7eec302 version2
-Note: switching to 'version2'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 7eec302 version2
-Auto-merging file3
-CONFLICT (add/add): Merge conflict in file3
-Staged 'file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 21 - rerere.autoupdate
-
-expecting success of 4200.22 'merge --rerere-autoupdate': 
-	test_might_fail git config --unset rerere.autoupdate &&
-	git reset --hard &&
-	git checkout version2 &&
-	test_must_fail git merge --rerere-autoupdate fifth &&
-	git update-index --refresh
-
-HEAD is now at 7eec302 version2
-HEAD is now at 7eec302 version2
-Auto-merging file3
-CONFLICT (add/add): Merge conflict in file3
-Staged 'file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 22 - merge --rerere-autoupdate
-
-expecting success of 4200.23 'merge --no-rerere-autoupdate': 
-	headblob=$(git rev-parse version2:file3) &&
-	mergeblob=$(git rev-parse fifth:file3) &&
-	cat >expected <<-EOF &&
-	100644 $headblob 2	file3
-	100644 $mergeblob 3	file3
-	EOF
-
-	git config rerere.autoupdate true &&
-	git reset --hard &&
-	git checkout version2 &&
-	test_must_fail git merge --no-rerere-autoupdate fifth &&
-	git ls-files -u >actual &&
-	test_cmp expected actual
-
-HEAD is now at 7eec302 version2
-HEAD is now at 7eec302 version2
-Auto-merging file3
-CONFLICT (add/add): Merge conflict in file3
-Resolved 'file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 23 - merge --no-rerere-autoupdate
-
-expecting success of 4200.24 'set up an unresolved merge': 
-	headblob=$(git rev-parse version2:file3) &&
-	mergeblob=$(git rev-parse fifth:file3) &&
-	cat >expected.unresolved <<-EOF &&
-	100644 $headblob 2	file3
-	100644 $mergeblob 3	file3
-	EOF
-
-	test_might_fail git config --unset rerere.autoupdate &&
-	git reset --hard &&
-	git checkout version2 &&
-	ancestor=$(git merge-base version2 fifth) &&
-	test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
-
-	git ls-files --stage >failedmerge &&
-	cp file3 file3.conflict &&
-
-	git ls-files -u >actual &&
-	test_cmp expected.unresolved actual
-
-HEAD is now at 7eec302 version2
-HEAD is now at 7eec302 version2
-Merging HEAD with fifth
-Merging:
-7eec302 version2
-9b6b3c4 version1
-found 1 common ancestor:
-40cb797 third
-CONFLICT (add/add): Merge conflict in file3
-Auto-merging file3
-ok 24 - set up an unresolved merge
-
-expecting success of 4200.25 'explicit rerere': 
-	test_might_fail git config --unset rerere.autoupdate &&
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	test_must_fail git update-index --refresh -q &&
-
-	git rerere &&
-	git ls-files -u >actual &&
-	test_cmp expected.unresolved actual
-
-rm 'a1'
-rm 'file3'
-rm 'file3'
-file3: needs merge
-Resolved 'file3' using previous resolution.
-ok 25 - explicit rerere
-
-expecting success of 4200.26 'explicit rerere with autoupdate': 
-	git config rerere.autoupdate true &&
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	test_must_fail git update-index --refresh -q &&
-
-	git rerere &&
-	git update-index --refresh
-
-rm 'a1'
-rm 'file3'
-rm 'file3'
-file3: needs merge
-Staged 'file3' using previous resolution.
-ok 26 - explicit rerere with autoupdate
-
-expecting success of 4200.27 'explicit rerere --rerere-autoupdate overrides': 
-	git config rerere.autoupdate false &&
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	git rerere &&
-	git ls-files -u >actual1 &&
-
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	git rerere --rerere-autoupdate &&
-	git update-index --refresh &&
-
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	git rerere --rerere-autoupdate --no-rerere-autoupdate &&
-	git ls-files -u >actual2 &&
-
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
-	git update-index --refresh &&
-
-	test_cmp expected.unresolved actual1 &&
-	test_cmp expected.unresolved actual2
-
-rm 'a1'
-rm 'file3'
-Resolved 'file3' using previous resolution.
-rm 'a1'
-rm 'file3'
-rm 'file3'
-Staged 'file3' using previous resolution.
-rm 'a1'
-rm 'file3'
-Resolved 'file3' using previous resolution.
-rm 'a1'
-rm 'file3'
-rm 'file3'
-Staged 'file3' using previous resolution.
-ok 27 - explicit rerere --rerere-autoupdate overrides
-
-expecting success of 4200.28 'rerere --no-no-rerere-autoupdate': 
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
-	test_grep [Uu]sage err &&
-	test_must_fail git update-index --refresh
-
-rm 'a1'
-rm 'file3'
-usage: git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]
-file3: needs merge
-ok 28 - rerere --no-no-rerere-autoupdate
-
-expecting success of 4200.29 'rerere -h': 
-	test_must_fail git rerere -h >help &&
-	test_grep [Uu]sage help
-
-usage: git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]
-ok 29 - rerere -h
-
-expecting success of 4200.30 'multiple identical conflicts': 
-	rm -fr .git/rr-cache &&
-	mkdir .git/rr-cache &&
-	git reset --hard &&
-
-	test_seq 1 6 >early &&
-	>late &&
-	test_seq 11 15 >short &&
-	test_seq 111 120 >long &&
-	concat_insert short >file1 &&
-	concat_insert long >file2 &&
-	git add file1 file2 &&
-	git commit -m base &&
-	git tag base &&
-	git checkout -b six.1 &&
-	concat_insert short 6.1 >file1 &&
-	concat_insert long 6.1 >file2 &&
-	git add file1 file2 &&
-	git commit -m 6.1 &&
-	git checkout -b six.2 HEAD^ &&
-	concat_insert short 6.2 >file1 &&
-	concat_insert long 6.2 >file2 &&
-	git add file1 file2 &&
-	git commit -m 6.2 &&
-
-	# At this point, six.1 and six.2
-	# - derive from common ancestor that has two files
-	#   1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
-	# - six.1 replaces these 7s with 6.1
-	# - six.2 replaces these 7s with 6.2
-
-	merge_conflict_resolve &&
-
-	# Check that rerere knows that file1 and file2 have conflicts
-
-	printf "%s\n" file1 file2 >expect &&
-	git ls-files -u | sed -e "s/^.*	//" | sort -u >actual &&
-	test_cmp expect actual &&
-
-	git rerere status | sort >actual &&
-	test_cmp expect actual &&
-
-	git rerere remaining >actual &&
-	test_cmp expect actual &&
-
-	count_pre_post 2 0 &&
-
-	# Pretend that the conflicts were made quite some time ago
-	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
-
-	# Unresolved entries have not expired yet
-	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
-	count_pre_post 2 0 &&
-
-	# Unresolved entries have expired
-	git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
-	count_pre_post 0 0 &&
-
-	# Recreate the conflicted state
-	merge_conflict_resolve &&
-	count_pre_post 2 0 &&
-
-	# Clear it
-	git rerere clear &&
-	count_pre_post 0 0 &&
-
-	# Recreate the conflicted state
-	merge_conflict_resolve &&
-	count_pre_post 2 0 &&
-
-	# We resolved file1 and file2
-	git rerere &&
-	git rerere remaining >actual &&
-	test_must_be_empty actual &&
-
-	# We must have recorded both of them
-	count_pre_post 2 2 &&
-
-	# Now we should be able to resolve them both
-	git reset --hard &&
-	test_must_fail git merge six.1 &&
-	git rerere &&
-
-	git rerere remaining >actual &&
-	test_must_be_empty actual &&
-
-	concat_insert short 6.1 6.2 >file1.expect &&
-	concat_insert long 6.1 6.2 >file2.expect &&
-	test_cmp file1.expect file1 &&
-	test_cmp file2.expect file2 &&
-
-	# Forget resolution for file2
-	git rerere forget file2 &&
-	echo file2 >expect &&
-	git rerere status >actual &&
-	test_cmp expect actual &&
-	count_pre_post 2 1 &&
-
-	# file2 already has correct resolution, so record it again
-	git rerere &&
-
-	# Pretend that the resolutions are old again
-	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
-
-	# Resolved entries have not expired yet
-	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
-
-	count_pre_post 2 2 &&
-
-	# Resolved entries have expired
-	git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
-	count_pre_post 0 0
-
-HEAD is now at 7eec302 version2
-[detached HEAD 40e0609] base
- Author: A U Thor <author@example.com>
- 2 files changed, 29 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'six.1'
-[six.1 605006b] 6.1
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'six.2'
-[six.2 ba09fec] 6.2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-HEAD is now at ba09fec 6.2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging file2
-CONFLICT (content): Merge conflict in file2
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at ba09fec 6.2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging file2
-CONFLICT (content): Merge conflict in file2
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at ba09fec 6.2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging file2
-CONFLICT (content): Merge conflict in file2
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-HEAD is now at ba09fec 6.2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging file2
-CONFLICT (content): Merge conflict in file2
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Updated preimage for 'file2'
-Forgot resolution for 'file2'
-Recorded resolution for 'file2'.
-ok 30 - multiple identical conflicts
-
-expecting success of 4200.31 'rerere with unexpected conflict markers does not crash': 
-	git reset --hard &&
-
-	git checkout -b branch-1 main &&
-	echo "bar" >test &&
-	git add test &&
-	git commit -q -m two &&
-
-	git reset --hard &&
-	git checkout -b branch-2 main &&
-	echo "foo" >test &&
-	git add test &&
-	git commit -q -a -m one &&
-
-	test_must_fail git merge branch-1 &&
-	echo "<<<<<<< a" >test &&
-	git rerere &&
-
-	git rerere clear
-
-HEAD is now at ba09fec 6.2
-Switched to a new branch 'branch-1'
-HEAD is now at 5727ee8 two
-Switched to a new branch 'branch-2'
-Auto-merging test
-CONFLICT (add/add): Merge conflict in test
-Recorded preimage for 'test'
-Automatic merge failed; fix conflicts and then commit the result.
-error: could not parse conflict hunks in 'test'
-ok 31 - rerere with unexpected conflict markers does not crash
-
-expecting success of 4200.32 'rerere with inner conflict markers': 
-	git reset --hard &&
-
-	git checkout -b A main &&
-	echo "bar" >test &&
-	git add test &&
-	git commit -q -m two &&
-	echo "baz" >test &&
-	git add test &&
-	git commit -q -m three &&
-
-	git reset --hard &&
-	git checkout -b B main &&
-	echo "foo" >test &&
-	git add test &&
-	git commit -q -a -m one &&
-
-	test_must_fail git merge A~ &&
-	git add test &&
-	git commit -q -m "will solve conflicts later" &&
-	test_must_fail git merge A &&
-
-	echo "resolved" >test &&
-	git add test &&
-	git commit -q -m "solved conflict" &&
-
-	echo "resolved" >expect &&
-
-	git reset --hard HEAD~~ &&
-	test_must_fail git merge A~ &&
-	git add test &&
-	git commit -q -m "will solve conflicts later" &&
-	test_must_fail git merge A &&
-	cat test >actual &&
-	test_cmp expect actual &&
-
-	git add test &&
-	git commit -m "rerere solved conflict" &&
-	git reset --hard HEAD~ &&
-	test_must_fail git merge A &&
-	cat test >actual &&
-	test_cmp expect actual
-
-HEAD is now at 95c3f31 one
-Switched to a new branch 'A'
-HEAD is now at 8f8d617 three
-Switched to a new branch 'B'
-Auto-merging test
-CONFLICT (add/add): Merge conflict in test
-Recorded preimage for 'test'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded preimage for 'test'
-Auto-merging test
-CONFLICT (content): Merge conflict in test
-Recorded preimage for 'test'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded resolution for 'test'.
-HEAD is now at 95c3f31 one
-Auto-merging test
-CONFLICT (add/add): Merge conflict in test
-Recorded preimage for 'test'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded preimage for 'test'
-Auto-merging test
-CONFLICT (content): Merge conflict in test
-Resolved 'test' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-[B c1558e5] rerere solved conflict
- Author: A U Thor <author@example.com>
-HEAD is now at 35eb3e9 will solve conflicts later
-Auto-merging test
-CONFLICT (content): Merge conflict in test
-Resolved 'test' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 32 - rerere with inner conflict markers
-
-expecting success of 4200.33 'setup simple stage 1 handling': 
-	test_create_repo stage_1_handling &&
-	(
-		cd stage_1_handling &&
-
-		test_seq 1 10 >original &&
-		git add original &&
-		git commit -m original &&
-
-		git checkout -b A main &&
-		git mv original A &&
-		git commit -m "rename to A" &&
-
-		git checkout -b B main &&
-		git mv original B &&
-		git commit -m "rename to B"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4200-rerere/stage_1_handling/.git/
-[main (root-commit) 64a4a07] original
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 original
-Switched to a new branch 'A'
-[A cc792a7] rename to A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename original => A (100%)
-Switched to a new branch 'B'
-[B 02c49bb] rename to B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename original => B (100%)
-ok 33 - setup simple stage 1 handling
-
-expecting success of 4200.34 'test simple stage 1 handling': 
-	(
-		cd stage_1_handling &&
-
-		git config rerere.enabled true &&
-		git checkout A^0 &&
-		test_must_fail git merge B^0
-	)
-
-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 cc792a7 rename to A
-CONFLICT (rename/rename): original renamed to A in HEAD and to B in B^0.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 34 - test simple stage 1 handling
-
-expecting success of 4200.35 'rerere does not crash with missing preimage': 
-	git config rerere.enabled true &&
-
-	echo bar >test &&
-	git add test &&
-	git commit -m "one" &&
-	git branch rerere_no_crash &&
-
-	echo foo >>test &&
-	git add test &&
-	git commit -m "two" &&
-
-	git checkout rerere_no_crash &&
-	echo "bar" >>test &&
-	git add test &&
-	git commit -m "three" &&
-
-	test_must_fail git rebase main &&
-	rm .git/rr-cache/*/preimage &&
-	git rebase --abort
-
-[B a3f0d47] one
- Author: A U Thor <author@example.com>
-[B 7aabd2d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'rerere_no_crash'
-[rerere_no_crash ff9691f] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/4)
Auto-merging test
-CONFLICT (add/add): Merge conflict in test
-error: could not apply 5727ee8... 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 advice.mergeConflict false"
-Recorded preimage for 'test'
-Could not apply 5727ee8... two
-ok 35 - rerere does not crash with missing preimage
-
-expecting success of 4200.36 'rerere does not crash with unmatched conflict marker': 
-	git config rerere.enabled true &&
-
-	echo bar >test &&
-	git add test &&
-	git commit -m "one" &&
-	git branch rerere_no_preimage &&
-
-	cat >test <<-EOF &&
-	test
-	bar
-	foobar
-	EOF
-	git add test &&
-	git commit -m "two" &&
-
-	git checkout rerere_no_preimage &&
-	echo "bar" >>test &&
-	git add test &&
-	git commit -m "three" &&
-
-	cat >test <<-EOF &&
-	foobar
-	bar
-	bar
-	EOF
-	git add test &&
-	git commit -m "four" &&
-
-	test_must_fail git rebase main &&
-	cat >test <<-EOF &&
-	test
-	bar
-	<<<<<<< HEAD
-	foobar
-	bar
-	EOF
-	git add test &&
-	test_must_fail git rebase --continue
-
-[rerere_no_crash 3ed30e9] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-[rerere_no_crash 95a54c3] two
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'rerere_no_preimage'
-[rerere_no_preimage 3106135] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[rerere_no_preimage e67475c] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/7)
Auto-merging test
-CONFLICT (add/add): Merge conflict in test
-error: could not apply 5727ee8... 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 advice.mergeConflict false"
-Recorded preimage for 'test'
-Could not apply 5727ee8... two
-error: could not parse conflict hunks in 'test'
-error: could not parse conflict hunks in 'test'
-Recorded preimage for 'test'
-[detached HEAD e60af7c] two
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+), 1 deletion(-)
-Rebasing (3/7)
Auto-merging test
-CONFLICT (content): Merge conflict in test
-error: could not apply 8f8d617... 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 advice.mergeConflict false"
-error: could not parse conflict hunks in 'test'
-Could not apply 8f8d617... three
-ok 36 - rerere does not crash with unmatched conflict marker
-
-# passed all 36 test(s)
-1..36
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4124-apply-ws-rule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4124-apply-ws-rule/.git/
 expecting success of 4124.1 'setup': 
@@ -278476,6 +277394,1089 @@
 1..78
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4200-rerere.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4200-rerere/.git/
+expecting success of 4200.1 'setup': 
+	cat >a1 <<-\EOF &&
+	Some title
+	==========
+	Whether 'tis nobler in the mind to suffer
+	The slings and arrows of outrageous fortune,
+	Or to take arms against a sea of troubles,
+	And by opposing end them? To die: to sleep;
+	No more; and by a sleep to say we end
+	The heart-ache and the thousand natural shocks
+	That flesh is heir to, 'tis a consummation
+	Devoutly to be wish'd.
+	EOF
+
+	git add a1 &&
+	test_tick &&
+	git commit -q -a -m initial &&
+
+	cat >>a1 <<-\EOF &&
+	Some title
+	==========
+	To die, to sleep;
+	To sleep: perchance to dream: ay, there's the rub;
+	For in that sleep of death what dreams may come
+	When we have shuffled off this mortal coil,
+	Must give us pause: there's the respect
+	That makes calamity of so long life;
+	EOF
+
+	git checkout -b first &&
+	test_tick &&
+	git commit -q -a -m first &&
+
+	git checkout -b second main &&
+	git show first:a1 |
+	sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
+	echo "* END *" >>a1 &&
+	test_tick &&
+	git commit -q -a -m second
+
+Switched to a new branch 'first'
+Switched to a new branch 'second'
+ok 1 - setup
+
+expecting success of 4200.2 'nothing recorded without rerere': 
+	rm -rf .git/rr-cache &&
+	git config rerere.enabled false &&
+	test_must_fail git merge first &&
+	! test -d .git/rr-cache
+
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - nothing recorded without rerere
+
+expecting success of 4200.3 'activate rerere, old style (conflicting merge)': 
+	git reset --hard &&
+	mkdir .git/rr-cache &&
+	test_might_fail git config --unset rerere.enabled &&
+	test_must_fail git merge first &&
+
+	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
+	rr=.git/rr-cache/$sha1 &&
+	grep "^=======\$" $rr/preimage &&
+	! test -f $rr/postimage &&
+	! test -f $rr/thisimage
+
+HEAD is now at fcd23fa second
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Recorded preimage for 'a1'
+Automatic merge failed; fix conflicts and then commit the result.
+=======
+=======
+ok 3 - activate rerere, old style (conflicting merge)
+
+expecting success of 4200.4 'rerere.enabled works, too': 
+	rm -rf .git/rr-cache &&
+	git config rerere.enabled true &&
+	git reset --hard &&
+	test_must_fail git merge first &&
+
+	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
+	rr=.git/rr-cache/$sha1 &&
+	grep ^=======$ $rr/preimage
+
+HEAD is now at fcd23fa second
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Recorded preimage for 'a1'
+Automatic merge failed; fix conflicts and then commit the result.
+=======
+=======
+ok 4 - rerere.enabled works, too
+
+expecting success of 4200.5 'set up rr-cache': 
+	rm -rf .git/rr-cache &&
+	git config rerere.enabled true &&
+	git reset --hard &&
+	test_must_fail git merge first &&
+	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
+	rr=.git/rr-cache/$sha1
+
+HEAD is now at fcd23fa second
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Recorded preimage for 'a1'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 5 - set up rr-cache
+
+expecting success of 4200.6 'rr-cache looks sane': 
+	# no postimage or thisimage yet
+	! test -f $rr/postimage &&
+	! test -f $rr/thisimage &&
+
+	# preimage has right number of lines
+	cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
+	echo $cnt &&
+	test $cnt = 13
+
+13
+ok 6 - rr-cache looks sane
+
+expecting success of 4200.7 'rerere diff': 
+	git show first:a1 >a1 &&
+	cat >expect <<-\EOF &&
+	--- a/a1
+	+++ b/a1
+	@@ -1,4 +1,4 @@
+	-Some Title
+	+Some title
+	 ==========
+	 Whether 'tis nobler in the mind to suffer
+	 The slings and arrows of outrageous fortune,
+	@@ -8,21 +8,11 @@
+	 The heart-ache and the thousand natural shocks
+	 That flesh is heir to, 'tis a consummation
+	 Devoutly to be wish'd.
+	-<<<<<<<
+	-Some Title
+	-==========
+	-To die! To sleep;
+	-=======
+	 Some title
+	 ==========
+	 To die, to sleep;
+	->>>>>>>
+	 To sleep: perchance to dream: ay, there's the rub;
+	 For in that sleep of death what dreams may come
+	 When we have shuffled off this mortal coil,
+	 Must give us pause: there's the respect
+	 That makes calamity of so long life;
+	-<<<<<<<
+	-=======
+	-* END *
+	->>>>>>>
+	EOF
+	git rerere diff >out &&
+	test_cmp expect out
+
+ok 7 - rerere diff
+
+expecting success of 4200.8 'rerere status': 
+	echo a1 >expect &&
+	git rerere status >out &&
+	test_cmp expect out
+
+ok 8 - rerere status
+
+expecting success of 4200.9 'first postimage wins': 
+	git show first:a1 | sed "s/To die: t/To die! T/" >expect &&
+
+	git commit -q -a -m "prefer first over second" &&
+	test -f $rr/postimage &&
+
+	oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
+
+	git checkout -b third main &&
+	git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
+	git commit -q -a -m third &&
+
+	test_must_fail git merge first &&
+	# rerere kicked in
+	! grep "^=======\$" a1 &&
+	test_cmp expect a1
+
+Recorded resolution for 'a1'.
+Switched to a new branch 'third'
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Resolved 'a1' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 9 - first postimage wins
+
+expecting success of 4200.10 'rerere updates postimage timestamp': 
+	newmtimepost=$(test-tool chmtime --get $rr/postimage) &&
+	test $oldmtimepost -lt $newmtimepost
+
+ok 10 - rerere updates postimage timestamp
+
+expecting success of 4200.11 'rerere clear': 
+	mv $rr/postimage .git/post-saved &&
+	echo "$sha1	a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
+	git rerere clear &&
+	! test -d $rr
+
+ok 11 - rerere clear
+
+expecting success of 4200.12 'leftover directory': 
+	git reset --hard &&
+	mkdir -p $rr &&
+	test_must_fail git merge first &&
+	test -f $rr/preimage
+
+HEAD is now at 40cb797 third
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Recorded preimage for 'a1'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 12 - leftover directory
+
+expecting success of 4200.13 'missing preimage': 
+	git reset --hard &&
+	mkdir -p $rr &&
+	cp .git/post-saved $rr/postimage &&
+	test_must_fail git merge first &&
+	test -f $rr/preimage
+
+HEAD is now at 40cb797 third
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Resolved 'a1' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 13 - missing preimage
+
+expecting success of 4200.14 'set up for garbage collection tests': 
+	mkdir -p $rr &&
+	echo Hello >$rr/preimage &&
+	echo World >$rr/postimage &&
+
+	sha2=$(test_oid deadbeef) &&
+	rr2=.git/rr-cache/$sha2 &&
+	mkdir $rr2 &&
+	echo Hello >$rr2/preimage &&
+
+	almost_15_days_ago=$((60-15*86400)) &&
+	just_over_15_days_ago=$((-1-15*86400)) &&
+	almost_60_days_ago=$((60-60*86400)) &&
+	just_over_60_days_ago=$((-1-60*86400)) &&
+
+	test-tool chmtime =$just_over_60_days_ago $rr/preimage &&
+	test-tool chmtime =$almost_60_days_ago $rr/postimage &&
+	test-tool chmtime =$almost_15_days_ago $rr2/preimage
+
+ok 14 - set up for garbage collection tests
+
+expecting success of 4200.15 'gc preserves young or recently used records': 
+	git rerere gc &&
+	test -f $rr/preimage &&
+	test -f $rr2/preimage
+
+ok 15 - gc preserves young or recently used records
+
+expecting success of 4200.16 'old records rest in peace': 
+	test-tool chmtime =$just_over_60_days_ago $rr/postimage &&
+	test-tool chmtime =$just_over_15_days_ago $rr2/preimage &&
+	git rerere gc &&
+	! test -f $rr/preimage &&
+	! test -f $rr2/preimage
+
+ok 16 - old records rest in peace
+
+expecting success of 4200.17 'rerere gc with custom expiry (5, 0)': 
+		rm -fr .git/rr-cache &&
+		rr=.git/rr-cache/$ZERO_OID &&
+		mkdir -p "$rr" &&
+		>"$rr/preimage" &&
+		>"$rr/postimage" &&
+
+		two_days_ago=$((-2*86400)) &&
+		test-tool chmtime =$two_days_ago "$rr/preimage" &&
+		test-tool chmtime =$two_days_ago "$rr/postimage" &&
+
+		find .git/rr-cache -type f | sort >original &&
+
+		git -c "gc.rerereresolved=$five_days" \
+		    -c "gc.rerereunresolved=$five_days" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_cmp original actual &&
+
+		git -c "gc.rerereresolved=$five_days" \
+		    -c "gc.rerereunresolved=$right_now" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_cmp original actual &&
+
+		git -c "gc.rerereresolved=$right_now" \
+		    -c "gc.rerereunresolved=$right_now" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_must_be_empty actual
+	
+ok 17 - rerere gc with custom expiry (5, 0)
+
+expecting success of 4200.18 'rerere gc with custom expiry (5.days.ago, now)': 
+		rm -fr .git/rr-cache &&
+		rr=.git/rr-cache/$ZERO_OID &&
+		mkdir -p "$rr" &&
+		>"$rr/preimage" &&
+		>"$rr/postimage" &&
+
+		two_days_ago=$((-2*86400)) &&
+		test-tool chmtime =$two_days_ago "$rr/preimage" &&
+		test-tool chmtime =$two_days_ago "$rr/postimage" &&
+
+		find .git/rr-cache -type f | sort >original &&
+
+		git -c "gc.rerereresolved=$five_days" \
+		    -c "gc.rerereunresolved=$five_days" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_cmp original actual &&
+
+		git -c "gc.rerereresolved=$five_days" \
+		    -c "gc.rerereunresolved=$right_now" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_cmp original actual &&
+
+		git -c "gc.rerereresolved=$right_now" \
+		    -c "gc.rerereunresolved=$right_now" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_must_be_empty actual
+	
+ok 18 - rerere gc with custom expiry (5.days.ago, now)
+
+expecting success of 4200.19 'setup: file2 added differently in two branches': 
+	git reset --hard &&
+
+	git checkout -b fourth &&
+	echo Hallo >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m version1 &&
+
+	git checkout third &&
+	echo Bello >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m version2 &&
+
+	test_must_fail git merge fourth &&
+	echo Cello >file2 &&
+	git add file2 &&
+	git commit -m resolution
+
+HEAD is now at 40cb797 third
+Switched to a new branch 'fourth'
+[fourth 26401ec] version1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Switched to branch 'third'
+[third 1f50303] version2
+ 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
+Recorded preimage for 'file2'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded resolution for 'file2'.
+[third e9acb28] resolution
+ Author: A U Thor <author@example.com>
+ok 19 - setup: file2 added differently in two branches
+
+expecting success of 4200.20 'resolution was recorded properly': 
+	echo Cello >expected &&
+
+	git reset --hard HEAD~2 &&
+	git checkout -b fifth &&
+
+	echo Hallo >file3 &&
+	git add file3 &&
+	test_tick &&
+	git commit -m version1 &&
+
+	git checkout third &&
+	echo Bello >file3 &&
+	git add file3 &&
+	test_tick &&
+	git commit -m version2 &&
+	git tag version2 &&
+
+	test_must_fail git merge fifth &&
+	test_cmp expected file3 &&
+	test_must_fail git update-index --refresh
+
+HEAD is now at 40cb797 third
+Switched to a new branch 'fifth'
+[fifth 9b6b3c4] version1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Switched to branch 'third'
+[third 7eec302] version2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Auto-merging file3
+CONFLICT (add/add): Merge conflict in file3
+Resolved 'file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+file3: needs merge
+ok 20 - resolution was recorded properly
+
+expecting success of 4200.21 'rerere.autoupdate': 
+	git config rerere.autoupdate true &&
+	git reset --hard &&
+	git checkout version2 &&
+	test_must_fail git merge fifth &&
+	git update-index --refresh
+
+HEAD is now at 7eec302 version2
+Note: switching to 'version2'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 7eec302 version2
+Auto-merging file3
+CONFLICT (add/add): Merge conflict in file3
+Staged 'file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 21 - rerere.autoupdate
+
+expecting success of 4200.22 'merge --rerere-autoupdate': 
+	test_might_fail git config --unset rerere.autoupdate &&
+	git reset --hard &&
+	git checkout version2 &&
+	test_must_fail git merge --rerere-autoupdate fifth &&
+	git update-index --refresh
+
+HEAD is now at 7eec302 version2
+HEAD is now at 7eec302 version2
+Auto-merging file3
+CONFLICT (add/add): Merge conflict in file3
+Staged 'file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 22 - merge --rerere-autoupdate
+
+expecting success of 4200.23 'merge --no-rerere-autoupdate': 
+	headblob=$(git rev-parse version2:file3) &&
+	mergeblob=$(git rev-parse fifth:file3) &&
+	cat >expected <<-EOF &&
+	100644 $headblob 2	file3
+	100644 $mergeblob 3	file3
+	EOF
+
+	git config rerere.autoupdate true &&
+	git reset --hard &&
+	git checkout version2 &&
+	test_must_fail git merge --no-rerere-autoupdate fifth &&
+	git ls-files -u >actual &&
+	test_cmp expected actual
+
+HEAD is now at 7eec302 version2
+HEAD is now at 7eec302 version2
+Auto-merging file3
+CONFLICT (add/add): Merge conflict in file3
+Resolved 'file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 23 - merge --no-rerere-autoupdate
+
+expecting success of 4200.24 'set up an unresolved merge': 
+	headblob=$(git rev-parse version2:file3) &&
+	mergeblob=$(git rev-parse fifth:file3) &&
+	cat >expected.unresolved <<-EOF &&
+	100644 $headblob 2	file3
+	100644 $mergeblob 3	file3
+	EOF
+
+	test_might_fail git config --unset rerere.autoupdate &&
+	git reset --hard &&
+	git checkout version2 &&
+	ancestor=$(git merge-base version2 fifth) &&
+	test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
+
+	git ls-files --stage >failedmerge &&
+	cp file3 file3.conflict &&
+
+	git ls-files -u >actual &&
+	test_cmp expected.unresolved actual
+
+HEAD is now at 7eec302 version2
+HEAD is now at 7eec302 version2
+Merging HEAD with fifth
+Merging:
+7eec302 version2
+9b6b3c4 version1
+found 1 common ancestor:
+40cb797 third
+CONFLICT (add/add): Merge conflict in file3
+Auto-merging file3
+ok 24 - set up an unresolved merge
+
+expecting success of 4200.25 'explicit rerere': 
+	test_might_fail git config --unset rerere.autoupdate &&
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	test_must_fail git update-index --refresh -q &&
+
+	git rerere &&
+	git ls-files -u >actual &&
+	test_cmp expected.unresolved actual
+
+rm 'a1'
+rm 'file3'
+rm 'file3'
+file3: needs merge
+Resolved 'file3' using previous resolution.
+ok 25 - explicit rerere
+
+expecting success of 4200.26 'explicit rerere with autoupdate': 
+	git config rerere.autoupdate true &&
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	test_must_fail git update-index --refresh -q &&
+
+	git rerere &&
+	git update-index --refresh
+
+rm 'a1'
+rm 'file3'
+rm 'file3'
+file3: needs merge
+Staged 'file3' using previous resolution.
+ok 26 - explicit rerere with autoupdate
+
+expecting success of 4200.27 'explicit rerere --rerere-autoupdate overrides': 
+	git config rerere.autoupdate false &&
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	git rerere &&
+	git ls-files -u >actual1 &&
+
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	git rerere --rerere-autoupdate &&
+	git update-index --refresh &&
+
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	git rerere --rerere-autoupdate --no-rerere-autoupdate &&
+	git ls-files -u >actual2 &&
+
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
+	git update-index --refresh &&
+
+	test_cmp expected.unresolved actual1 &&
+	test_cmp expected.unresolved actual2
+
+rm 'a1'
+rm 'file3'
+Resolved 'file3' using previous resolution.
+rm 'a1'
+rm 'file3'
+rm 'file3'
+Staged 'file3' using previous resolution.
+rm 'a1'
+rm 'file3'
+Resolved 'file3' using previous resolution.
+rm 'a1'
+rm 'file3'
+rm 'file3'
+Staged 'file3' using previous resolution.
+ok 27 - explicit rerere --rerere-autoupdate overrides
+
+expecting success of 4200.28 'rerere --no-no-rerere-autoupdate': 
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
+	test_grep [Uu]sage err &&
+	test_must_fail git update-index --refresh
+
+rm 'a1'
+rm 'file3'
+usage: git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]
+file3: needs merge
+ok 28 - rerere --no-no-rerere-autoupdate
+
+expecting success of 4200.29 'rerere -h': 
+	test_must_fail git rerere -h >help &&
+	test_grep [Uu]sage help
+
+usage: git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]
+ok 29 - rerere -h
+
+expecting success of 4200.30 'multiple identical conflicts': 
+	rm -fr .git/rr-cache &&
+	mkdir .git/rr-cache &&
+	git reset --hard &&
+
+	test_seq 1 6 >early &&
+	>late &&
+	test_seq 11 15 >short &&
+	test_seq 111 120 >long &&
+	concat_insert short >file1 &&
+	concat_insert long >file2 &&
+	git add file1 file2 &&
+	git commit -m base &&
+	git tag base &&
+	git checkout -b six.1 &&
+	concat_insert short 6.1 >file1 &&
+	concat_insert long 6.1 >file2 &&
+	git add file1 file2 &&
+	git commit -m 6.1 &&
+	git checkout -b six.2 HEAD^ &&
+	concat_insert short 6.2 >file1 &&
+	concat_insert long 6.2 >file2 &&
+	git add file1 file2 &&
+	git commit -m 6.2 &&
+
+	# At this point, six.1 and six.2
+	# - derive from common ancestor that has two files
+	#   1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
+	# - six.1 replaces these 7s with 6.1
+	# - six.2 replaces these 7s with 6.2
+
+	merge_conflict_resolve &&
+
+	# Check that rerere knows that file1 and file2 have conflicts
+
+	printf "%s\n" file1 file2 >expect &&
+	git ls-files -u | sed -e "s/^.*	//" | sort -u >actual &&
+	test_cmp expect actual &&
+
+	git rerere status | sort >actual &&
+	test_cmp expect actual &&
+
+	git rerere remaining >actual &&
+	test_cmp expect actual &&
+
+	count_pre_post 2 0 &&
+
+	# Pretend that the conflicts were made quite some time ago
+	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
+
+	# Unresolved entries have not expired yet
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+	count_pre_post 2 0 &&
+
+	# Unresolved entries have expired
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
+	count_pre_post 0 0 &&
+
+	# Recreate the conflicted state
+	merge_conflict_resolve &&
+	count_pre_post 2 0 &&
+
+	# Clear it
+	git rerere clear &&
+	count_pre_post 0 0 &&
+
+	# Recreate the conflicted state
+	merge_conflict_resolve &&
+	count_pre_post 2 0 &&
+
+	# We resolved file1 and file2
+	git rerere &&
+	git rerere remaining >actual &&
+	test_must_be_empty actual &&
+
+	# We must have recorded both of them
+	count_pre_post 2 2 &&
+
+	# Now we should be able to resolve them both
+	git reset --hard &&
+	test_must_fail git merge six.1 &&
+	git rerere &&
+
+	git rerere remaining >actual &&
+	test_must_be_empty actual &&
+
+	concat_insert short 6.1 6.2 >file1.expect &&
+	concat_insert long 6.1 6.2 >file2.expect &&
+	test_cmp file1.expect file1 &&
+	test_cmp file2.expect file2 &&
+
+	# Forget resolution for file2
+	git rerere forget file2 &&
+	echo file2 >expect &&
+	git rerere status >actual &&
+	test_cmp expect actual &&
+	count_pre_post 2 1 &&
+
+	# file2 already has correct resolution, so record it again
+	git rerere &&
+
+	# Pretend that the resolutions are old again
+	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
+
+	# Resolved entries have not expired yet
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+
+	count_pre_post 2 2 &&
+
+	# Resolved entries have expired
+	git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
+	count_pre_post 0 0
+
+HEAD is now at 7eec302 version2
+[detached HEAD 40e0609] base
+ Author: A U Thor <author@example.com>
+ 2 files changed, 29 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'six.1'
+[six.1 605006b] 6.1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'six.2'
+[six.2 ba09fec] 6.2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+HEAD is now at ba09fec 6.2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging file2
+CONFLICT (content): Merge conflict in file2
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at ba09fec 6.2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging file2
+CONFLICT (content): Merge conflict in file2
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at ba09fec 6.2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging file2
+CONFLICT (content): Merge conflict in file2
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+HEAD is now at ba09fec 6.2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging file2
+CONFLICT (content): Merge conflict in file2
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Updated preimage for 'file2'
+Forgot resolution for 'file2'
+Recorded resolution for 'file2'.
+ok 30 - multiple identical conflicts
+
+expecting success of 4200.31 'rerere with unexpected conflict markers does not crash': 
+	git reset --hard &&
+
+	git checkout -b branch-1 main &&
+	echo "bar" >test &&
+	git add test &&
+	git commit -q -m two &&
+
+	git reset --hard &&
+	git checkout -b branch-2 main &&
+	echo "foo" >test &&
+	git add test &&
+	git commit -q -a -m one &&
+
+	test_must_fail git merge branch-1 &&
+	echo "<<<<<<< a" >test &&
+	git rerere &&
+
+	git rerere clear
+
+HEAD is now at ba09fec 6.2
+Switched to a new branch 'branch-1'
+HEAD is now at 5727ee8 two
+Switched to a new branch 'branch-2'
+Auto-merging test
+CONFLICT (add/add): Merge conflict in test
+Recorded preimage for 'test'
+Automatic merge failed; fix conflicts and then commit the result.
+error: could not parse conflict hunks in 'test'
+ok 31 - rerere with unexpected conflict markers does not crash
+
+expecting success of 4200.32 'rerere with inner conflict markers': 
+	git reset --hard &&
+
+	git checkout -b A main &&
+	echo "bar" >test &&
+	git add test &&
+	git commit -q -m two &&
+	echo "baz" >test &&
+	git add test &&
+	git commit -q -m three &&
+
+	git reset --hard &&
+	git checkout -b B main &&
+	echo "foo" >test &&
+	git add test &&
+	git commit -q -a -m one &&
+
+	test_must_fail git merge A~ &&
+	git add test &&
+	git commit -q -m "will solve conflicts later" &&
+	test_must_fail git merge A &&
+
+	echo "resolved" >test &&
+	git add test &&
+	git commit -q -m "solved conflict" &&
+
+	echo "resolved" >expect &&
+
+	git reset --hard HEAD~~ &&
+	test_must_fail git merge A~ &&
+	git add test &&
+	git commit -q -m "will solve conflicts later" &&
+	test_must_fail git merge A &&
+	cat test >actual &&
+	test_cmp expect actual &&
+
+	git add test &&
+	git commit -m "rerere solved conflict" &&
+	git reset --hard HEAD~ &&
+	test_must_fail git merge A &&
+	cat test >actual &&
+	test_cmp expect actual
+
+HEAD is now at 95c3f31 one
+Switched to a new branch 'A'
+HEAD is now at 8f8d617 three
+Switched to a new branch 'B'
+Auto-merging test
+CONFLICT (add/add): Merge conflict in test
+Recorded preimage for 'test'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded preimage for 'test'
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Recorded preimage for 'test'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded resolution for 'test'.
+HEAD is now at 95c3f31 one
+Auto-merging test
+CONFLICT (add/add): Merge conflict in test
+Recorded preimage for 'test'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded preimage for 'test'
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Resolved 'test' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+[B c1558e5] rerere solved conflict
+ Author: A U Thor <author@example.com>
+HEAD is now at 35eb3e9 will solve conflicts later
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Resolved 'test' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 32 - rerere with inner conflict markers
+
+expecting success of 4200.33 'setup simple stage 1 handling': 
+	test_create_repo stage_1_handling &&
+	(
+		cd stage_1_handling &&
+
+		test_seq 1 10 >original &&
+		git add original &&
+		git commit -m original &&
+
+		git checkout -b A main &&
+		git mv original A &&
+		git commit -m "rename to A" &&
+
+		git checkout -b B main &&
+		git mv original B &&
+		git commit -m "rename to B"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4200-rerere/stage_1_handling/.git/
+[main (root-commit) 64a4a07] original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 original
+Switched to a new branch 'A'
+[A cc792a7] rename to A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename original => A (100%)
+Switched to a new branch 'B'
+[B 02c49bb] rename to B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename original => B (100%)
+ok 33 - setup simple stage 1 handling
+
+expecting success of 4200.34 'test simple stage 1 handling': 
+	(
+		cd stage_1_handling &&
+
+		git config rerere.enabled true &&
+		git checkout A^0 &&
+		test_must_fail git merge B^0
+	)
+
+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 cc792a7 rename to A
+CONFLICT (rename/rename): original renamed to A in HEAD and to B in B^0.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 34 - test simple stage 1 handling
+
+expecting success of 4200.35 'rerere does not crash with missing preimage': 
+	git config rerere.enabled true &&
+
+	echo bar >test &&
+	git add test &&
+	git commit -m "one" &&
+	git branch rerere_no_crash &&
+
+	echo foo >>test &&
+	git add test &&
+	git commit -m "two" &&
+
+	git checkout rerere_no_crash &&
+	echo "bar" >>test &&
+	git add test &&
+	git commit -m "three" &&
+
+	test_must_fail git rebase main &&
+	rm .git/rr-cache/*/preimage &&
+	git rebase --abort
+
+[B a3f0d47] one
+ Author: A U Thor <author@example.com>
+[B 7aabd2d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'rerere_no_crash'
+[rerere_no_crash ff9691f] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/4)
Auto-merging test
+CONFLICT (add/add): Merge conflict in test
+error: could not apply 5727ee8... 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 advice.mergeConflict false"
+Recorded preimage for 'test'
+Could not apply 5727ee8... two
+ok 35 - rerere does not crash with missing preimage
+
+expecting success of 4200.36 'rerere does not crash with unmatched conflict marker': 
+	git config rerere.enabled true &&
+
+	echo bar >test &&
+	git add test &&
+	git commit -m "one" &&
+	git branch rerere_no_preimage &&
+
+	cat >test <<-EOF &&
+	test
+	bar
+	foobar
+	EOF
+	git add test &&
+	git commit -m "two" &&
+
+	git checkout rerere_no_preimage &&
+	echo "bar" >>test &&
+	git add test &&
+	git commit -m "three" &&
+
+	cat >test <<-EOF &&
+	foobar
+	bar
+	bar
+	EOF
+	git add test &&
+	git commit -m "four" &&
+
+	test_must_fail git rebase main &&
+	cat >test <<-EOF &&
+	test
+	bar
+	<<<<<<< HEAD
+	foobar
+	bar
+	EOF
+	git add test &&
+	test_must_fail git rebase --continue
+
+[rerere_no_crash 3ed30e9] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[rerere_no_crash 95a54c3] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'rerere_no_preimage'
+[rerere_no_preimage 3106135] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[rerere_no_preimage e67475c] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/7)
Auto-merging test
+CONFLICT (add/add): Merge conflict in test
+error: could not apply 5727ee8... 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 advice.mergeConflict false"
+Recorded preimage for 'test'
+Could not apply 5727ee8... two
+error: could not parse conflict hunks in 'test'
+error: could not parse conflict hunks in 'test'
+Recorded preimage for 'test'
+[detached HEAD e60af7c] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+Rebasing (3/7)
Auto-merging test
+CONFLICT (content): Merge conflict in test
+error: could not apply 8f8d617... 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 advice.mergeConflict false"
+error: could not parse conflict hunks in 'test'
+Could not apply 8f8d617... three
+ok 36 - rerere does not crash with unmatched conflict marker
+
+# passed all 36 test(s)
+1..36
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4211-line-log.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4211-line-log/.git/
 expecting success of 4211.1 'setup (import history)': 
@@ -282310,6 +282311,314 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4258-am-quoted-cr.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4258-am-quoted-cr/.git/
+expecting success of 4258.1 'setup': 
+	test_write_lines one two three >text &&
+	test_commit one text &&
+	test_write_lines one owt three >text &&
+	test_commit two text
+
+[master (root-commit) 6f47e65] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 text
+[master 8ff8b1d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 4258.2 'am warn if quoted-cr is found': 
+	git reset --hard one &&
+	test_must_fail git am "$DATA/mbox" 2>err &&
+	grep "quoted CRLF detected" err
+
+HEAD is now at 6f47e65 one
+Applying: sample
+Patch failed at 0001 sample
+warning: quoted CRLF detected
+ok 2 - am warn if quoted-cr is found
+
+expecting success of 4258.3 'am --quoted-cr=strip': 
+	test_might_fail git am --abort &&
+	git reset --hard one &&
+	git am --quoted-cr=strip "$DATA/mbox" &&
+	git diff --exit-code HEAD two
+
+HEAD is now at 6f47e65 one
+Applying: sample
+ok 3 - am --quoted-cr=strip
+
+expecting success of 4258.4 'am with config mailinfo.quotedCr=strip': 
+	test_might_fail git am --abort &&
+	git reset --hard one &&
+	test_config mailinfo.quotedCr strip &&
+	git am "$DATA/mbox" &&
+	git diff --exit-code HEAD two
+
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at 6f47e65 one
+Applying: sample
+ok 4 - am with config mailinfo.quotedCr=strip
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4213-log-tabexpand.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4213-log-tabexpand/.git/
+expecting success of 4213.1 'setup': 
+	test_tick &&
+	sed -e "s/Q/$HT/g" <<-EOF >msg &&
+	Q$title
+
+	Q$body
+	EOF
+	git commit --allow-empty -F msg
+
+[master (root-commit) 4243c44] 	tab indent at the beginning of the title line
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 4213.2 'expand/no-expand': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 2 - expand/no-expand
+
+expecting success of 4213.3 'expand/no-expand for --pretty': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 3 - expand/no-expand for --pretty
+
+expecting success of 4213.4 'expand/no-expand for --pretty=short': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 4 - expand/no-expand for --pretty=short
+
+expecting success of 4213.5 'expand/no-expand for --pretty=medium': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 5 - expand/no-expand for --pretty=medium
+
+expecting success of 4213.6 'expand/no-expand for --pretty=full': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 6 - expand/no-expand for --pretty=full
+
+expecting success of 4213.7 'expand/no-expand for --pretty=fuller': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 7 - expand/no-expand for --pretty=fuller
+
+expecting success of 4213.8 'expand/no-expand for --pretty=raw': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 8 - expand/no-expand for --pretty=raw
+
+expecting success of 4213.9 'expand/no-expand for --pretty=email': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 9 - expand/no-expand for --pretty=email
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4257-am-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4257-am-interactive/.git/
+expecting success of 4257.1 'set up patches to apply': 
+	test_commit unrelated &&
+	test_commit no-conflict &&
+	test_commit conflict-patch file patch &&
+	git format-patch --stdout -2 >mbox &&
+
+	git reset --hard unrelated &&
+	test_commit conflict-main file main base
+
+[master (root-commit) 16dd07d] unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated.t
+[master 7c8fce7] no-conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 no-conflict.t
+[master fe3fedc] conflict-patch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+HEAD is now at 16dd07d unrelated
+[master 73a3f21] conflict-main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - set up patches to apply
+
+expecting success of 4257.2 'applying all patches generates conflict': 
+	test_must_fail git am mbox &&
+	echo resolved >file &&
+	git add -u &&
+	git am --resolved
+
+error: file: already exists in index
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Applying: no-conflict
+Applying: conflict-patch
+Patch failed at 0002 conflict-patch
+Applying: conflict-patch
+ok 2 - applying all patches generates conflict
+
+expecting success of 4257.3 'interactive am can apply a single patch': 
+	git reset --hard base &&
+	# apply the first, but not the second
+	test_write_lines y n | git am -i mbox &&
+
+	echo no-conflict >expect &&
+	git log -1 --format=%s >actual &&
+	test_cmp expect actual
+
+HEAD is now at 73a3f21 conflict-main
+Commit Body is:
+--------------------------
+no-conflict
+--------------------------
+Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: Applying: no-conflict
+Commit Body is:
+--------------------------
+conflict-patch
+--------------------------
+Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: ok 3 - interactive am can apply a single patch
+
+expecting success of 4257.4 'interactive am can resolve conflict': 
+	git reset --hard base &&
+	# apply both; the second one will conflict
+	test_write_lines y y | test_must_fail git am -i mbox &&
+	echo resolved >file &&
+	git add -u &&
+	# interactive "--resolved" will ask us if we want to apply the result
+	echo y | git am -i --resolved &&
+
+	echo conflict-patch >expect &&
+	git log -1 --format=%s >actual &&
+	test_cmp expect actual &&
+
+	echo resolved >expect &&
+	git cat-file blob HEAD:file >actual &&
+	test_cmp expect actual
+
+HEAD is now at 73a3f21 conflict-main
+error: file: already exists in index
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am -i --continue".
+hint: If you prefer to skip this patch, run "git am -i --skip" instead.
+hint: To restore the original branch and stop patching, run "git am -i --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Commit Body is:
+--------------------------
+no-conflict
+--------------------------
+Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: Applying: no-conflict
+Commit Body is:
+--------------------------
+conflict-patch
+--------------------------
+Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: Applying: conflict-patch
+Patch failed at 0002 conflict-patch
+Applying: conflict-patch
+Commit Body is:
+--------------------------
+conflict-patch
+--------------------------
+Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: ok 4 - interactive am can resolve conflict
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4205-log-pretty-formats.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4205-log-pretty-formats/.git/
 expecting success of 4205.1 'set up basic repos': 
@@ -283767,8 +284076,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\360\237\221\250\360\237\221\250\360\237\221\250\360\237\221\250\360\237\221\250.t"
---- expected	2026-03-04 07:59:01.847352315 +0000
-+++ actual	2026-03-04 07:59:01.855352315 +0000
+--- expected	2025-01-30 02:11:58.916184158 +0000
++++ actual	2025-01-30 02:11:58.944184326 +0000
 @@ -1,4 +1,4 @@
 -👨..👨⋮
 -e�..e�e�
@@ -283783,314 +284092,6 @@
 1..125
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4257-am-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4257-am-interactive/.git/
-expecting success of 4257.1 'set up patches to apply': 
-	test_commit unrelated &&
-	test_commit no-conflict &&
-	test_commit conflict-patch file patch &&
-	git format-patch --stdout -2 >mbox &&
-
-	git reset --hard unrelated &&
-	test_commit conflict-main file main base
-
-[master (root-commit) 16dd07d] unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated.t
-[master 7c8fce7] no-conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 no-conflict.t
-[master fe3fedc] conflict-patch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-HEAD is now at 16dd07d unrelated
-[master 73a3f21] conflict-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - set up patches to apply
-
-expecting success of 4257.2 'applying all patches generates conflict': 
-	test_must_fail git am mbox &&
-	echo resolved >file &&
-	git add -u &&
-	git am --resolved
-
-error: file: already exists in index
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Applying: no-conflict
-Applying: conflict-patch
-Patch failed at 0002 conflict-patch
-Applying: conflict-patch
-ok 2 - applying all patches generates conflict
-
-expecting success of 4257.3 'interactive am can apply a single patch': 
-	git reset --hard base &&
-	# apply the first, but not the second
-	test_write_lines y n | git am -i mbox &&
-
-	echo no-conflict >expect &&
-	git log -1 --format=%s >actual &&
-	test_cmp expect actual
-
-HEAD is now at 73a3f21 conflict-main
-Commit Body is:
---------------------------
-no-conflict
---------------------------
-Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: Applying: no-conflict
-Commit Body is:
---------------------------
-conflict-patch
---------------------------
-Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: ok 3 - interactive am can apply a single patch
-
-expecting success of 4257.4 'interactive am can resolve conflict': 
-	git reset --hard base &&
-	# apply both; the second one will conflict
-	test_write_lines y y | test_must_fail git am -i mbox &&
-	echo resolved >file &&
-	git add -u &&
-	# interactive "--resolved" will ask us if we want to apply the result
-	echo y | git am -i --resolved &&
-
-	echo conflict-patch >expect &&
-	git log -1 --format=%s >actual &&
-	test_cmp expect actual &&
-
-	echo resolved >expect &&
-	git cat-file blob HEAD:file >actual &&
-	test_cmp expect actual
-
-HEAD is now at 73a3f21 conflict-main
-error: file: already exists in index
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am -i --continue".
-hint: If you prefer to skip this patch, run "git am -i --skip" instead.
-hint: To restore the original branch and stop patching, run "git am -i --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Commit Body is:
---------------------------
-no-conflict
---------------------------
-Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: Applying: no-conflict
-Commit Body is:
---------------------------
-conflict-patch
---------------------------
-Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: Applying: conflict-patch
-Patch failed at 0002 conflict-patch
-Applying: conflict-patch
-Commit Body is:
---------------------------
-conflict-patch
---------------------------
-Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: ok 4 - interactive am can resolve conflict
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4258-am-quoted-cr.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4258-am-quoted-cr/.git/
-expecting success of 4258.1 'setup': 
-	test_write_lines one two three >text &&
-	test_commit one text &&
-	test_write_lines one owt three >text &&
-	test_commit two text
-
-[master (root-commit) 6f47e65] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 text
-[master 8ff8b1d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 4258.2 'am warn if quoted-cr is found': 
-	git reset --hard one &&
-	test_must_fail git am "$DATA/mbox" 2>err &&
-	grep "quoted CRLF detected" err
-
-HEAD is now at 6f47e65 one
-Applying: sample
-Patch failed at 0001 sample
-warning: quoted CRLF detected
-ok 2 - am warn if quoted-cr is found
-
-expecting success of 4258.3 'am --quoted-cr=strip': 
-	test_might_fail git am --abort &&
-	git reset --hard one &&
-	git am --quoted-cr=strip "$DATA/mbox" &&
-	git diff --exit-code HEAD two
-
-HEAD is now at 6f47e65 one
-Applying: sample
-ok 3 - am --quoted-cr=strip
-
-expecting success of 4258.4 'am with config mailinfo.quotedCr=strip': 
-	test_might_fail git am --abort &&
-	git reset --hard one &&
-	test_config mailinfo.quotedCr strip &&
-	git am "$DATA/mbox" &&
-	git diff --exit-code HEAD two
-
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at 6f47e65 one
-Applying: sample
-ok 4 - am with config mailinfo.quotedCr=strip
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4213-log-tabexpand.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4213-log-tabexpand/.git/
-expecting success of 4213.1 'setup': 
-	test_tick &&
-	sed -e "s/Q/$HT/g" <<-EOF >msg &&
-	Q$title
-
-	Q$body
-	EOF
-	git commit --allow-empty -F msg
-
-[master (root-commit) 4243c44] 	tab indent at the beginning of the title line
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 4213.2 'expand/no-expand': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 2 - expand/no-expand
-
-expecting success of 4213.3 'expand/no-expand for --pretty': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 3 - expand/no-expand for --pretty
-
-expecting success of 4213.4 'expand/no-expand for --pretty=short': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 4 - expand/no-expand for --pretty=short
-
-expecting success of 4213.5 'expand/no-expand for --pretty=medium': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 5 - expand/no-expand for --pretty=medium
-
-expecting success of 4213.6 'expand/no-expand for --pretty=full': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 6 - expand/no-expand for --pretty=full
-
-expecting success of 4213.7 'expand/no-expand for --pretty=fuller': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 7 - expand/no-expand for --pretty=fuller
-
-expecting success of 4213.8 'expand/no-expand for --pretty=raw': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 8 - expand/no-expand for --pretty=raw
-
-expecting success of 4213.9 'expand/no-expand for --pretty=email': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 9 - expand/no-expand for --pretty=email
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5002-archive-attr-pattern.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5002-archive-attr-pattern/.git/
 expecting success of 5002.1 'setup': 
@@ -288111,8 +288112,8 @@
 
 HEAD is now at 6b2d93f first
 Applying: second
---- at	2026-03-04 07:59:00.343352315 +0000
-+++ ct	2026-03-04 07:59:00.359352315 +0000
+--- at	2025-01-30 02:11:56.316168565 +0000
++++ ct	2025-01-30 02:11:56.332168661 +0000
 @@ -1 +1 @@
 -1112912053 -0700
 +1112912293 -0700
@@ -288141,7 +288142,7 @@
 
 HEAD is now at 6b2d93f first
 Applying: second
-1772611140 +0000
+1738203116 +0000
 ok 62 - am --ignore-date
 
 expecting success of 4150.63 'am into an unborn branch': 
@@ -288162,7 +288163,7 @@
 	) &&
 	test_cmp expected actual
 
-HEAD is now at ac3a796 second
+HEAD is now at ad7c134 second
 subdir/1
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4150-am/subdir/.git/
 applying to an empty history
@@ -288178,16 +288179,16 @@
 	git am <patchnl >output.out 2>&1 &&
 	test_grep "^Applying: second \\\n foo$" output.out
 
-HEAD is now at ac3a796 second
+HEAD is now at ad7c134 second
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  ac3a796 second
+  ad7c134 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> ac3a796
+ git branch <new-branch-name> ad7c134
 
 HEAD is now at 6b2d93f first
 Applying: second \n foo
@@ -290738,11 +290739,11 @@
 	test-tool chmtime --get .git/info/refs >b &&
 	! test_cmp a b
 
---- a	2026-03-04 07:59:07.663352315 +0000
-+++ b	2026-03-04 07:59:07.783352315 +0000
+--- a	2025-01-30 02:12:06.000226641 +0000
++++ b	2025-01-30 02:12:06.108227289 +0000
 @@ -1 +1 @@
 -0
-+1772611147
++1738203126
 ok 5 - info/refs can be forced to update
 
 expecting success of 5200.6 'info/refs updates when changes are made': 
@@ -290754,45 +290755,80 @@
 	test-tool chmtime --get .git/info/refs >b &&
 	! test_cmp a b
 
---- a	2026-03-04 07:59:07.663352315 +0000
-+++ b	2026-03-04 07:59:07.915352315 +0000
+--- a	2025-01-30 02:12:06.000226641 +0000
++++ b	2025-01-30 02:12:06.244228104 +0000
 @@ -1 +1 @@
 -0
-+1772611147
++1738203126
 ok 6 - info/refs updates when changes are made
 
 # passed all 6 test(s)
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5003-archive-zip.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+*** t5000-tar-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5000-tar-tree/.git/
+expecting success of 5000.1 'setup': 
+	test_oid_cache <<-EOF
+	obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a
+	obj sha256:3c666f798798601571f5cec0adb57ce4aba8546875e7693177e0535f34d2c49b
+	EOF
 
-ok 1 - populate workdir
+ok 1 - setup
+
+expecting success of 5000.2 '--list notices extra parameters': 
+	test_must_fail git archive --list blah &&
+	test_must_fail git archive --remote=. --list blah
+
+fatal: extra command line parameter 'blah'
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: extra command line parameter 'blah'        
+remote: git upload-archive: archiver died with error
+ok 2 - --list notices extra parameters
+
+expecting success of 5000.3 'end-of-options is correctly eaten': 
+	git archive --list --end-of-options &&
+	git archive --remote=. --list --end-of-options
+
+tar
+tgz
+tar.gz
+zip
+tar
+tgz
+tar.gz
+zip
+ok 3 - end-of-options is correctly eaten
+
+expecting success of 5000.4 'populate workdir': 
+	mkdir a &&
+	echo "a files_named_a" >.gitattributes &&
+	git add .gitattributes &&
+	echo simple textfile >a/a &&
+	ten=0123456789 &&
+	hundred="$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten" &&
+	echo long filename >"a/four$hundred" &&
+	mkdir a/bin &&
+	test-tool genrandom "frotz" 500000 >a/bin/sh &&
+	printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
+	printf "A not substituted O" >a/substfile2 &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s a a/l1
+	else
+		printf %s a >a/l1
+	fi &&
+	(
+		p=long_path_to_a_file &&
+		cd a &&
+		for depth in 1 2 3 4 5
+		do
+			mkdir $p &&
+			cd $p || exit 1
+		done &&
+		echo text >file_with_long_path
+	) &&
+	(cd a && find .) | sort >a.lst
 
 checking prerequisite: SYMLINKS
 
@@ -290804,1309 +290840,251 @@
 
 )
 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.47.2/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
+ok 4 - populate workdir
 
-expecting success of 5003.4 'add ignored file': echo ignore me >a/ignored &&
+expecting success of 5000.5 'add ignored file': echo ignore me >a/ignored &&
      mkdir .git/info &&
      echo ignored export-ignore >.git/info/attributes
-ok 4 - add ignored file
+ok 5 - add ignored file
 
-expecting success of 5003.5 'add files to repository': 
+expecting success of 5000.6 'add files to repository': 
 	git add a &&
 	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
 
-[master (root-commit) 38b9cf6] initial
+[master (root-commit) cc086e8] initial
  Author: A U Thor <author@example.com>
- 22 files changed, 15 insertions(+)
+ 9 files changed, 8 insertions(+)
+ create mode 100644 .gitattributes
  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/bin/sh
+ create mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
  create mode 100644 a/ignored
+ create mode 120000 a/l1
  create mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
- create mode 100644 a/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
+ok 6 - 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 &&
+expecting success of 5000.7 'setup export-subst': 
 	echo "substfile?" export-subst >>.git/info/attributes &&
 	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
 		>a/substfile1
 
-ok 6 - setup export-subst and diff attributes
+ok 7 - setup export-subst
 
-expecting success of 5003.7 'create bare clone': 
+expecting success of 5000.8 'create bare clone': 
 	git clone --template= --bare . bare.git &&
 	mkdir bare.git/info &&
-	cp .git/info/attributes bare.git/info/attributes &&
-	# 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
+	cp .git/info/attributes bare.git/info/attributes
 
 Cloning into bare repository 'bare.git'...
 done.
-ok 7 - create bare clone
+ok 8 - create bare clone
 
-expecting success of 5003.8 'remove ignored file': rm a/ignored
-ok 8 - remove ignored file
+expecting success of 5000.9 'remove ignored file': 
+	rm a/ignored
 
-expecting success of 5003.9 'git archive --format=zip': git archive --format=zip HEAD >d.zip
-ok 9 - git archive --format=zip
+ok 9 - remove ignored file
 
-checking prerequisite: UNZIP
+expecting success of 5000.10 'git archive': 
+	git archive HEAD >b.tar
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-	"$GIT_UNZIP" -v
-	test $? -ne 127
+ok 10 - git archive
 
-)
-UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
+expecting success of 5000.11 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 11 -  extract tar archive
 
-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.
+checking prerequisite: TAR_NEEDS_PAX_FALLBACK
 
-Compiled with gcc 14.2.0 for Unix (Linux ELF).
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TAR_NEEDS_PAX_FALLBACK" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TAR_NEEDS_PAX_FALLBACK" &&
+	(
+		mkdir pax &&
+		cd pax &&
+		"$TAR" xf "$TEST_DIRECTORY"/t5000/pax.tar &&
+		test -f PaxHeaders.1791/file
+	)
 
-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]
+)
+prerequisite TAR_NEEDS_PAX_FALLBACK not satisfied
+ok 12 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
 
-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)
+expecting success of 5000.13 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
 	
-Archive:  ../d.zip
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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
+ok 13 -  validate filenames
 
-expecting success of 5003.11 ' validate filenames': 
-		(cd d/a && find .) | sort >d.lst &&
-		test_cmp a.lst d.lst
+expecting success of 5000.14 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
 	
-ok 11 -  validate filenames
+ok 14 -  validate file contents
 
-expecting success of 5003.12 ' validate file contents': 
-		diff -r a d/a
+expecting success of 5000.15 ' validate mtime of a/a': 
+		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
+		echo $mtime >expect.mtime &&
+		test_cmp expect.mtime actual.mtime
 	
-ok 12 -  validate file contents
-
-checking prerequisite: UNZIP_CONVERT
+ok 15 -  validate mtime of a/a
 
-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
+expecting success of 5000.16 'git archive --mtime': 
+	git archive --mtime=2002-02-02T02:02:02-0200 HEAD >with_mtime.tar
 
-)
-Archive:  /build/reproducible-path/git-2.47.2/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
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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
+ok 16 - git archive --mtime
 
-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
+expecting success of 5000.17 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
 	
-ok 14 -  validate that text files are converted
+ok 17 -  extract tar archive
 
-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
+ok 18 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
 
-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
+expecting success of 5000.19 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
 	
-ok 16 -  validate that diff files are converted
+ok 19 -  validate filenames
 
-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
+expecting success of 5000.20 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
 	
-ok 17 -  validate that -diff files are unchanged
+ok 20 -  validate file contents
 
-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
+expecting success of 5000.21 ' validate mtime of a/a': 
+		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
+		echo $mtime >expect.mtime &&
+		test_cmp expect.mtime actual.mtime
 	
-ok 18 -  validate that custom diff is unchanged 
+ok 21 -  validate mtime of a/a
 
-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 5000.22 'git archive --prefix=prefix/': 
+	git archive --prefix=prefix/ HEAD >with_prefix.tar
 
-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
+ok 22 - git archive --prefix=prefix/
 
-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 5000.23 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 23 -  extract tar archive
 
-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 24 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
 
-ok 22 - git archive with --output, inferring format (local)
+expecting success of 5000.25 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 25 -  validate filenames
 
-expecting success of 5003.23 'git archive with --output, inferring format (remote)': 
-	git archive --remote=. --output=d4.zip HEAD &&
-	test_cmp_bin d.zip d4.zip
+expecting success of 5000.26 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 26 -  validate file contents
 
-ok 23 - git archive with --output, inferring format (remote)
+expecting success of 5000.27 'git-archive --prefix=olde-': 
+	git archive --prefix=olde- HEAD >with_olde-prefix.tar
 
-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
+ok 27 - git-archive --prefix=olde-
 
-expecting success of 5003.25 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+expecting success of 5000.28 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
 	
-Archive:  ../e.zip
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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
+ok 28 -  extract tar 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
+ok 29 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
 
-expecting success of 5003.27 ' validate file contents': 
-		diff -r a e/prefix/a
+expecting success of 5000.30 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
 	
-ok 27 -  validate file contents
+ok 30 -  validate filenames
 
-expecting success of 5003.28 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+expecting success of 5000.31 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
 	
-Archive:  ../e.zip
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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
+ok 31 -  validate file contents
 
-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 5000.32 'git archive --add-file': 
+	echo untracked >untracked &&
+	git archive --add-file=untracked HEAD >with_untracked.tar
 
-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
+ok 32 - git archive --add-file
 
-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
+expecting success of 5000.33 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
 	
-ok 31 -  validate that diff files are converted
+ok 33 -  extract tar archive
 
-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
+ok 34 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
 
-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
+expecting success of 5000.35 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
 	
-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
+ok 35 -  validate filenames
 
-expecting success of 5003.35 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+expecting success of 5000.36 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
 	
-Archive:  ../large.zip
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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
+ok 36 -  validate file contents
 
-expecting success of 5003.36 ' validate filenames': 
-		(cd large/a && find .) | sort >large.lst &&
-		test_cmp a.lst large.lst
+expecting success of 5000.37 ' validate extra file untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
 	
-ok 36 -  validate filenames
+ok 37 -  validate extra file untracked
 
-expecting success of 5003.37 ' validate file contents': 
-		diff -r a large/a
-	
-ok 37 -  validate file contents
+expecting success of 5000.38 'git archive --add-file twice': 
+	echo untracked >untracked &&
+	git archive --prefix=one/ --add-file=untracked \
+		--prefix=two/ --add-file=untracked \
+		--prefix= HEAD >with_untracked2.tar
 
-expecting success of 5003.38 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../large.zip
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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
+ok 38 - git archive --add-file twice
 
-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
+expecting success of 5000.39 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
 	
-ok 39 -  validate that text files are converted
+ok 39 -  extract tar archive
 
-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 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.41 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
 	
-ok 40 -  validate that binary files are unchanged
+ok 41 -  validate filenames
 
-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
+expecting success of 5000.42 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
 	
-ok 41 -  validate that diff files are converted
+ok 42 -  validate file contents
 
-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
+expecting success of 5000.43 ' validate extra file one/untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
 	
-ok 42 -  validate that -diff files are unchanged
+ok 43 -  validate extra file one/untracked
 
-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
+expecting success of 5000.44 ' validate extra file two/untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
 	
-ok 43 -  validate that custom diff is unchanged 
+ok 44 -  validate extra file two/untracked
 
-expecting success of 5003.44 'git archive --format=zip on large files': 
+expecting success of 5000.45 'git archive on large files': 
 	test_config core.bigfilethreshold 1 &&
-	git archive --format=zip HEAD >large-compressed.zip
+	git archive HEAD >b3.tar &&
+	test_cmp_bin b.tar b3.tar
 
-ok 44 - git archive --format=zip on large files
+ok 45 - git archive on large files
 
-expecting success of 5003.45 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../large-compressed.zip
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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 5000.46 'git archive in a bare repo': 
+	git --git-dir bare.git archive HEAD >b3.tar
 
-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
+ok 46 - git archive in a bare repo
 
-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
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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
-38b9cf6722bfcd1e79aa8a435f989cf4ffd447f3
-   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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5000-tar-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5000-tar-tree/.git/
-expecting success of 5000.1 'setup': 
-	test_oid_cache <<-EOF
-	obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a
-	obj sha256:3c666f798798601571f5cec0adb57ce4aba8546875e7693177e0535f34d2c49b
-	EOF
-
-ok 1 - setup
-
-expecting success of 5000.2 '--list notices extra parameters': 
-	test_must_fail git archive --list blah &&
-	test_must_fail git archive --remote=. --list blah
-
-fatal: extra command line parameter 'blah'
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: fatal: extra command line parameter 'blah'        
-remote: git upload-archive: archiver died with error
-ok 2 - --list notices extra parameters
-
-expecting success of 5000.3 'end-of-options is correctly eaten': 
-	git archive --list --end-of-options &&
-	git archive --remote=. --list --end-of-options
-
-tar
-tgz
-tar.gz
-zip
-tar
-tgz
-tar.gz
-zip
-ok 3 - end-of-options is correctly eaten
-
-expecting success of 5000.4 'populate workdir': 
-	mkdir a &&
-	echo "a files_named_a" >.gitattributes &&
-	git add .gitattributes &&
-	echo simple textfile >a/a &&
-	ten=0123456789 &&
-	hundred="$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten" &&
-	echo long filename >"a/four$hundred" &&
-	mkdir a/bin &&
-	test-tool genrandom "frotz" 500000 >a/bin/sh &&
-	printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
-	printf "A not substituted O" >a/substfile2 &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s a a/l1
-	else
-		printf %s a >a/l1
-	fi &&
-	(
-		p=long_path_to_a_file &&
-		cd a &&
-		for depth in 1 2 3 4 5
-		do
-			mkdir $p &&
-			cd $p || exit 1
-		done &&
-		echo text >file_with_long_path
-	) &&
-	(cd a && find .) | sort >a.lst
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-ok 4 - populate workdir
-
-expecting success of 5000.5 'add ignored file': echo ignore me >a/ignored &&
-     mkdir .git/info &&
-     echo ignored export-ignore >.git/info/attributes
-ok 5 - add ignored file
-
-expecting success of 5000.6 'add files to repository': 
-	git add a &&
-	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
-
-[master (root-commit) cc086e8] initial
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 a/a
- create mode 100644 a/bin/sh
- create mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
- create mode 100644 a/ignored
- create mode 120000 a/l1
- create mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
- create mode 100644 a/substfile1
- create mode 100644 a/substfile2
-ok 6 - add files to repository
-
-expecting success of 5000.7 'setup export-subst': 
-	echo "substfile?" export-subst >>.git/info/attributes &&
-	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
-		>a/substfile1
-
-ok 7 - setup export-subst
-
-expecting success of 5000.8 'create bare clone': 
-	git clone --template= --bare . bare.git &&
-	mkdir bare.git/info &&
-	cp .git/info/attributes bare.git/info/attributes
-
-Cloning into bare repository 'bare.git'...
-done.
-ok 8 - create bare clone
-
-expecting success of 5000.9 'remove ignored file': 
-	rm a/ignored
-
-ok 9 - remove ignored file
-
-expecting success of 5000.10 'git archive': 
-	git archive HEAD >b.tar
-
-ok 10 - git archive
-
-expecting success of 5000.11 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 11 -  extract tar archive
-
-checking prerequisite: TAR_NEEDS_PAX_FALLBACK
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TAR_NEEDS_PAX_FALLBACK" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TAR_NEEDS_PAX_FALLBACK" &&
-	(
-		mkdir pax &&
-		cd pax &&
-		"$TAR" xf "$TEST_DIRECTORY"/t5000/pax.tar &&
-		test -f PaxHeaders.1791/file
-	)
-
-)
-prerequisite TAR_NEEDS_PAX_FALLBACK not satisfied
-ok 12 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.13 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 13 -  validate filenames
-
-expecting success of 5000.14 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 14 -  validate file contents
-
-expecting success of 5000.15 ' validate mtime of a/a': 
-		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
-		echo $mtime >expect.mtime &&
-		test_cmp expect.mtime actual.mtime
-	
-ok 15 -  validate mtime of a/a
-
-expecting success of 5000.16 'git archive --mtime': 
-	git archive --mtime=2002-02-02T02:02:02-0200 HEAD >with_mtime.tar
-
-ok 16 - git archive --mtime
-
-expecting success of 5000.17 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 17 -  extract tar archive
-
-ok 18 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.19 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 19 -  validate filenames
-
-expecting success of 5000.20 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 20 -  validate file contents
-
-expecting success of 5000.21 ' validate mtime of a/a': 
-		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
-		echo $mtime >expect.mtime &&
-		test_cmp expect.mtime actual.mtime
-	
-ok 21 -  validate mtime of a/a
-
-expecting success of 5000.22 'git archive --prefix=prefix/': 
-	git archive --prefix=prefix/ HEAD >with_prefix.tar
-
-ok 22 - git archive --prefix=prefix/
-
-expecting success of 5000.23 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 23 -  extract tar archive
-
-ok 24 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.25 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 25 -  validate filenames
-
-expecting success of 5000.26 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 26 -  validate file contents
-
-expecting success of 5000.27 'git-archive --prefix=olde-': 
-	git archive --prefix=olde- HEAD >with_olde-prefix.tar
-
-ok 27 - git-archive --prefix=olde-
-
-expecting success of 5000.28 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 28 -  extract tar archive
-
-ok 29 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.30 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 30 -  validate filenames
-
-expecting success of 5000.31 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 31 -  validate file contents
-
-expecting success of 5000.32 'git archive --add-file': 
-	echo untracked >untracked &&
-	git archive --add-file=untracked HEAD >with_untracked.tar
-
-ok 32 - git archive --add-file
-
-expecting success of 5000.33 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 33 -  extract tar archive
-
-ok 34 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.35 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 35 -  validate filenames
-
-expecting success of 5000.36 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 36 -  validate file contents
-
-expecting success of 5000.37 ' validate extra file untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 37 -  validate extra file untracked
-
-expecting success of 5000.38 'git archive --add-file twice': 
-	echo untracked >untracked &&
-	git archive --prefix=one/ --add-file=untracked \
-		--prefix=two/ --add-file=untracked \
-		--prefix= HEAD >with_untracked2.tar
-
-ok 38 - git archive --add-file twice
-
-expecting success of 5000.39 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 39 -  extract tar archive
-
-ok 40 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.41 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 41 -  validate filenames
-
-expecting success of 5000.42 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 42 -  validate file contents
-
-expecting success of 5000.43 ' validate extra file one/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 43 -  validate extra file one/untracked
-
-expecting success of 5000.44 ' validate extra file two/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 44 -  validate extra file two/untracked
-
-expecting success of 5000.45 'git archive on large files': 
-	test_config core.bigfilethreshold 1 &&
-	git archive HEAD >b3.tar &&
-	test_cmp_bin b.tar b3.tar
-
-ok 45 - git archive on large files
-
-expecting success of 5000.46 'git archive in a bare repo': 
-	git --git-dir bare.git archive HEAD >b3.tar
-
-ok 46 - git archive in a bare repo
-
-expecting success of 5000.47 'git archive vs. the same in a bare repo': 
-	test_cmp_bin b.tar b3.tar
+expecting success of 5000.47 'git archive vs. the same in a bare repo': 
+	test_cmp_bin b.tar b3.tar
 
 ok 47 - git archive vs. the same in a bare repo
 
@@ -292530,6 +291508,106 @@
 1..90
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5301-sliding-window.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5301-sliding-window/.git/
+expecting success of 5301.1 'setup': 
+	rm -f .git/index* &&
+	for i in a b c
+	do
+	echo $i >$i &&
+	test-tool genrandom "$i" 32768 >>$i &&
+	git update-index --add $i || return 1
+	done &&
+	echo d >d && cat c >>d && git update-index --add d &&
+	tree=$(git write-tree) &&
+	commit1=$(git commit-tree $tree </dev/null) &&
+	git update-ref HEAD $commit1 &&
+	git repack -a -d &&
+	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
+	pack1=$(ls .git/objects/pack/*.pack) &&
+	test -f "$pack1"
+
+ok 1 - setup
+
+expecting success of 5301.2 'verify-pack -v, defaults': 
+	git verify-pack -v "$pack1"
+
+3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
+ok 2 - verify-pack -v, defaults
+
+expecting success of 5301.3 'verify-pack -v, packedGitWindowSize == 1 page': 
+	git config core.packedGitWindowSize 512 &&
+	git verify-pack -v "$pack1"
+
+3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
+ok 3 - verify-pack -v, packedGitWindowSize == 1 page
+
+expecting success of 5301.4 'verify-pack -v, packedGit{WindowSize,Limit} == 1 page': 
+	git config core.packedGitWindowSize 512 &&
+	git config core.packedGitLimit 512 &&
+	git verify-pack -v "$pack1"
+
+3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
+ok 4 - verify-pack -v, packedGit{WindowSize,Limit} == 1 page
+
+expecting success of 5301.5 'repack -a -d, packedGit{WindowSize,Limit} == 1 page': 
+	git config core.packedGitWindowSize 512 &&
+	git config core.packedGitLimit 512 &&
+	commit2=$(git commit-tree $tree -p $commit1 </dev/null) &&
+	git update-ref HEAD $commit2 &&
+	git repack -a -d &&
+	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
+	pack2=$(ls .git/objects/pack/*.pack) &&
+	test -f "$pack2" &&
+	test "$pack1" \!= "$pack2"
+
+ok 5 - repack -a -d, packedGit{WindowSize,Limit} == 1 page
+
+expecting success of 5301.6 'verify-pack -v, defaults': 
+	git config --unset core.packedGitWindowSize &&
+	git config --unset core.packedGitLimit &&
+	git verify-pack -v "$pack2"
+
+18387a63ae69bf35f4c71d97190d0ac78c135dbc commit 211 153 12
+3b60f63a6ae089462c1536850930bc628b471412 commit 9 20 165 1 18387a63ae69bf35f4c71d97190d0ac78c135dbc
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 185
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32974
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65763
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98554 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98576
+non delta: 5 objects
+chain length = 1: 2 objects
+.git/objects/pack/pack-2f02d879c6fc547b007694422ca84c5228e10f68.pack: ok
+ok 6 - verify-pack -v, defaults
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5100-mailinfo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5100-mailinfo/.git/
 expecting success of 5100.1 'split sample box': git mailsplit -o. "$DATA/sample.mbox" >last &&
@@ -293263,106 +292341,6 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5301-sliding-window.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5301-sliding-window/.git/
-expecting success of 5301.1 'setup': 
-	rm -f .git/index* &&
-	for i in a b c
-	do
-	echo $i >$i &&
-	test-tool genrandom "$i" 32768 >>$i &&
-	git update-index --add $i || return 1
-	done &&
-	echo d >d && cat c >>d && git update-index --add d &&
-	tree=$(git write-tree) &&
-	commit1=$(git commit-tree $tree </dev/null) &&
-	git update-ref HEAD $commit1 &&
-	git repack -a -d &&
-	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
-	pack1=$(ls .git/objects/pack/*.pack) &&
-	test -f "$pack1"
-
-ok 1 - setup
-
-expecting success of 5301.2 'verify-pack -v, defaults': 
-	git verify-pack -v "$pack1"
-
-3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
-non delta: 5 objects
-chain length = 1: 1 object
-.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
-ok 2 - verify-pack -v, defaults
-
-expecting success of 5301.3 'verify-pack -v, packedGitWindowSize == 1 page': 
-	git config core.packedGitWindowSize 512 &&
-	git verify-pack -v "$pack1"
-
-3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
-non delta: 5 objects
-chain length = 1: 1 object
-.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
-ok 3 - verify-pack -v, packedGitWindowSize == 1 page
-
-expecting success of 5301.4 'verify-pack -v, packedGit{WindowSize,Limit} == 1 page': 
-	git config core.packedGitWindowSize 512 &&
-	git config core.packedGitLimit 512 &&
-	git verify-pack -v "$pack1"
-
-3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
-non delta: 5 objects
-chain length = 1: 1 object
-.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
-ok 4 - verify-pack -v, packedGit{WindowSize,Limit} == 1 page
-
-expecting success of 5301.5 'repack -a -d, packedGit{WindowSize,Limit} == 1 page': 
-	git config core.packedGitWindowSize 512 &&
-	git config core.packedGitLimit 512 &&
-	commit2=$(git commit-tree $tree -p $commit1 </dev/null) &&
-	git update-ref HEAD $commit2 &&
-	git repack -a -d &&
-	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
-	pack2=$(ls .git/objects/pack/*.pack) &&
-	test -f "$pack2" &&
-	test "$pack1" \!= "$pack2"
-
-ok 5 - repack -a -d, packedGit{WindowSize,Limit} == 1 page
-
-expecting success of 5301.6 'verify-pack -v, defaults': 
-	git config --unset core.packedGitWindowSize &&
-	git config --unset core.packedGitLimit &&
-	git verify-pack -v "$pack2"
-
-18387a63ae69bf35f4c71d97190d0ac78c135dbc commit 211 153 12
-3b60f63a6ae089462c1536850930bc628b471412 commit 9 20 165 1 18387a63ae69bf35f4c71d97190d0ac78c135dbc
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 185
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32974
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65763
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98554 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98576
-non delta: 5 objects
-chain length = 1: 2 objects
-.git/objects/pack/pack-2f02d879c6fc547b007694422ca84c5228e10f68.pack: ok
-ok 6 - verify-pack -v, defaults
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5004-archive-corner-cases.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5004-archive-corner-cases/.git/
 expecting success of 5004.1 'create commit with empty tree and fake empty tar': 
@@ -293854,6 +292832,1029 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5003-archive-zip.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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) 09c995b] 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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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.47.2/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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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
+09c995b379c960f29b4babf458828a757c4a5b00
+   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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4301-merge-tree-write-tree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4301-merge-tree-write-tree/.git/
 expecting success of 4301.1 'setup': 
@@ -295209,86 +295210,84 @@
 1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5306-pack-nobase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t5307-pack-missing-commit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5307-pack-missing-commit/.git/
+expecting success of 5307.1 'setup': 
+	for i in 1 2 3 4 5
+	do
+		echo "$i" >"file$i" &&
+		git add "file$i" &&
+		test_tick &&
+		git commit -m "$i" &&
+		git tag "tag$i" || return 1
+	done &&
+	obj=$(git rev-parse --verify tag3) &&
+	fanout=$(expr "$obj" : "\(..\)") &&
+	remainder=$(expr "$obj" : "..\(.*\)") &&
+	rm -f ".git/objects/$fanout/$remainder"
 
-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 &&
+[master (root-commit) f1e5f64] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[master 464ac64] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[master 4b3f9fe] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[master 4387cd0] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+[master 18dfde5] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file5
+ok 1 - setup
 
-	git --git-dir=../.git cat-file commit $B |
-	git hash-object -t commit -w --stdin &&
+expecting success of 5307.2 'check corruption': 
+	test_must_fail git fsck
 
-	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)
+error: refs/tags/tag3: invalid sha1 pointer 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+error: HEAD: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+error: HEAD: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+error: refs/heads/master: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+error: refs/heads/master: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+broken link from  commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
+              to  commit 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+missing commit 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+dangling tree 5907482de36080ec355b7811e41e23276d5799ba
+ok 2 - check corruption
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5306-pack-nobase/patch_clone/.git/
-b9ed80ffce4d29008783a547cd99709480fe6c9f
-f9037bf6e8d95d31af48907ab2c93c2d6c2c7fcd
-ok 2 - setup patch_clone
+expecting success of 5307.3 'rev-list notices corruption (1)': 
+	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list HEAD
 
-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 &&
+error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
+18dfde5380f75061a4c4e203210947d874f34b14
+ok 3 - rev-list notices corruption (1)
 
-	 git pull ../patch_clone/.git &&
-	 test $(git rev-parse HEAD) = $C
-	)
+expecting success of 5307.4 'rev-list notices corruption (2)': 
+	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --objects HEAD
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
+18dfde5380f75061a4c4e203210947d874f34b14
+ok 4 - rev-list notices corruption (2)
 
-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 5307.5 'pack-objects notices corruption': 
+	echo HEAD |
+	test_must_fail git pack-objects --revs pack
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
+ok 5 - pack-objects notices corruption
 
-# passed all 4 test(s)
-1..4
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5305-include-tag.sh ***
@@ -295448,84 +295447,86 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5307-pack-missing-commit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5307-pack-missing-commit/.git/
-expecting success of 5307.1 'setup': 
-	for i in 1 2 3 4 5
-	do
-		echo "$i" >"file$i" &&
-		git add "file$i" &&
-		test_tick &&
-		git commit -m "$i" &&
-		git tag "tag$i" || return 1
-	done &&
-	obj=$(git rev-parse --verify tag3) &&
-	fanout=$(expr "$obj" : "\(..\)") &&
-	remainder=$(expr "$obj" : "..\(.*\)") &&
-	rm -f ".git/objects/$fanout/$remainder"
+*** t5306-pack-nobase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)) &&
 
-[master (root-commit) f1e5f64] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[master 464ac64] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[master 4b3f9fe] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[master 4387cd0] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-[master 18dfde5] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file5
-ok 1 - setup
+	echo m >>text &&
+	git update-index text &&
+	B=$(echo B | git commit-tree $(git write-tree) -p $A) &&
+	git update-ref HEAD $B
 
-expecting success of 5307.2 'check corruption': 
-	test_must_fail git fsck
+ok 1 - setup base
 
-error: refs/tags/tag3: invalid sha1 pointer 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-error: HEAD: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-error: HEAD: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-error: refs/heads/master: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-error: refs/heads/master: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-broken link from  commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
-              to  commit 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-missing commit 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-dangling tree 5907482de36080ec355b7811e41e23276d5799ba
-ok 2 - check corruption
+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 &&
 
-expecting success of 5307.3 'rev-list notices corruption (1)': 
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list HEAD
+	git --git-dir=../.git cat-file commit $B |
+	git hash-object -t commit -w --stdin &&
 
-error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
-18dfde5380f75061a4c4e203210947d874f34b14
-ok 3 - rev-list notices corruption (1)
+	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)
 
-expecting success of 5307.4 'rev-list notices corruption (2)': 
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --objects HEAD
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5306-pack-nobase/patch_clone/.git/
+b9ed80ffce4d29008783a547cd99709480fe6c9f
+f9037bf6e8d95d31af48907ab2c93c2d6c2c7fcd
+ok 2 - setup patch_clone
 
-error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
-18dfde5380f75061a4c4e203210947d874f34b14
-ok 4 - rev-list notices corruption (2)
+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 5307.5 'pack-objects notices corruption': 
-	echo HEAD |
-	test_must_fail git pack-objects --revs pack
+	 git pull ../patch_clone/.git &&
+	 test $(git rev-parse HEAD) = $C
+	)
 
-error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
-ok 5 - pack-objects notices corruption
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-# passed all 5 test(s)
-1..5
+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.47.2/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
+
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5150-request-pull.sh ***
@@ -296135,90 +296136,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5311-pack-bitmaps-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5311-pack-bitmaps-shallow/.git/
-expecting success of 5311.1 'setup shallow repo': 
-		rm -rf * .git &&
-		git init &&
-		git config pack.writeBitmapLookupTable false &&
-		echo 1 >file &&
-		git add file &&
-		git commit -m orig &&
-		echo 2 >file &&
-		git commit -a -m update &&
-		git clone --no-local --bare --depth=1 . shallow.git &&
-		echo 1 >file &&
-		git commit -a -m repeat
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5311-pack-bitmaps-shallow/.git/
-[master (root-commit) c96ad4c] orig
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 0ffc409] update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'shallow.git'...
-[master 07d4efd] repeat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup shallow repo
-
-expecting success of 5311.2 'turn on bitmaps in the parent': 
-		git repack -adb
-	
-ok 2 - turn on bitmaps in the parent
-
-expecting success of 5311.3 'shallow fetch from bitmapped repo': 
-		(cd shallow.git && git fetch)
-	
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5311-pack-bitmaps-shallow/.
- * branch            HEAD       -> FETCH_HEAD
-ok 3 - shallow fetch from bitmapped repo
-
-expecting success of 5311.4 'setup shallow repo': 
-		rm -rf * .git &&
-		git init &&
-		git config pack.writeBitmapLookupTable true &&
-		echo 1 >file &&
-		git add file &&
-		git commit -m orig &&
-		echo 2 >file &&
-		git commit -a -m update &&
-		git clone --no-local --bare --depth=1 . shallow.git &&
-		echo 1 >file &&
-		git commit -a -m repeat
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5311-pack-bitmaps-shallow/.git/
-[master (root-commit) c96ad4c] orig
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 0ffc409] update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'shallow.git'...
-[master 07d4efd] repeat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - setup shallow repo
-
-expecting success of 5311.5 'turn on bitmaps in the parent': 
-		git repack -adb
-	
-ok 5 - turn on bitmaps in the parent
-
-expecting success of 5311.6 'shallow fetch from bitmapped repo': 
-		(cd shallow.git && git fetch)
-	
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5311-pack-bitmaps-shallow/.
- * branch            HEAD       -> FETCH_HEAD
-ok 6 - shallow fetch from bitmapped repo
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5309-pack-delta-cycles.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5309-pack-delta-cycles/.git/
 expecting success of 5309.1 'index-pack works with a single delta (A->B)': 
@@ -296307,6 +296224,90 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5311-pack-bitmaps-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5311-pack-bitmaps-shallow/.git/
+expecting success of 5311.1 'setup shallow repo': 
+		rm -rf * .git &&
+		git init &&
+		git config pack.writeBitmapLookupTable false &&
+		echo 1 >file &&
+		git add file &&
+		git commit -m orig &&
+		echo 2 >file &&
+		git commit -a -m update &&
+		git clone --no-local --bare --depth=1 . shallow.git &&
+		echo 1 >file &&
+		git commit -a -m repeat
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5311-pack-bitmaps-shallow/.git/
+[master (root-commit) c96ad4c] orig
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 0ffc409] update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'shallow.git'...
+[master 07d4efd] repeat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup shallow repo
+
+expecting success of 5311.2 'turn on bitmaps in the parent': 
+		git repack -adb
+	
+ok 2 - turn on bitmaps in the parent
+
+expecting success of 5311.3 'shallow fetch from bitmapped repo': 
+		(cd shallow.git && git fetch)
+	
+From /build/reproducible-path/git-2.47.2/t/trash directory.t5311-pack-bitmaps-shallow/.
+ * branch            HEAD       -> FETCH_HEAD
+ok 3 - shallow fetch from bitmapped repo
+
+expecting success of 5311.4 'setup shallow repo': 
+		rm -rf * .git &&
+		git init &&
+		git config pack.writeBitmapLookupTable true &&
+		echo 1 >file &&
+		git add file &&
+		git commit -m orig &&
+		echo 2 >file &&
+		git commit -a -m update &&
+		git clone --no-local --bare --depth=1 . shallow.git &&
+		echo 1 >file &&
+		git commit -a -m repeat
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5311-pack-bitmaps-shallow/.git/
+[master (root-commit) c96ad4c] orig
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 0ffc409] update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'shallow.git'...
+[master 07d4efd] repeat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - setup shallow repo
+
+expecting success of 5311.5 'turn on bitmaps in the parent': 
+		git repack -adb
+	
+ok 5 - turn on bitmaps in the parent
+
+expecting success of 5311.6 'shallow fetch from bitmapped repo': 
+		(cd shallow.git && git fetch)
+	
+From /build/reproducible-path/git-2.47.2/t/trash directory.t5311-pack-bitmaps-shallow/.
+ * branch            HEAD       -> FETCH_HEAD
+ok 6 - shallow fetch from bitmapped repo
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5314-pack-cycle-detection.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5314-pack-cycle-detection/.git/
 expecting success of 5314.1 'setup': 
@@ -296587,6 +296588,222 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5313-pack-bounds-checks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5313-pack-bounds-checks/.git/
+expecting success of 5313.1 'setup': 
+	test_oid_cache <<-EOF
+	oid000 sha1:1485
+	oid000 sha256:4222
+
+	oidfff sha1:74
+	oidfff sha256:1350
+	EOF
+
+ok 1 - setup
+
+expecting success of 5313.2 'set up base packfile and variables': 
+	# the hash of this content starts with ff, which
+	# makes some later computations much simpler
+	test_oid oidfff >file &&
+	git add file &&
+	git commit -m base &&
+	git repack -ad &&
+	base=$(echo .git/objects/pack/*) &&
+	chmod -R +w $base &&
+	mkdir base-backup &&
+	cp -r $base base-backup/ &&
+	object=$(git rev-parse HEAD:file)
+
+[master (root-commit) 6c5620f] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 2 - set up base packfile and variables
+
+expecting success of 5313.3 'pack/index object count mismatch': 
+	do_pack $object &&
+	munge $pack 8 "\377\0\0\0" &&
+	clear_base &&
+
+	# We enumerate the objects from the completely-fine
+	# .idx, but notice later that the .pack is bogus
+	# and fail to show any data.
+	echo "$object missing" >expect &&
+	git cat-file --batch-all-objects --batch-check >actual &&
+	test_cmp expect actual &&
+
+	# ...and here fail to load the object (without segfaulting),
+	# but fallback to a good copy if available.
+	test_must_fail git cat-file blob $object &&
+	restore_base &&
+	git cat-file blob $object >actual &&
+	test_cmp file actual &&
+
+	# ...and make sure that index-pack --verify, which has its
+	# own reading routines, does not segfault.
+	test_must_fail git index-pack --verify $pack
+
+4+0 records in
+4+0 records out
+4 bytes copied, 3.672e-05 s, 109 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
+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
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+fatal: git cat-file fff0a2476aa5c8e60a3ef21cfc66e0cc670920be: bad file
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+fatal: data too large to fit into virtual memory space
+ok 3 - pack/index object count mismatch
+
+expecting success of 5313.4 'matched bogus object count': 
+	do_pack $object &&
+	munge $pack 8 "\377\0\0\0" &&
+	munge $idx $((255 * 4)) "\377\0\0\0" &&
+	clear_base &&
+
+	# Unlike above, we should notice early that the .idx is totally
+	# bogus, and not even enumerate its contents.
+	git cat-file --batch-all-objects --batch-check >actual &&
+	test_must_be_empty actual &&
+
+	# But as before, we can do the same object-access checks.
+	test_must_fail git cat-file blob $object &&
+	restore_base &&
+	git cat-file blob $object >actual &&
+	test_cmp file actual &&
+
+	test_must_fail git index-pack --verify $pack
+
+4+0 records in
+4+0 records out
+4 bytes copied, 3.672e-05 s, 109 kB/s
+4+0 records in
+4+0 records out
+4 bytes copied, 0.0110064 s, 0.4 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
+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
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+fatal: git cat-file fff0a2476aa5c8e60a3ef21cfc66e0cc670920be: bad file
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+fatal: Cannot open existing pack idx file for '.git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx'
+ok 4 - matched bogus object count
+
+expecting success of 5313.5 'bogus object offset (v1)': 
+	do_pack $object --index-version=1 &&
+	munge $idx $((4 * 256)) "\377\0\0\0" &&
+	clear_base &&
+	test_must_fail git cat-file blob $object &&
+	test_must_fail git index-pack --verify $pack
+
+4+0 records in
+4+0 records out
+4 bytes copied, 3.912e-05 s, 102 kB/s
+fatal: offset beyond end of packfile (truncated pack?)
+fatal: offset beyond end of packfile (truncated pack?)
+ok 5 - bogus object offset (v1)
+
+expecting success of 5313.6 'bogus object offset (v2, no msb)': 
+	do_pack $object --index-version=2 &&
+	munge $idx $(ofs_table 1) "\0\377\0\0" &&
+	clear_base &&
+	test_must_fail git cat-file blob $object &&
+	test_must_fail git index-pack --verify $pack
+
+4+0 records in
+4+0 records out
+4 bytes copied, 3.788e-05 s, 106 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)
+
+expecting success of 5313.7 'bogus offset into v2 extended table': 
+	do_pack $object --index-version=2 &&
+	munge $idx $(ofs_table 1) "\377\0\0\0" &&
+	clear_base &&
+	test_must_fail git cat-file blob $object &&
+	test_must_fail git index-pack --verify $pack
+
+4+0 records in
+4+0 records out
+4 bytes copied, 0.00374486 s, 1.1 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
+
+expecting success of 5313.8 'bogus offset inside v2 extended table': 
+	# We need two objects here, so we can plausibly require
+	# an extended table (if the first object were larger than 2^31).
+	#
+	# Note that the value is important here. We want $object as
+	# the second entry in sorted-hash order. The hash of this object starts
+	# with "000", which sorts before that of $object (which starts
+	# with "fff").
+	second=$(test_oid oid000 | git hash-object -w --stdin) &&
+	do_pack "$object $second" --index-version=2 &&
+
+	# We have to make extra room for the table, so we cannot
+	# just munge in place as usual.
+	{
+		dd if=$idx bs=1 count=$(($(ofs_table 2) + 4)) &&
+		printf "\200\0\0\0" &&
+		printf "\377\0\0\0\0\0\0\0" &&
+		dd if=$idx bs=1 skip=$(extended_table 2)
+	} >tmp &&
+	mv tmp "$idx" &&
+	clear_base &&
+	test_must_fail git cat-file blob $object &&
+	test_must_fail git index-pack --verify $pack
+
+1084+0 records in
+1084+0 records out
+1084 bytes (1.1 kB, 1.1 KiB) copied, 0.000826805 s, 1.3 MB/s
+40+0 records in
+40+0 records out
+40 bytes copied, 5.4e-05 s, 741 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
+
+expecting success of 5313.9 'bogus OFS_DELTA in packfile': 
+	# Generate a pack with a delta in it.
+	base=$(test-tool genrandom foo 3000 | git hash-object --stdin -w) &&
+	delta=$(test-tool genrandom foo 2000 | git hash-object --stdin -w) &&
+	do_pack "$base $delta" --delta-base-offset &&
+	rm -f .git/objects/??/* &&
+
+	# Double check that we have the delta we expect.
+	echo $base >expect &&
+	echo $delta | git cat-file --batch-check="%(deltabase)" >actual &&
+	test_cmp expect actual &&
+
+	# Now corrupt it. We assume the varint size for the delta is small
+	# enough to fit in the first byte (which it should be, since it
+	# is a pure deletion from the base), and that original ofs_delta
+	# takes 2 bytes (which it should, as it should be ~3000).
+	ofs=$(git show-index <$idx | grep $delta | cut -d" " -f1) &&
+	munge $pack $(($ofs + 1)) "\177\377" &&
+	test_must_fail git cat-file blob $delta >/dev/null
+
+2+0 records in
+2+0 records out
+2 bytes copied, 0.0031091 s, 0.6 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
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5303-pack-corruption-resilience.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5303-pack-corruption-resilience/.git/
 expecting success of 5303.1 'initial setup validation': 
@@ -296615,7 +296832,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 2.552e-05 s, 39.2 kB/s
+1 byte copied, 2.788e-05 s, 35.9 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
@@ -296743,7 +296960,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.536e-05 s, 39.4 kB/s
+1 byte copied, 2.788e-05 s, 35.9 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
@@ -296847,7 +297064,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.684e-05 s, 37.3 kB/s
+1 byte copied, 2.5e-05 s, 40 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
@@ -296894,7 +297111,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.236e-05 s, 44.7 kB/s
+1 byte copied, 2.596e-05 s, 38.5 kB/s
 fatal: pack has bad object at offset 2032: delta base offset is out of bound
 fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
 fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
@@ -296942,7 +297159,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.592e-05 s, 38.6 kB/s
+1 byte copied, 2.756e-05 s, 36.3 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
@@ -296999,7 +297216,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 2.528e-05 s, 39.6 kB/s
+1 byte copied, 2.464e-05 s, 40.6 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
@@ -297028,7 +297245,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 2+0 records in
 2+0 records out
-2 bytes copied, 2.612e-05 s, 76.6 kB/s
+2 bytes copied, 3.14e-05 s, 63.7 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
@@ -297075,7 +297292,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 2+0 records in
 2+0 records out
-2 bytes copied, 3.004e-05 s, 66.6 kB/s
+2 bytes copied, 2.708e-05 s, 73.9 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
@@ -297161,222 +297378,6 @@
 1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5313-pack-bounds-checks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5313-pack-bounds-checks/.git/
-expecting success of 5313.1 'setup': 
-	test_oid_cache <<-EOF
-	oid000 sha1:1485
-	oid000 sha256:4222
-
-	oidfff sha1:74
-	oidfff sha256:1350
-	EOF
-
-ok 1 - setup
-
-expecting success of 5313.2 'set up base packfile and variables': 
-	# the hash of this content starts with ff, which
-	# makes some later computations much simpler
-	test_oid oidfff >file &&
-	git add file &&
-	git commit -m base &&
-	git repack -ad &&
-	base=$(echo .git/objects/pack/*) &&
-	chmod -R +w $base &&
-	mkdir base-backup &&
-	cp -r $base base-backup/ &&
-	object=$(git rev-parse HEAD:file)
-
-[master (root-commit) 6c5620f] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 2 - set up base packfile and variables
-
-expecting success of 5313.3 'pack/index object count mismatch': 
-	do_pack $object &&
-	munge $pack 8 "\377\0\0\0" &&
-	clear_base &&
-
-	# We enumerate the objects from the completely-fine
-	# .idx, but notice later that the .pack is bogus
-	# and fail to show any data.
-	echo "$object missing" >expect &&
-	git cat-file --batch-all-objects --batch-check >actual &&
-	test_cmp expect actual &&
-
-	# ...and here fail to load the object (without segfaulting),
-	# but fallback to a good copy if available.
-	test_must_fail git cat-file blob $object &&
-	restore_base &&
-	git cat-file blob $object >actual &&
-	test_cmp file actual &&
-
-	# ...and make sure that index-pack --verify, which has its
-	# own reading routines, does not segfault.
-	test_must_fail git index-pack --verify $pack
-
-4+0 records in
-4+0 records out
-4 bytes copied, 6.852e-05 s, 58.4 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
-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
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-fatal: git cat-file fff0a2476aa5c8e60a3ef21cfc66e0cc670920be: bad file
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-fatal: data too large to fit into virtual memory space
-ok 3 - pack/index object count mismatch
-
-expecting success of 5313.4 'matched bogus object count': 
-	do_pack $object &&
-	munge $pack 8 "\377\0\0\0" &&
-	munge $idx $((255 * 4)) "\377\0\0\0" &&
-	clear_base &&
-
-	# Unlike above, we should notice early that the .idx is totally
-	# bogus, and not even enumerate its contents.
-	git cat-file --batch-all-objects --batch-check >actual &&
-	test_must_be_empty actual &&
-
-	# But as before, we can do the same object-access checks.
-	test_must_fail git cat-file blob $object &&
-	restore_base &&
-	git cat-file blob $object >actual &&
-	test_cmp file actual &&
-
-	test_must_fail git index-pack --verify $pack
-
-4+0 records in
-4+0 records out
-4 bytes copied, 0.00674004 s, 0.6 kB/s
-4+0 records in
-4+0 records out
-4 bytes copied, 3.852e-05 s, 104 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
-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
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-fatal: git cat-file fff0a2476aa5c8e60a3ef21cfc66e0cc670920be: bad file
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-fatal: Cannot open existing pack idx file for '.git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx'
-ok 4 - matched bogus object count
-
-expecting success of 5313.5 'bogus object offset (v1)': 
-	do_pack $object --index-version=1 &&
-	munge $idx $((4 * 256)) "\377\0\0\0" &&
-	clear_base &&
-	test_must_fail git cat-file blob $object &&
-	test_must_fail git index-pack --verify $pack
-
-4+0 records in
-4+0 records out
-4 bytes copied, 0.0050962 s, 0.8 kB/s
-fatal: offset beyond end of packfile (truncated pack?)
-fatal: offset beyond end of packfile (truncated pack?)
-ok 5 - bogus object offset (v1)
-
-expecting success of 5313.6 'bogus object offset (v2, no msb)': 
-	do_pack $object --index-version=2 &&
-	munge $idx $(ofs_table 1) "\0\377\0\0" &&
-	clear_base &&
-	test_must_fail git cat-file blob $object &&
-	test_must_fail git index-pack --verify $pack
-
-4+0 records in
-4+0 records out
-4 bytes copied, 3.736e-05 s, 107 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)
-
-expecting success of 5313.7 'bogus offset into v2 extended table': 
-	do_pack $object --index-version=2 &&
-	munge $idx $(ofs_table 1) "\377\0\0\0" &&
-	clear_base &&
-	test_must_fail git cat-file blob $object &&
-	test_must_fail git index-pack --verify $pack
-
-4+0 records in
-4+0 records out
-4 bytes copied, 4.044e-05 s, 98.9 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
-
-expecting success of 5313.8 'bogus offset inside v2 extended table': 
-	# We need two objects here, so we can plausibly require
-	# an extended table (if the first object were larger than 2^31).
-	#
-	# Note that the value is important here. We want $object as
-	# the second entry in sorted-hash order. The hash of this object starts
-	# with "000", which sorts before that of $object (which starts
-	# with "fff").
-	second=$(test_oid oid000 | git hash-object -w --stdin) &&
-	do_pack "$object $second" --index-version=2 &&
-
-	# We have to make extra room for the table, so we cannot
-	# just munge in place as usual.
-	{
-		dd if=$idx bs=1 count=$(($(ofs_table 2) + 4)) &&
-		printf "\200\0\0\0" &&
-		printf "\377\0\0\0\0\0\0\0" &&
-		dd if=$idx bs=1 skip=$(extended_table 2)
-	} >tmp &&
-	mv tmp "$idx" &&
-	clear_base &&
-	test_must_fail git cat-file blob $object &&
-	test_must_fail git index-pack --verify $pack
-
-1084+0 records in
-1084+0 records out
-1084 bytes (1.1 kB, 1.1 KiB) copied, 0.00081996 s, 1.3 MB/s
-40+0 records in
-40+0 records out
-40 bytes copied, 7.436e-05 s, 538 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
-
-expecting success of 5313.9 'bogus OFS_DELTA in packfile': 
-	# Generate a pack with a delta in it.
-	base=$(test-tool genrandom foo 3000 | git hash-object --stdin -w) &&
-	delta=$(test-tool genrandom foo 2000 | git hash-object --stdin -w) &&
-	do_pack "$base $delta" --delta-base-offset &&
-	rm -f .git/objects/??/* &&
-
-	# Double check that we have the delta we expect.
-	echo $base >expect &&
-	echo $delta | git cat-file --batch-check="%(deltabase)" >actual &&
-	test_cmp expect actual &&
-
-	# Now corrupt it. We assume the varint size for the delta is small
-	# enough to fit in the first byte (which it should be, since it
-	# is a pure deletion from the base), and that original ofs_delta
-	# takes 2 bytes (which it should, as it should be ~3000).
-	ofs=$(git show-index <$idx | grep $delta | cut -d" " -f1) &&
-	munge $pack $(($ofs + 1)) "\177\377" &&
-	test_must_fail git cat-file blob $delta >/dev/null
-
-2+0 records in
-2+0 records out
-2 bytes copied, 3.724e-05 s, 53.7 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
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5304-prune.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5304-prune/.git/
 expecting success of 5304.1 'setup': 
@@ -297848,32 +297849,6 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5321-pack-large-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5321-pack-large-objects/.git/
-expecting success of 5321.1 'setup': 
-	clear_packs &&
-	{
-		pack_header 2 &&
-		pack_obj $A $B &&
-		pack_obj $B
-	} >ab.pack &&
-	pack_trailer ab.pack &&
-	git index-pack --stdin <ab.pack
-
-pack	8af524300e46c11647862073e882d467bc0dd22d
-ok 1 - setup
-
-expecting success of 5321.2 'repack large deltas': 
-	printf "%s\\n" $A $B |
-	GIT_TEST_OE_DELTA_SIZE=2 git pack-objects tmp-pack
-
-aee080dc5b8a48f951541c0ad63f65af48847a6f
-ok 2 - repack large deltas
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5316-pack-delta-depth.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5316-pack-delta-depth/.git/
 expecting success of 5316.1 'create series of packs': 
@@ -298002,6 +297977,32 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5321-pack-large-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5321-pack-large-objects/.git/
+expecting success of 5321.1 'setup': 
+	clear_packs &&
+	{
+		pack_header 2 &&
+		pack_obj $A $B &&
+		pack_obj $B
+	} >ab.pack &&
+	pack_trailer ab.pack &&
+	git index-pack --stdin <ab.pack
+
+pack	8af524300e46c11647862073e882d467bc0dd22d
+ok 1 - setup
+
+expecting success of 5321.2 'repack large deltas': 
+	printf "%s\\n" $A $B |
+	GIT_TEST_OE_DELTA_SIZE=2 git pack-objects tmp-pack
+
+aee080dc5b8a48f951541c0ad63f65af48847a6f
+ok 2 - repack large deltas
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5320-delta-islands.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5320-delta-islands/.git/
 expecting success of 5320.1 'setup commits': 
@@ -298140,756 +298141,6 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5322-pack-objects-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5322-pack-objects-sparse/.git/
-expecting success of 5322.1 'setup repo': 
-	test_commit initial &&
-	for i in $(test_seq 1 3)
-	do
-		mkdir f$i &&
-		for j in $(test_seq 1 3)
-		do
-			mkdir f$i/f$j &&
-			echo $j >f$i/f$j/data.txt || return 1
-		done
-	done &&
-	git add . &&
-	git commit -m "Initialized trees" &&
-	for i in $(test_seq 1 3)
-	do
-		git checkout -b topic$i main &&
-		echo change-$i >f$i/f$i/data.txt &&
-		git commit -a -m "Changed f$i/f$i/data.txt" || return 1
-	done &&
-	cat >packinput.txt <<-EOF &&
-	topic1
-	^topic2
-	^topic3
-	EOF
-	git rev-parse			\
-		topic1			\
-		topic1^{tree}		\
-		topic1:f1		\
-		topic1:f1/f1		\
-		topic1:f1/f1/data.txt | sort >expect_objects.txt
-
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 8ccf85b] Initialized trees
- Author: A U Thor <author@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 f1/f1/data.txt
- create mode 100644 f1/f2/data.txt
- create mode 100644 f1/f3/data.txt
- create mode 100644 f2/f1/data.txt
- create mode 100644 f2/f2/data.txt
- create mode 100644 f2/f3/data.txt
- create mode 100644 f3/f1/data.txt
- create mode 100644 f3/f2/data.txt
- create mode 100644 f3/f3/data.txt
-Switched to a new branch 'topic1'
-[topic1 32cf0ab] Changed f1/f1/data.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic2'
-[topic2 2b44896] Changed f2/f2/data.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic3'
-[topic3 48a532e] Changed f3/f3/data.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup repo
-
-expecting success of 5322.2 'non-sparse pack-objects': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
-	git index-pack -o nonsparse.idx nonsparse.pack &&
-	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
-	test_cmp expect_objects.txt nonsparse_objects.txt
-
-d614884b9b2195861f9f3410ae24b1c2fdc0c831
-ok 2 - non-sparse pack-objects
-
-expecting success of 5322.3 'sparse pack-objects': 
-	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp expect_objects.txt sparse_objects.txt
-
-d614884b9b2195861f9f3410ae24b1c2fdc0c831
-ok 3 - sparse pack-objects
-
-expecting success of 5322.4 'duplicate a folder from f3 and commit to topic1': 
-	git checkout topic1 &&
-	echo change-3 >f3/f3/data.txt &&
-	git commit -a -m "Changed f3/f3/data.txt" &&
-	git rev-parse			\
-		topic1~1		\
-		topic1~1^{tree}		\
-		topic1^{tree}		\
-		topic1			\
-		topic1:f1		\
-		topic1:f1/f1		\
-		topic1:f1/f1/data.txt | sort >required_objects.txt
-
-Switched to branch 'topic1'
-[topic1 200bcc4] Changed f3/f3/data.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - duplicate a folder from f3 and commit to topic1
-
-expecting success of 5322.5 'non-sparse pack-objects': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
-	git index-pack -o nonsparse.idx nonsparse.pack &&
-	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
-	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
-	test_cmp required_objects.txt nonsparse_required_objects.txt
-
-46a30e027f51c2ad758015d56bda1ee6d4c8c84c
-ok 5 - non-sparse pack-objects
-
-expecting success of 5322.6 'sparse pack-objects': 
-	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	comm -1 -2 required_objects.txt sparse_objects.txt >sparse_required_objects.txt &&
-	test_cmp required_objects.txt sparse_required_objects.txt
-
-46a30e027f51c2ad758015d56bda1ee6d4c8c84c
-ok 6 - sparse pack-objects
-
-expecting success of 5322.7 'duplicate a folder from f1 into f3': 
-	mkdir f3/f4 &&
-	cp -r f1/f1/* f3/f4 &&
-	git add f3/f4 &&
-	git commit -m "Copied f1/f1 to f3/f4" &&
-	cat >packinput.txt <<-EOF &&
-	topic1
-	^topic1~1
-	EOF
-	git rev-parse		\
-		topic1		\
-		topic1^{tree}   \
-		topic1:f3 | sort >required_objects.txt
-
-[topic1 b9b902e] Copied f1/f1 to f3/f4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f3/f4/data.txt
-ok 7 - duplicate a folder from f1 into f3
-
-expecting success of 5322.8 'non-sparse pack-objects': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
-	git index-pack -o nonsparse.idx nonsparse.pack &&
-	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
-	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
-	test_cmp required_objects.txt nonsparse_required_objects.txt
-
-3b547739f421b9a4f5fc24410679e4e1f7de71cf
-ok 8 - non-sparse pack-objects
-
-expecting success of 5322.9 'sparse pack-objects': 
-	GIT_TEST_PACK_SPARSE=-1 &&
-	git rev-parse			\
-		topic1			\
-		topic1^{tree}		\
-		topic1:f3		\
-		topic1:f3/f4		\
-		topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt &&
-	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp expect_sparse_objects.txt sparse_objects.txt
-
-9f747802011a9f66e260a2ddb27f222338b37741
-ok 9 - sparse pack-objects
-
-expecting success of 5322.10 'pack.useSparse enables algorithm': 
-	git config pack.useSparse true &&
-	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp expect_sparse_objects.txt sparse_objects.txt
-
-9f747802011a9f66e260a2ddb27f222338b37741
-ok 10 - pack.useSparse enables algorithm
-
-expecting success of 5322.11 'pack.useSparse overridden': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp required_objects.txt sparse_objects.txt
-
-3b547739f421b9a4f5fc24410679e4e1f7de71cf
-ok 11 - pack.useSparse overridden
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5317-pack-objects-filter-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/.git/
-expecting success of 5317.1 'setup r1': 
-	git init r1 &&
-	for n in 1 2 3 4 5
-	do
-		echo "This is file: $n" > r1/file.$n &&
-		git -C r1 add file.$n &&
-		git -C r1 commit -m "$n" || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/r1/.git/
-[main (root-commit) a56c7ae] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.1
-[main 7d743f2] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.2
-[main fcc1d33] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.3
-[main e1d918e] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.4
-[main 90f11b5] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.5
-ok 1 - setup r1
-
-expecting success of 5317.2 'verify blob count in normal packfile': 
-	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-		>ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r1 index-pack ../all.pack &&
-
-	git -C r1 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-f8dba5b5a8cb3bf6f89b1b7a911fa01dfdb554ba
-ok 2 - verify blob count in normal packfile
-
-expecting success of 5317.3 'verify blob:none packfile has no blobs': 
-	git -C r1 pack-objects --revs --stdout --filter=blob:none >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r1 index-pack ../filter.pack &&
-
-	git -C r1 verify-pack -v ../filter.pack >verify_result &&
-	! grep blob verify_result
-
-74f9b05b95a30d347d8fdd7d07c62dd3cb5bc506
-ok 3 - verify blob:none packfile has no blobs
-
-expecting success of 5317.4 'verify blob:none packfile without --stdout': 
-	git -C r1 pack-objects --revs --filter=blob:none mypackname >packhash <<-EOF &&
-	HEAD
-	EOF
-	git -C r1 verify-pack -v "mypackname-$(cat packhash).pack" >verify_result &&
-	! grep blob verify_result
-
-ok 4 - verify blob:none packfile without --stdout
-
-expecting success of 5317.5 'verify normal and blob:none packfiles have same commits/trees': 
-	git -C r1 verify-pack -v ../all.pack >verify_result &&
-	grep -E "commit|tree" verify_result |
-	parse_verify_pack_blob_oid |
-	sort >expected &&
-
-	git -C r1 verify-pack -v ../filter.pack >verify_result &&
-	grep -E "commit|tree" verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 5 - verify normal and blob:none packfiles have same commits/trees
-
-expecting success of 5317.6 'get an error for missing tree object': 
-	git init r5 &&
-	echo foo >r5/foo &&
-	git -C r5 add foo &&
-	git -C r5 commit -m "foo" &&
-	git -C r5 rev-parse HEAD^{tree} >tree &&
-	del=$(sed "s|..|&/|" tree) &&
-	rm r5/.git/objects/$del &&
-	test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF &&
-	HEAD
-	EOF
-	grep "bad tree object" bad_tree
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/r5/.git/
-[main (root-commit) fbd86ca] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: bad tree object 205f6b799e7d5c2524468ca006a0131aa57ecce7
-ok 6 - get an error for missing tree object
-
-expecting success of 5317.7 'setup for tests of tree:0': 
-	mkdir r1/subtree &&
-	echo "This is a file in a subtree" >r1/subtree/file &&
-	git -C r1 add subtree/file &&
-	git -C r1 commit -m subtree
-
-[main 4b273c5] subtree
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subtree/file
-ok 7 - setup for tests of tree:0
-
-expecting success of 5317.8 'verify tree:0 packfile has no blobs or trees': 
-	git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r1 index-pack ../commitsonly.pack &&
-	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
-	! grep -E "tree|blob" objs
-
-a6f7596938aae585d3cefef3aa3c06c5b75da36b
-ok 8 - verify tree:0 packfile has no blobs or trees
-
-expecting success of 5317.9 'grab tree directly when using tree:0': 
-	# We should get the tree specified directly but not its blobs or subtrees.
-	git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
-	HEAD:
-	EOF
-	git -C r1 index-pack ../commitsonly.pack &&
-	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
-	awk "/tree|blob/{print \$1}" objs >trees_and_blobs &&
-	git -C r1 rev-parse HEAD: >expected &&
-	test_cmp expected trees_and_blobs
-
-2abcb6db3990fe53c59fd41f9590643ae34427f0
-ok 9 - grab tree directly when using tree:0
-
-expecting success of 5317.10 'setup r2': 
-	git init r2 &&
-	for n in 1000 10000
-	do
-		printf "%"$n"s" X > r2/large.$n &&
-		git -C r2 add large.$n &&
-		git -C r2 commit -m "$n" || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/r2/.git/
-[main (root-commit) 0c54972] 1000
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 large.1000
-[main fdc71e4] 10000
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 large.10000
-ok 10 - setup r2
-
-expecting success of 5317.11 'verify blob count in normal packfile': 
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../all.pack &&
-
-	git -C r2 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-2a8bc18f1802fcc19e573eb38f1963ba344c580b
-ok 11 - verify blob count in normal packfile
-
-expecting success of 5317.12 'verify blob:limit=500 omits all blobs': 
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=500 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	! grep blob verify_result
-
-d9abed358fce3ac0869120aa06e2664d45a80459
-ok 12 - verify blob:limit=500 omits all blobs
-
-expecting success of 5317.13 'verify blob:limit=1000': 
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1000 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	! grep blob verify_result
-
-d9abed358fce3ac0869120aa06e2664d45a80459
-ok 13 - verify blob:limit=1000
-
-expecting success of 5317.14 'verify blob:limit=1001': 
-	git -C r2 ls-files -s large.1000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 14 - verify blob:limit=1001
-
-expecting success of 5317.15 'verify blob:limit=10001': 
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-2a8bc18f1802fcc19e573eb38f1963ba344c580b
-ok 15 - verify blob:limit=10001
-
-expecting success of 5317.16 'verify blob:limit=1k': 
-	git -C r2 ls-files -s large.1000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 16 - verify blob:limit=1k
-
-expecting success of 5317.17 'verify explicitly specifying oversized blob in input': 
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	echo HEAD >objects &&
-	git -C r2 rev-parse HEAD:large.10000 >>objects &&
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack &&
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-caafb8a9cc92845f6f65afdea7e6fac6add3e5df
-ok 17 - verify explicitly specifying oversized blob in input
-
-expecting success of 5317.18 'verify blob:limit=1m': 
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-2a8bc18f1802fcc19e573eb38f1963ba344c580b
-ok 18 - verify blob:limit=1m
-
-expecting success of 5317.19 'verify normal and blob:limit packfiles have same commits/trees': 
-	git -C r2 verify-pack -v ../all.pack >verify_result &&
-	grep -E "commit|tree" verify_result |
-	parse_verify_pack_blob_oid |
-	sort >expected &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep -E "commit|tree" verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 19 - verify normal and blob:limit packfiles have same commits/trees
-
-expecting success of 5317.20 'verify small limit and big limit results in small limit': 
-	git -C r2 ls-files -s large.1000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 \
-		--filter=blob:limit=10001 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 20 - verify small limit and big limit results in small limit
-
-expecting success of 5317.21 'verify big limit and small limit results in small limit': 
-	git -C r2 ls-files -s large.1000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 \
-		--filter=blob:limit=1001 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 21 - verify big limit and small limit results in small limit
-
-expecting success of 5317.22 'setup r3': 
-	git init r3 &&
-	mkdir r3/dir1 &&
-	for n in sparse1 sparse2
-	do
-		echo "This is file: $n" > r3/$n &&
-		git -C r3 add $n &&
-		echo "This is file: dir1/$n" > r3/dir1/$n &&
-		git -C r3 add dir1/$n || return 1
-	done &&
-	git -C r3 commit -m "sparse" &&
-	echo dir1/ >pattern1 &&
-	echo sparse1 >pattern2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/r3/.git/
-[main (root-commit) b18fcc1] sparse
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 dir1/sparse1
- create mode 100644 dir1/sparse2
- create mode 100644 sparse1
- create mode 100644 sparse2
-ok 22 - setup r3
-
-expecting success of 5317.23 'verify blob count in normal packfile': 
-	git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
-		>ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r3 index-pack ../all.pack &&
-
-	git -C r3 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-c032f005b6a497478f1daa2fb324aa5c51224039
-ok 23 - verify blob count in normal packfile
-
-expecting success of 5317.24 'verify sparse:path=pattern1 fails': 
-	test_must_fail git -C r3 pack-objects --revs --stdout \
-		--filter=sparse:path=../pattern1 <<-EOF
-	HEAD
-	EOF
-
-fatal: sparse:path filters support has been dropped
-ok 24 - verify sparse:path=pattern1 fails
-
-expecting success of 5317.25 'verify sparse:path=pattern2 fails': 
-	test_must_fail git -C r3 pack-objects --revs --stdout \
-		--filter=sparse:path=../pattern2 <<-EOF
-	HEAD
-	EOF
-
-fatal: sparse:path filters support has been dropped
-ok 25 - verify sparse:path=pattern2 fails
-
-expecting success of 5317.26 'setup r4': 
-	git init r4 &&
-	mkdir r4/dir1 &&
-	for n in sparse1 sparse2
-	do
-		echo "This is file: $n" > r4/$n &&
-		git -C r4 add $n &&
-		echo "This is file: dir1/$n" > r4/dir1/$n &&
-		git -C r4 add dir1/$n || return 1
-	done &&
-	echo dir1/ >r4/pattern &&
-	git -C r4 add pattern &&
-	git -C r4 commit -m "pattern"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/r4/.git/
-[main (root-commit) 94c5152] pattern
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 dir1/sparse1
- create mode 100644 dir1/sparse2
- create mode 100644 pattern
- create mode 100644 sparse1
- create mode 100644 sparse2
-ok 26 - setup r4
-
-expecting success of 5317.27 'verify blob count in normal packfile': 
-	git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
-		>ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r4 index-pack ../all.pack &&
-
-	git -C r4 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-1eda0c5015c4170144f9c7ac96c56690163e1d85
-ok 27 - verify blob count in normal packfile
-
-expecting success of 5317.28 'verify sparse:oid=OID': 
-	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r4 ls-files -s pattern >staged &&
-	oid=$(test_parse_ls_files_stage_oids <staged) &&
-	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r4 index-pack ../filter.pack &&
-
-	git -C r4 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-095eef2cc427768a7687a30f2566b8e72ac0e449
-ok 28 - verify sparse:oid=OID
-
-expecting success of 5317.29 'verify sparse:oid=oid-ish': 
-	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r4 index-pack ../filter.pack &&
-
-	git -C r4 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-095eef2cc427768a7687a30f2566b8e72ac0e449
-ok 29 - verify sparse:oid=oid-ish
-
-expecting success of 5317.30 'setup r1 - delete loose blobs': 
-	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-		>ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	for id in `sed "s|..|&/|" expected`
-	do
-		rm r1/.git/objects/$id || return 1
-	done
-
-ok 30 - setup r1 - delete loose blobs
-
-expecting success of 5317.31 'verify pack-objects fails w/ missing objects': 
-	test_must_fail git -C r1 pack-objects --revs --stdout >miss.pack <<-EOF
-	HEAD
-	EOF
-
-fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
-ok 31 - verify pack-objects fails w/ missing objects
-
-expecting success of 5317.32 'verify pack-objects fails w/ --missing=error': 
-	test_must_fail git -C r1 pack-objects --revs --stdout --missing=error >miss.pack <<-EOF
-	HEAD
-	EOF
-
-fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
-ok 32 - verify pack-objects fails w/ --missing=error
-
-expecting success of 5317.33 'verify pack-objects w/ --missing=allow-any': 
-	git -C r1 pack-objects --revs --stdout --missing=allow-any >miss.pack <<-EOF
-	HEAD
-	EOF
-
-ok 33 - verify pack-objects w/ --missing=allow-any
-
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t4137-apply-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4137-apply-submodule/.git/
 expecting success of 4137.1 'apply_index: added submodule creates empty directory': 
@@ -299807,297 +299058,1047 @@
 1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5323-pack-redundant.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5323-pack-redundant/.git/
-expecting success of 5323.1 'setup main repo': 
-	git init --bare "$main_repo" &&
-	create_commits_in "$main_repo" A B C D E F G H I J K L M N O P Q R
+*** t5322-pack-objects-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5322-pack-objects-sparse/.git/
+expecting success of 5322.1 'setup repo': 
+	test_commit initial &&
+	for i in $(test_seq 1 3)
+	do
+		mkdir f$i &&
+		for j in $(test_seq 1 3)
+		do
+			mkdir f$i/f$j &&
+			echo $j >f$i/f$j/data.txt || return 1
+		done
+	done &&
+	git add . &&
+	git commit -m "Initialized trees" &&
+	for i in $(test_seq 1 3)
+	do
+		git checkout -b topic$i main &&
+		echo change-$i >f$i/f$i/data.txt &&
+		git commit -a -m "Changed f$i/f$i/data.txt" || return 1
+	done &&
+	cat >packinput.txt <<-EOF &&
+	topic1
+	^topic2
+	^topic3
+	EOF
+	git rev-parse			\
+		topic1			\
+		topic1^{tree}		\
+		topic1:f1		\
+		topic1:f1/f1		\
+		topic1:f1/f1/data.txt | sort >expect_objects.txt
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5323-pack-redundant/main.git/
-ok 1 - setup main repo
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main 8ccf85b] Initialized trees
+ Author: A U Thor <author@example.com>
+ 9 files changed, 9 insertions(+)
+ create mode 100644 f1/f1/data.txt
+ create mode 100644 f1/f2/data.txt
+ create mode 100644 f1/f3/data.txt
+ create mode 100644 f2/f1/data.txt
+ create mode 100644 f2/f2/data.txt
+ create mode 100644 f2/f3/data.txt
+ create mode 100644 f3/f1/data.txt
+ create mode 100644 f3/f2/data.txt
+ create mode 100644 f3/f3/data.txt
+Switched to a new branch 'topic1'
+[topic1 32cf0ab] Changed f1/f1/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'topic2'
+[topic2 2b44896] Changed f2/f2/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'topic3'
+[topic3 48a532e] Changed f3/f3/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup repo
 
-expecting success of 5323.2 'main: pack-redundant works with no packfile': 
-	(
-		cd "$main_repo" &&
-		cat >expect <<-EOF &&
-			fatal: Zero packs found!
-			EOF
-		test_must_fail $git_pack_redundant --all >actual 2>&1 &&
-		test_cmp expect actual
-	)
+expecting success of 5322.2 'non-sparse pack-objects': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
+	git index-pack -o nonsparse.idx nonsparse.pack &&
+	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
+	test_cmp expect_objects.txt nonsparse_objects.txt
 
-ok 2 - main: pack-redundant works with no packfile
+d614884b9b2195861f9f3410ae24b1c2fdc0c831
+ok 2 - non-sparse pack-objects
 
-expecting success of 5323.3 'main: pack-redundant works with one packfile': 
-	create_pack_in "$main_repo" P1 <<-EOF &&
-		$T
-		$A
-		$B
-		$C
-		$D
-		$E
-		$F
-		$R
-		EOF
-	(
-		cd "$main_repo" &&
-		$git_pack_redundant --all >out &&
-		test_must_be_empty out
-	)
+expecting success of 5322.3 'sparse pack-objects': 
+	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp expect_objects.txt sparse_objects.txt
 
-ok 3 - main: pack-redundant works with one packfile
+d614884b9b2195861f9f3410ae24b1c2fdc0c831
+ok 3 - sparse pack-objects
 
-expecting success of 5323.4 'main: no redundant for pack 1, 2, 3': 
-	create_pack_in "$main_repo" P2 <<-EOF &&
-		$B
-		$C
-		$D
-		$E
-		$G
-		$H
-		$I
-		EOF
-	create_pack_in "$main_repo" P3 <<-EOF &&
-		$F
-		$I
-		$J
-		$K
-		$L
-		$M
-		EOF
-	(
-		cd "$main_repo" &&
-		$git_pack_redundant --all >out &&
-		test_must_be_empty out
-	)
+expecting success of 5322.4 'duplicate a folder from f3 and commit to topic1': 
+	git checkout topic1 &&
+	echo change-3 >f3/f3/data.txt &&
+	git commit -a -m "Changed f3/f3/data.txt" &&
+	git rev-parse			\
+		topic1~1		\
+		topic1~1^{tree}		\
+		topic1^{tree}		\
+		topic1			\
+		topic1:f1		\
+		topic1:f1/f1		\
+		topic1:f1/f1/data.txt | sort >required_objects.txt
 
-ok 4 - main: no redundant for pack 1, 2, 3
+Switched to branch 'topic1'
+[topic1 200bcc4] Changed f3/f3/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - duplicate a folder from f3 and commit to topic1
 
-expecting success of 5323.5 'main: one of pack-2/pack-3 is redundant': 
-	create_pack_in "$main_repo" P4 <<-EOF &&
-		$J
-		$K
-		$L
-		$M
-		$P
-		EOF
-	create_pack_in "$main_repo" P5 <<-EOF &&
-		$G
-		$H
-		$N
-		$O
-		EOF
-	(
-		cd "$main_repo" &&
-		cat >expect <<-EOF &&
-			P3:$P3
-			EOF
-		$git_pack_redundant --all >out &&
-		format_packfiles <out >actual &&
-		test_cmp expect actual
-	)
+expecting success of 5322.5 'non-sparse pack-objects': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
+	git index-pack -o nonsparse.idx nonsparse.pack &&
+	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
+	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
+	test_cmp required_objects.txt nonsparse_required_objects.txt
 
-ok 5 - main: one of pack-2/pack-3 is redundant
+46a30e027f51c2ad758015d56bda1ee6d4c8c84c
+ok 5 - non-sparse pack-objects
 
-expecting success of 5323.6 'main: pack 2, 4, and 6 are redundant': 
-	create_pack_in "$main_repo" P6 <<-EOF &&
-		$N
-		$O
-		$Q
-		EOF
-	create_pack_in "$main_repo" P7 <<-EOF &&
-		$P
-		$Q
-		EOF
-	(
-		cd "$main_repo" &&
-		cat >expect <<-EOF &&
-			P2:$P2
-			P4:$P4
-			P6:$P6
-			EOF
-		$git_pack_redundant --all >out &&
-		format_packfiles <out >actual &&
-		test_cmp expect actual
-	)
+expecting success of 5322.6 'sparse pack-objects': 
+	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	comm -1 -2 required_objects.txt sparse_objects.txt >sparse_required_objects.txt &&
+	test_cmp required_objects.txt sparse_required_objects.txt
 
-ok 6 - main: pack 2, 4, and 6 are redundant
+46a30e027f51c2ad758015d56bda1ee6d4c8c84c
+ok 6 - sparse pack-objects
 
-expecting success of 5323.7 'main: pack-8 (subset of pack-1) is also redundant': 
-	create_pack_in "$main_repo" P8 <<-EOF &&
-		$A
-		EOF
-	(
-		cd "$main_repo" &&
-		cat >expect <<-EOF &&
-			P2:$P2
-			P4:$P4
-			P6:$P6
-			P8:$P8
-			EOF
-		$git_pack_redundant --all >out &&
-		format_packfiles <out >actual &&
-		test_cmp expect actual
-	)
+expecting success of 5322.7 'duplicate a folder from f1 into f3': 
+	mkdir f3/f4 &&
+	cp -r f1/f1/* f3/f4 &&
+	git add f3/f4 &&
+	git commit -m "Copied f1/f1 to f3/f4" &&
+	cat >packinput.txt <<-EOF &&
+	topic1
+	^topic1~1
+	EOF
+	git rev-parse		\
+		topic1		\
+		topic1^{tree}   \
+		topic1:f3 | sort >required_objects.txt
 
-ok 7 - main: pack-8 (subset of pack-1) is also redundant
+[topic1 b9b902e] Copied f1/f1 to f3/f4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f3/f4/data.txt
+ok 7 - duplicate a folder from f1 into f3
 
-expecting success of 5323.8 'main: clean loose objects': 
-	(
-		cd "$main_repo" &&
-		git prune-packed &&
-		find objects -type f | sed -e "/objects\/pack\//d" >out &&
-		test_must_be_empty out
-	)
+expecting success of 5322.8 'non-sparse pack-objects': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
+	git index-pack -o nonsparse.idx nonsparse.pack &&
+	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
+	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
+	test_cmp required_objects.txt nonsparse_required_objects.txt
 
-ok 8 - main: clean loose objects
+3b547739f421b9a4f5fc24410679e4e1f7de71cf
+ok 8 - non-sparse pack-objects
 
-expecting success of 5323.9 'main: remove redundant packs and pass fsck': 
-	(
-		cd "$main_repo" &&
-		$git_pack_redundant --all | xargs rm &&
-		git fsck &&
-		$git_pack_redundant --all >out &&
-		test_must_be_empty out
-	)
+expecting success of 5322.9 'sparse pack-objects': 
+	GIT_TEST_PACK_SPARSE=-1 &&
+	git rev-parse			\
+		topic1			\
+		topic1^{tree}		\
+		topic1:f3		\
+		topic1:f3/f4		\
+		topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt &&
+	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp expect_sparse_objects.txt sparse_objects.txt
 
-notice: HEAD points to an unborn branch (master)
-ok 9 - main: remove redundant packs and pass fsck
+9f747802011a9f66e260a2ddb27f222338b37741
+ok 9 - sparse pack-objects
 
-expecting success of 5323.10 'setup shared.git': 
-	git clone --mirror "$main_repo" "$shared_repo" &&
-	(
-		cd "$shared_repo" &&
-		printf "../../$main_repo/objects\n" >objects/info/alternates
-	)
+expecting success of 5322.10 'pack.useSparse enables algorithm': 
+	git config pack.useSparse true &&
+	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp expect_sparse_objects.txt sparse_objects.txt
 
-Cloning into bare repository 'shared.git'...
-done.
-ok 10 - setup shared.git
+9f747802011a9f66e260a2ddb27f222338b37741
+ok 10 - pack.useSparse enables algorithm
 
-expecting success of 5323.11 'shared: all packs are redundant, but no output without --alt-odb': 
-	(
-		cd "$shared_repo" &&
-		$git_pack_redundant --all >out &&
-		test_must_be_empty out
-	)
+expecting success of 5322.11 'pack.useSparse overridden': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp required_objects.txt sparse_objects.txt
 
-ok 11 - shared: all packs are redundant, but no output without --alt-odb
+3b547739f421b9a4f5fc24410679e4e1f7de71cf
+ok 11 - pack.useSparse overridden
 
-expecting success of 5323.12 'shared: show redundant packs in stderr for verbose mode': 
-	(
-		cd "$shared_repo" &&
-		cat >expect <<-EOF &&
-			P1:$P1
-			P3:$P3
-			P5:$P5
-			P7:$P7
-			EOF
-		$git_pack_redundant --all --verbose >out 2>out.err &&
-		test_must_be_empty out &&
-		grep "pack$" out.err | format_packfiles >actual &&
-		test_cmp expect actual
-	)
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5317-pack-objects-filter-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/.git/
+expecting success of 5317.1 'setup r1': 
+	git init r1 &&
+	for n in 1 2 3 4 5
+	do
+		echo "This is file: $n" > r1/file.$n &&
+		git -C r1 add file.$n &&
+		git -C r1 commit -m "$n" || return 1
+	done
 
-ok 12 - shared: show redundant packs in stderr for verbose mode
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/r1/.git/
+[main (root-commit) a56c7ae] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.1
+[main 7d743f2] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.2
+[main fcc1d33] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.3
+[main e1d918e] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.4
+[main 90f11b5] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.5
+ok 1 - setup r1
 
-expecting success of 5323.13 'shared: remove redundant packs, no packs left': 
-	(
-		cd "$shared_repo" &&
-		cat >expect <<-EOF &&
-			fatal: Zero packs found!
-			EOF
-		$git_pack_redundant --all --alt-odb | xargs rm &&
-		git fsck &&
-		test_must_fail $git_pack_redundant --all --alt-odb >actual 2>&1 &&
-		test_cmp expect actual
-	)
+expecting success of 5317.2 'verify blob count in normal packfile': 
+	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
 
-notice: HEAD points to an unborn branch (master)
-ok 13 - shared: remove redundant packs, no packs left
+	git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 index-pack ../all.pack &&
 
-expecting success of 5323.14 'shared: create new objects and packs': 
-	create_commits_in "$shared_repo" X Y Z &&
-	create_pack_in "$shared_repo" Px1 <<-EOF &&
-		$X
-		$Y
-		$Z
-		$A
-		$B
-		$C
-		EOF
-	create_pack_in "$shared_repo" Px2 <<-EOF
-		$X
-		$Y
-		$Z
-		$D
-		$E
-		$F
-		EOF
+	git -C r1 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-ok 14 - shared: create new objects and packs
+	test_cmp expected observed
 
-expecting success of 5323.15 'shared: no redundant without --alt-odb': 
-	(
-		cd "$shared_repo" &&
-		$git_pack_redundant --all >out &&
-		test_must_be_empty out
-	)
+f8dba5b5a8cb3bf6f89b1b7a911fa01dfdb554ba
+ok 2 - verify blob count in normal packfile
 
-ok 15 - shared: no redundant without --alt-odb
+expecting success of 5317.3 'verify blob:none packfile has no blobs': 
+	git -C r1 pack-objects --revs --stdout --filter=blob:none >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 index-pack ../filter.pack &&
 
-expecting success of 5323.16 'shared: one pack is redundant with --alt-odb': 
-	(
-		cd "$shared_repo" &&
-		$git_pack_redundant --all --alt-odb >out &&
-		format_packfiles <out >actual &&
-		test_line_count = 1 actual
-	)
+	git -C r1 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
 
-ok 16 - shared: one pack is redundant with --alt-odb
+74f9b05b95a30d347d8fdd7d07c62dd3cb5bc506
+ok 3 - verify blob:none packfile has no blobs
 
-expecting success of 5323.17 'shared: ignore unique objects and all two packs are redundant': 
-	(
-		cd "$shared_repo" &&
-		cat >expect <<-EOF &&
-			Px1:$Px1
-			Px2:$Px2
-			EOF
-		$git_pack_redundant --all --alt-odb >out <<-EOF &&
-			$X
-			$Y
-			$Z
-			EOF
-		format_packfiles <out >actual &&
-		test_cmp expect actual
-	)
+expecting success of 5317.4 'verify blob:none packfile without --stdout': 
+	git -C r1 pack-objects --revs --filter=blob:none mypackname >packhash <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 verify-pack -v "mypackname-$(cat packhash).pack" >verify_result &&
+	! grep blob verify_result
 
-ok 17 - shared: ignore unique objects and all two packs are redundant
+ok 4 - verify blob:none packfile without --stdout
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5325-reverse-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5325-reverse-index/.git/
-expecting success of 5325.1 'setup': 
-	test_commit base &&
+expecting success of 5317.5 'verify normal and blob:none packfiles have same commits/trees': 
+	git -C r1 verify-pack -v ../all.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >expected &&
 
-	test_config pack.writeReverseIndex false &&
-	pack=$(git pack-objects --all $packdir/pack) &&
-	rev=$packdir/pack-$pack.rev &&
+	git -C r1 verify-pack -v ../filter.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
 
-	test_path_is_missing $rev
+	test_cmp expected observed
 
-[master (root-commit) d1ff1c9] base
+ok 5 - verify normal and blob:none packfiles have same commits/trees
+
+expecting success of 5317.6 'get an error for missing tree object': 
+	git init r5 &&
+	echo foo >r5/foo &&
+	git -C r5 add foo &&
+	git -C r5 commit -m "foo" &&
+	git -C r5 rev-parse HEAD^{tree} >tree &&
+	del=$(sed "s|..|&/|" tree) &&
+	rm r5/.git/objects/$del &&
+	test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF &&
+	HEAD
+	EOF
+	grep "bad tree object" bad_tree
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/r5/.git/
+[main (root-commit) fbd86ca] foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 1 - setup
-
-expecting success of 5325.2 'index-pack with pack.writeReverseIndex': 
-	test_index_pack "" &&
-	test_path_is_missing $rev &&
+ create mode 100644 foo
+fatal: bad tree object 205f6b799e7d5c2524468ca006a0131aa57ecce7
+ok 6 - get an error for missing tree object
+
+expecting success of 5317.7 'setup for tests of tree:0': 
+	mkdir r1/subtree &&
+	echo "This is a file in a subtree" >r1/subtree/file &&
+	git -C r1 add subtree/file &&
+	git -C r1 commit -m subtree
+
+[main 4b273c5] subtree
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subtree/file
+ok 7 - setup for tests of tree:0
+
+expecting success of 5317.8 'verify tree:0 packfile has no blobs or trees': 
+	git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 index-pack ../commitsonly.pack &&
+	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
+	! grep -E "tree|blob" objs
+
+a6f7596938aae585d3cefef3aa3c06c5b75da36b
+ok 8 - verify tree:0 packfile has no blobs or trees
+
+expecting success of 5317.9 'grab tree directly when using tree:0': 
+	# We should get the tree specified directly but not its blobs or subtrees.
+	git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
+	HEAD:
+	EOF
+	git -C r1 index-pack ../commitsonly.pack &&
+	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
+	awk "/tree|blob/{print \$1}" objs >trees_and_blobs &&
+	git -C r1 rev-parse HEAD: >expected &&
+	test_cmp expected trees_and_blobs
+
+2abcb6db3990fe53c59fd41f9590643ae34427f0
+ok 9 - grab tree directly when using tree:0
+
+expecting success of 5317.10 'setup r2': 
+	git init r2 &&
+	for n in 1000 10000
+	do
+		printf "%"$n"s" X > r2/large.$n &&
+		git -C r2 add large.$n &&
+		git -C r2 commit -m "$n" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/r2/.git/
+[main (root-commit) 0c54972] 1000
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 large.1000
+[main fdc71e4] 10000
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 large.10000
+ok 10 - setup r2
+
+expecting success of 5317.11 'verify blob count in normal packfile': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../all.pack &&
+
+	git -C r2 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 11 - verify blob count in normal packfile
+
+expecting success of 5317.12 'verify blob:limit=500 omits all blobs': 
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=500 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
+
+d9abed358fce3ac0869120aa06e2664d45a80459
+ok 12 - verify blob:limit=500 omits all blobs
+
+expecting success of 5317.13 'verify blob:limit=1000': 
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1000 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
+
+d9abed358fce3ac0869120aa06e2664d45a80459
+ok 13 - verify blob:limit=1000
+
+expecting success of 5317.14 'verify blob:limit=1001': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 14 - verify blob:limit=1001
+
+expecting success of 5317.15 'verify blob:limit=10001': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 15 - verify blob:limit=10001
+
+expecting success of 5317.16 'verify blob:limit=1k': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 16 - verify blob:limit=1k
+
+expecting success of 5317.17 'verify explicitly specifying oversized blob in input': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	echo HEAD >objects &&
+	git -C r2 rev-parse HEAD:large.10000 >>objects &&
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack &&
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+caafb8a9cc92845f6f65afdea7e6fac6add3e5df
+ok 17 - verify explicitly specifying oversized blob in input
+
+expecting success of 5317.18 'verify blob:limit=1m': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 18 - verify blob:limit=1m
+
+expecting success of 5317.19 'verify normal and blob:limit packfiles have same commits/trees': 
+	git -C r2 verify-pack -v ../all.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >expected &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 19 - verify normal and blob:limit packfiles have same commits/trees
+
+expecting success of 5317.20 'verify small limit and big limit results in small limit': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 \
+		--filter=blob:limit=10001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 20 - verify small limit and big limit results in small limit
+
+expecting success of 5317.21 'verify big limit and small limit results in small limit': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 \
+		--filter=blob:limit=1001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 21 - verify big limit and small limit results in small limit
+
+expecting success of 5317.22 'setup r3': 
+	git init r3 &&
+	mkdir r3/dir1 &&
+	for n in sparse1 sparse2
+	do
+		echo "This is file: $n" > r3/$n &&
+		git -C r3 add $n &&
+		echo "This is file: dir1/$n" > r3/dir1/$n &&
+		git -C r3 add dir1/$n || return 1
+	done &&
+	git -C r3 commit -m "sparse" &&
+	echo dir1/ >pattern1 &&
+	echo sparse1 >pattern2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/r3/.git/
+[main (root-commit) b18fcc1] sparse
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 dir1/sparse1
+ create mode 100644 dir1/sparse2
+ create mode 100644 sparse1
+ create mode 100644 sparse2
+ok 22 - setup r3
+
+expecting success of 5317.23 'verify blob count in normal packfile': 
+	git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r3 index-pack ../all.pack &&
+
+	git -C r3 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+c032f005b6a497478f1daa2fb324aa5c51224039
+ok 23 - verify blob count in normal packfile
+
+expecting success of 5317.24 'verify sparse:path=pattern1 fails': 
+	test_must_fail git -C r3 pack-objects --revs --stdout \
+		--filter=sparse:path=../pattern1 <<-EOF
+	HEAD
+	EOF
+
+fatal: sparse:path filters support has been dropped
+ok 24 - verify sparse:path=pattern1 fails
+
+expecting success of 5317.25 'verify sparse:path=pattern2 fails': 
+	test_must_fail git -C r3 pack-objects --revs --stdout \
+		--filter=sparse:path=../pattern2 <<-EOF
+	HEAD
+	EOF
+
+fatal: sparse:path filters support has been dropped
+ok 25 - verify sparse:path=pattern2 fails
+
+expecting success of 5317.26 'setup r4': 
+	git init r4 &&
+	mkdir r4/dir1 &&
+	for n in sparse1 sparse2
+	do
+		echo "This is file: $n" > r4/$n &&
+		git -C r4 add $n &&
+		echo "This is file: dir1/$n" > r4/dir1/$n &&
+		git -C r4 add dir1/$n || return 1
+	done &&
+	echo dir1/ >r4/pattern &&
+	git -C r4 add pattern &&
+	git -C r4 commit -m "pattern"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5317-pack-objects-filter-objects/r4/.git/
+[main (root-commit) 94c5152] pattern
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 dir1/sparse1
+ create mode 100644 dir1/sparse2
+ create mode 100644 pattern
+ create mode 100644 sparse1
+ create mode 100644 sparse2
+ok 26 - setup r4
+
+expecting success of 5317.27 'verify blob count in normal packfile': 
+	git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../all.pack &&
+
+	git -C r4 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+1eda0c5015c4170144f9c7ac96c56690163e1d85
+ok 27 - verify blob count in normal packfile
+
+expecting success of 5317.28 'verify sparse:oid=OID': 
+	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r4 ls-files -s pattern >staged &&
+	oid=$(test_parse_ls_files_stage_oids <staged) &&
+	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../filter.pack &&
+
+	git -C r4 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+095eef2cc427768a7687a30f2566b8e72ac0e449
+ok 28 - verify sparse:oid=OID
+
+expecting success of 5317.29 'verify sparse:oid=oid-ish': 
+	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../filter.pack &&
+
+	git -C r4 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+095eef2cc427768a7687a30f2566b8e72ac0e449
+ok 29 - verify sparse:oid=oid-ish
+
+expecting success of 5317.30 'setup r1 - delete loose blobs': 
+	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	for id in `sed "s|..|&/|" expected`
+	do
+		rm r1/.git/objects/$id || return 1
+	done
+
+ok 30 - setup r1 - delete loose blobs
+
+expecting success of 5317.31 'verify pack-objects fails w/ missing objects': 
+	test_must_fail git -C r1 pack-objects --revs --stdout >miss.pack <<-EOF
+	HEAD
+	EOF
+
+fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
+ok 31 - verify pack-objects fails w/ missing objects
+
+expecting success of 5317.32 'verify pack-objects fails w/ --missing=error': 
+	test_must_fail git -C r1 pack-objects --revs --stdout --missing=error >miss.pack <<-EOF
+	HEAD
+	EOF
+
+fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
+ok 32 - verify pack-objects fails w/ --missing=error
+
+expecting success of 5317.33 'verify pack-objects w/ --missing=allow-any': 
+	git -C r1 pack-objects --revs --stdout --missing=allow-any >miss.pack <<-EOF
+	HEAD
+	EOF
+
+ok 33 - verify pack-objects w/ --missing=allow-any
+
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5323-pack-redundant.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5323-pack-redundant/.git/
+expecting success of 5323.1 'setup main repo': 
+	git init --bare "$main_repo" &&
+	create_commits_in "$main_repo" A B C D E F G H I J K L M N O P Q R
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5323-pack-redundant/main.git/
+ok 1 - setup main repo
+
+expecting success of 5323.2 'main: pack-redundant works with no packfile': 
+	(
+		cd "$main_repo" &&
+		cat >expect <<-EOF &&
+			fatal: Zero packs found!
+			EOF
+		test_must_fail $git_pack_redundant --all >actual 2>&1 &&
+		test_cmp expect actual
+	)
+
+ok 2 - main: pack-redundant works with no packfile
+
+expecting success of 5323.3 'main: pack-redundant works with one packfile': 
+	create_pack_in "$main_repo" P1 <<-EOF &&
+		$T
+		$A
+		$B
+		$C
+		$D
+		$E
+		$F
+		$R
+		EOF
+	(
+		cd "$main_repo" &&
+		$git_pack_redundant --all >out &&
+		test_must_be_empty out
+	)
+
+ok 3 - main: pack-redundant works with one packfile
+
+expecting success of 5323.4 'main: no redundant for pack 1, 2, 3': 
+	create_pack_in "$main_repo" P2 <<-EOF &&
+		$B
+		$C
+		$D
+		$E
+		$G
+		$H
+		$I
+		EOF
+	create_pack_in "$main_repo" P3 <<-EOF &&
+		$F
+		$I
+		$J
+		$K
+		$L
+		$M
+		EOF
+	(
+		cd "$main_repo" &&
+		$git_pack_redundant --all >out &&
+		test_must_be_empty out
+	)
+
+ok 4 - main: no redundant for pack 1, 2, 3
+
+expecting success of 5323.5 'main: one of pack-2/pack-3 is redundant': 
+	create_pack_in "$main_repo" P4 <<-EOF &&
+		$J
+		$K
+		$L
+		$M
+		$P
+		EOF
+	create_pack_in "$main_repo" P5 <<-EOF &&
+		$G
+		$H
+		$N
+		$O
+		EOF
+	(
+		cd "$main_repo" &&
+		cat >expect <<-EOF &&
+			P3:$P3
+			EOF
+		$git_pack_redundant --all >out &&
+		format_packfiles <out >actual &&
+		test_cmp expect actual
+	)
+
+ok 5 - main: one of pack-2/pack-3 is redundant
+
+expecting success of 5323.6 'main: pack 2, 4, and 6 are redundant': 
+	create_pack_in "$main_repo" P6 <<-EOF &&
+		$N
+		$O
+		$Q
+		EOF
+	create_pack_in "$main_repo" P7 <<-EOF &&
+		$P
+		$Q
+		EOF
+	(
+		cd "$main_repo" &&
+		cat >expect <<-EOF &&
+			P2:$P2
+			P4:$P4
+			P6:$P6
+			EOF
+		$git_pack_redundant --all >out &&
+		format_packfiles <out >actual &&
+		test_cmp expect actual
+	)
+
+ok 6 - main: pack 2, 4, and 6 are redundant
+
+expecting success of 5323.7 'main: pack-8 (subset of pack-1) is also redundant': 
+	create_pack_in "$main_repo" P8 <<-EOF &&
+		$A
+		EOF
+	(
+		cd "$main_repo" &&
+		cat >expect <<-EOF &&
+			P2:$P2
+			P4:$P4
+			P6:$P6
+			P8:$P8
+			EOF
+		$git_pack_redundant --all >out &&
+		format_packfiles <out >actual &&
+		test_cmp expect actual
+	)
+
+ok 7 - main: pack-8 (subset of pack-1) is also redundant
+
+expecting success of 5323.8 'main: clean loose objects': 
+	(
+		cd "$main_repo" &&
+		git prune-packed &&
+		find objects -type f | sed -e "/objects\/pack\//d" >out &&
+		test_must_be_empty out
+	)
+
+ok 8 - main: clean loose objects
+
+expecting success of 5323.9 'main: remove redundant packs and pass fsck': 
+	(
+		cd "$main_repo" &&
+		$git_pack_redundant --all | xargs rm &&
+		git fsck &&
+		$git_pack_redundant --all >out &&
+		test_must_be_empty out
+	)
+
+notice: HEAD points to an unborn branch (master)
+ok 9 - main: remove redundant packs and pass fsck
+
+expecting success of 5323.10 'setup shared.git': 
+	git clone --mirror "$main_repo" "$shared_repo" &&
+	(
+		cd "$shared_repo" &&
+		printf "../../$main_repo/objects\n" >objects/info/alternates
+	)
+
+Cloning into bare repository 'shared.git'...
+done.
+ok 10 - setup shared.git
+
+expecting success of 5323.11 'shared: all packs are redundant, but no output without --alt-odb': 
+	(
+		cd "$shared_repo" &&
+		$git_pack_redundant --all >out &&
+		test_must_be_empty out
+	)
+
+ok 11 - shared: all packs are redundant, but no output without --alt-odb
+
+expecting success of 5323.12 'shared: show redundant packs in stderr for verbose mode': 
+	(
+		cd "$shared_repo" &&
+		cat >expect <<-EOF &&
+			P1:$P1
+			P3:$P3
+			P5:$P5
+			P7:$P7
+			EOF
+		$git_pack_redundant --all --verbose >out 2>out.err &&
+		test_must_be_empty out &&
+		grep "pack$" out.err | format_packfiles >actual &&
+		test_cmp expect actual
+	)
+
+ok 12 - shared: show redundant packs in stderr for verbose mode
+
+expecting success of 5323.13 'shared: remove redundant packs, no packs left': 
+	(
+		cd "$shared_repo" &&
+		cat >expect <<-EOF &&
+			fatal: Zero packs found!
+			EOF
+		$git_pack_redundant --all --alt-odb | xargs rm &&
+		git fsck &&
+		test_must_fail $git_pack_redundant --all --alt-odb >actual 2>&1 &&
+		test_cmp expect actual
+	)
+
+notice: HEAD points to an unborn branch (master)
+ok 13 - shared: remove redundant packs, no packs left
+
+expecting success of 5323.14 'shared: create new objects and packs': 
+	create_commits_in "$shared_repo" X Y Z &&
+	create_pack_in "$shared_repo" Px1 <<-EOF &&
+		$X
+		$Y
+		$Z
+		$A
+		$B
+		$C
+		EOF
+	create_pack_in "$shared_repo" Px2 <<-EOF
+		$X
+		$Y
+		$Z
+		$D
+		$E
+		$F
+		EOF
+
+ok 14 - shared: create new objects and packs
+
+expecting success of 5323.15 'shared: no redundant without --alt-odb': 
+	(
+		cd "$shared_repo" &&
+		$git_pack_redundant --all >out &&
+		test_must_be_empty out
+	)
+
+ok 15 - shared: no redundant without --alt-odb
+
+expecting success of 5323.16 'shared: one pack is redundant with --alt-odb': 
+	(
+		cd "$shared_repo" &&
+		$git_pack_redundant --all --alt-odb >out &&
+		format_packfiles <out >actual &&
+		test_line_count = 1 actual
+	)
+
+ok 16 - shared: one pack is redundant with --alt-odb
+
+expecting success of 5323.17 'shared: ignore unique objects and all two packs are redundant': 
+	(
+		cd "$shared_repo" &&
+		cat >expect <<-EOF &&
+			Px1:$Px1
+			Px2:$Px2
+			EOF
+		$git_pack_redundant --all --alt-odb >out <<-EOF &&
+			$X
+			$Y
+			$Z
+			EOF
+		format_packfiles <out >actual &&
+		test_cmp expect actual
+	)
+
+ok 17 - shared: ignore unique objects and all two packs are redundant
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5325-reverse-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5325-reverse-index/.git/
+expecting success of 5325.1 'setup': 
+	test_commit base &&
+
+	test_config pack.writeReverseIndex false &&
+	pack=$(git pack-objects --all $packdir/pack) &&
+	rev=$packdir/pack-$pack.rev &&
+
+	test_path_is_missing $rev
+
+[master (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 5325.2 'index-pack with pack.writeReverseIndex': 
+	test_index_pack "" &&
+	test_path_is_missing $rev &&
 
 	test_index_pack false &&
 	test_path_is_missing $rev &&
@@ -300146,7 +300147,7 @@
 68c6c8c8538900694c32380ac1484201c8b60d8d
 4+0 records in
 4+0 records out
-4 bytes copied, 3.476e-05 s, 115 kB/s
+4 bytes copied, 0.00195945 s, 2.0 kB/s
 fatal: sha1 file '.git/objects/pack/pack-68c6c8c8538900694c32380ac1484201c8b60d8d.rev' validation error
 ok 4 - index-pack can verify reverse indexes
 
@@ -300279,7 +300280,7 @@
 
 5+0 records in
 5+0 records out
-5 bytes copied, 0.0121019 s, 0.4 kB/s
+5 bytes copied, 0.000468243 s, 10.7 kB/s
 error: invalid checksum
 ok 12 - fsck catches invalid checksum
 
@@ -300289,7 +300290,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00024772 s, 4.0 kB/s
+1 byte copied, 3.696e-05 s, 27.1 kB/s
 error: invalid rev-index position at 0: 1 != 1793
 ok 13 - fsck catches invalid row position
 
@@ -300299,7 +300300,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00035084 s, 2.9 kB/s
+1 byte copied, 0.00751333 s, 0.1 kB/s
 error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unknown signature
 ok 14 - fsck catches invalid header: magic number
 
@@ -300309,7 +300310,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 6.232e-05 s, 16.0 kB/s
+1 byte copied, 3.464e-05 s, 28.9 kB/s
 error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unsupported version 2
 ok 15 - fsck catches invalid header: version
 
@@ -300319,7 +300320,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00193068 s, 0.5 kB/s
+1 byte copied, 4.1081e-05 s, 24.3 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
 
@@ -300963,7 +300964,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00733656 s, 0.1 kB/s
+1 byte copied, 4.0521e-05 s, 24.7 kB/s
 fatal: pack signature mismatch
 ok 26 - verify-pack catches a corrupted pack signature
 
@@ -300977,7 +300978,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.784e-05 s, 26.4 kB/s
+1 byte copied, 0.00779697 s, 0.1 kB/s
 fatal: pack version 10 unsupported
 ok 27 - verify-pack catches a corrupted pack version
 
@@ -300991,7 +300992,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.616e-05 s, 27.7 kB/s
+1 byte copied, 3.484e-05 s, 28.7 kB/s
 fatal: pack has bad object at offset 12: unknown object type 0
 ok 28 - verify-pack catches a corrupted type/size of the 1st packed object data
 
@@ -301007,7 +301008,7 @@
 
 20+0 records in
 20+0 records out
-20 bytes copied, 0.00843572 s, 2.4 kB/s
+20 bytes copied, 0.00699076 s, 2.9 kB/s
 fatal: sha1 file 'test-3.idx' validation error
 ok 29 - verify-pack catches a corrupted sum of the index file itself
 
@@ -301694,17 +301695,17 @@
 3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc
 c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0
 total 36
-drwxr-xr-x  2 pbuilder1 pbuilder1  220 Mar  4 07:59 .
-drwxr-xr-x 13 pbuilder1 pbuilder1  260 Mar  4 07:59 ..
--r--r--r--  1 pbuilder1 pbuilder1 1156 Mar  4 07:59 pack-A-794781495799da912f5473db27abed9641406f96.idx
--r--r--r--  1 pbuilder1 pbuilder1  210 Mar  4 07:59 pack-A-794781495799da912f5473db27abed9641406f96.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Mar  4 07:59 pack-A-794781495799da912f5473db27abed9641406f96.rev
--r--r--r--  1 pbuilder1 pbuilder1 1156 Mar  4 07:59 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.idx
--r--r--r--  1 pbuilder1 pbuilder1  267 Mar  4 07:59 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Mar  4 07:59 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.rev
--r--r--r--  1 pbuilder1 pbuilder1 1156 Mar  4 07:59 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.idx
--r--r--r--  1 pbuilder1 pbuilder1  292 Mar  4 07:59 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Mar  4 07:59 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.rev
+drwxr-xr-x  2 pbuilder2 pbuilder2  220 Jan 30 02:12 .
+drwxr-xr-x 13 pbuilder2 pbuilder2  260 Jan 30 02:12 ..
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Jan 30 02:12 pack-A-794781495799da912f5473db27abed9641406f96.idx
+-r--r--r--  1 pbuilder2 pbuilder2  210 Jan 30 02:12 pack-A-794781495799da912f5473db27abed9641406f96.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Jan 30 02:12 pack-A-794781495799da912f5473db27abed9641406f96.rev
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Jan 30 02:12 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.idx
+-r--r--r--  1 pbuilder2 pbuilder2  267 Jan 30 02:12 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Jan 30 02:12 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.rev
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Jan 30 02:12 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.idx
+-r--r--r--  1 pbuilder2 pbuilder2  292 Jan 30 02:12 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Jan 30 02:12 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.rev
 ok 1 - setup for --stdin-packs tests
 
 expecting success of 5331.2 '--stdin-packs with excluded packs': 
@@ -301794,24 +301795,24 @@
  create mode 100644 D.t
 ac8103895b4f6d2ce5bec819104ee1f531ccbfb9
 total 60
-drwxr-xr-x 3 pbuilder1 pbuilder1  360 Mar  4 07:59 .
-drwxr-xr-x 4 pbuilder1 pbuilder1   80 Mar  4 07:59 ..
-drwxr-xr-x 8 pbuilder1 pbuilder1  260 Mar  4 07:59 .git
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Mar  4 07:59 A.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Mar  4 07:59 B.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Mar  4 07:59 C.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Mar  4 07:59 D.t
--rw-r--r-- 1 pbuilder1 pbuilder1  246 Mar  4 07:59 actual
--rw-r--r-- 1 pbuilder1 pbuilder1  335 Mar  4 07:59 actual.raw
--rw-r--r-- 1 pbuilder1 pbuilder1   55 Mar  4 07:59 err
--rw-r--r-- 1 pbuilder1 pbuilder1  246 Mar  4 07:59 expect
--rw-r--r-- 1 pbuilder1 pbuilder1  457 Mar  4 07:59 expect.raw
--r--r--r-- 1 pbuilder1 pbuilder1 1240 Mar  4 07:59 test-d79f0a91fe88b889c156c95980949119173ad813.idx
--r--r--r-- 1 pbuilder1 pbuilder1  470 Mar  4 07:59 test-d79f0a91fe88b889c156c95980949119173ad813.pack
--r--r--r-- 1 pbuilder1 pbuilder1   76 Mar  4 07:59 test-d79f0a91fe88b889c156c95980949119173ad813.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1324 Mar  4 07:59 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.idx
--r--r--r-- 1 pbuilder1 pbuilder1  693 Mar  4 07:59 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.pack
--r--r--r-- 1 pbuilder1 pbuilder1   88 Mar  4 07:59 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.rev
+drwxr-xr-x 3 pbuilder2 pbuilder2  360 Jan 30 02:12 .
+drwxr-xr-x 4 pbuilder2 pbuilder2   80 Jan 30 02:12 ..
+drwxr-xr-x 8 pbuilder2 pbuilder2  260 Jan 30 02:12 .git
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Jan 30 02:12 A.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Jan 30 02:12 B.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Jan 30 02:12 C.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Jan 30 02:12 D.t
+-rw-r--r-- 1 pbuilder2 pbuilder2  246 Jan 30 02:12 actual
+-rw-r--r-- 1 pbuilder2 pbuilder2  335 Jan 30 02:12 actual.raw
+-rw-r--r-- 1 pbuilder2 pbuilder2   55 Jan 30 02:12 err
+-rw-r--r-- 1 pbuilder2 pbuilder2  246 Jan 30 02:12 expect
+-rw-r--r-- 1 pbuilder2 pbuilder2  457 Jan 30 02:12 expect.raw
+-r--r--r-- 1 pbuilder2 pbuilder2 1240 Jan 30 02:12 test-d79f0a91fe88b889c156c95980949119173ad813.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  470 Jan 30 02:12 test-d79f0a91fe88b889c156c95980949119173ad813.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   76 Jan 30 02:12 test-d79f0a91fe88b889c156c95980949119173ad813.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1324 Jan 30 02:12 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  693 Jan 30 02:12 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   88 Jan 30 02:12 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.rev
 ok 5 - --stdin-packs with loose objects
 
 expecting success of 5331.6 '--stdin-packs with broken links': 
@@ -303079,7 +303080,7 @@
 
 20+0 records in
 20+0 records out
-20 bytes copied, 4.48e-05 s, 446 kB/s
+20 bytes copied, 4.048e-05 s, 494 kB/s
 ok 20 - [index v1] 2) create a stealth corruption in a delta base reference
 
 expecting success of 5302.21 '[index v1] 3) corrupted delta happily returned wrong data': 
@@ -303447,7 +303448,7 @@
 
 20+0 records in
 20+0 records out
-20 bytes copied, 4.024e-05 s, 497 kB/s
+20 bytes copied, 4.2321e-05 s, 473 kB/s
 ok 26 - [index v2] 2) create a stealth corruption in a delta base reference
 
 expecting success of 5302.27 '[index v2] 3) corrupted delta happily returned wrong data': 
@@ -303492,7 +303493,7 @@
 pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
 4+0 records in
 4+0 records out
-4 bytes copied, 3.536e-05 s, 113 kB/s
+4 bytes copied, 4.152e-05 s, 96.3 kB/s
 fatal: sha1 file '.git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx' validation error
 ok 30 - [index v2] 6) verify-pack detects CRC mismatch
 
@@ -303546,7 +303547,7 @@
 	test_grep "Resolving deltas" err
 
 pack	37e69ad54edf78401749c7eaf0410858eb6a64ba
-Receiving objects:   0% (1/303)
Receiving objects:   1% (4/303)
Receiving objects:   2% (7/303)
Receiving objects:   3% (10/303)
Receiving objects:   4% (13/303)
Receiving objects:   5% (16/303)
Receiving objects:   6% (19/303)
Receiving objects:   7% (22/303)
Receiving objects:   8% (25/303)
Receiving objects:   9% (28/303)
Receiving objects:  10% (31/303)
Receiving objects:  11% (34/303)
Receiving objects:  12% (37/303)
Receiving objects:  13% (40/303)
Receiving objects:  14% (43/303)
Receiving objects:  15% (46/303)
Receiving objects:  16% (49/303)
Receiving objects:  17% (52/303)
Receiving objects:  18% (55/303)
Receiving objects:  19% (58/303)
Receiving objects:  20% (61/303)
Receiving objects:  21% (64/303)
Receiving objects:  22% (67/303)
Receiving objects:  23% (70/303)
Receiving objects:  24% (73/303)
Receiving objects:  25% (76/303)
Receiving objects:  26% (79/303)
Receiving objects:  27% (82/303)
Receiving objects:  28% (85/303)
Receiving objects:  29% (88/303)
Receiving objects:  30% (91/303)
Receiving objects:  31% (94/303)
Receiving objects:  32% (97/303)
Receiving objects:  33% (100/303)
Receiving objects:  34% (104/303)
Receiving objects:  35% (107/303)
Receiving objects:  36% (110/303)
Receiving objects:  37% (113/303)
Receiving objects:  38% (116/303)
Receiving objects:  39% (119/303)
Receiving objects:  40% (122/303)
Receiving objects:  41% (125/303)
Receiving objects:  42% (128/303)
Receiving objects:  43% (131/303)
Receiving objects:  44% (134/303)
Receiving objects:  45% (137/303)
Receiving objects:  46% (140/303)
Receiving objects:  47% (143/303)
Receiving objects:  48% (146/303)
Receiving objects:  49% (149/303)
Receiving objects:  50% (152/303)
Receiving objects:  51% (155/303)
Receiving objects:  52% (158/303)
Receiving objects:  53% (161/303)
Receiving objects:  54% (164/303)
Receiving objects:  55% (167/303)
Receiving objects:  56% (170/303)
Receiving objects:  57% (173/303)
Receiving objects:  58% (176/303)
Receiving objects:  59% (179/303)
Receiving objects:  60% (182/303)
Receiving objects:  61% (185/303)
Receiving objects:  62% (188/303)
Receiving objects:  63% (191/303)
Receiving objects:  64% (194/303)
Receiving objects:  65% (197/303)
Receiving objects:  66% (200/303)
Receiving objects:  67% (204/303)
Receiving objects:  68% (207/303)
Receiving objects:  69% (210/303)
Receiving objects:  70% (213/303)
Receiving objects:  71% (216/303)
Receiving objects:  72% (219/303)
Receiving objects:  73% (222/303)
Receiving objects:  74% (225/303)
Receiving objects:  75% (228/303)
Receiving objects:  76% (231/303)
Receiving objects:  77% (234/303)
Receiving objects:  78% (237/303)
Receiving objects:  79% (240/303)
Receiving objects:  80% (243/303)
Receiving objects:  81% (246/303)
Receiving objects:  82% (249/303)
Receiving objects:  83% (252/303)
Receiving objects:  84% (255/303)
Receiving objects:  85% (258/303)
Receiving objects:  86% (261/303)
Receiving objects:  87% (264/303)
Receiving objects:  88% (267/303)
Receiving objects:  89% (270/303)
Receiving objects:  90% (273/303)
Receiving objects:  91% (276/303)
Receiving objects:  92% (279/303)
Receiving objects:  93% (282/303)
Receiving objects:  94% (285/303)
Receiving objects:  95% (288/303)
Receiving objects:  96% (291/303)
Receiving objects:  97% (294/303)
Receiving objects:  98% (297/303)
Receiving objects:  99% (300/303)
Receiving objects: 100% (303/303)
Receiving objects: 100% (303/303), 833.39 KiB | 32.05 MiB/s, done.
+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 | 19.84 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
 
@@ -304600,8 +304601,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":"20260304T075925.118304Z-H8d819085-P00096725","thread":"main","time":"2026-03-04T07:59:25.127732Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.009622,"t_rel":0.000018,"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":"20260304T075925.182187Z-H8d819085-P00096755","thread":"main","time":"2026-03-04T07:59:25.184549Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.002514,"t_rel":0.000018,"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":"20250130T021228.084195Z-H5c947e1c-P001cb13b","thread":"main","time":"2025-01-30T02:12:28.100530Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.016532,"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":"20250130T021228.162112Z-H5c947e1c-P001cb168","thread":"main","time":"2025-01-30T02:12:28.200927Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.039017,"t_rel":0.000017,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":9,"bits_per_entry":15,"max_changed_paths":512}}
 ok 134 - persist filter settings
 
 expecting success of 4216.135 'correctly report changes over limit': 
@@ -304704,9 +304705,9 @@
  create mode 100644 foo.txt
  create mode 100644 foo/bar
  create mode 100644 mode/script.sh
-{"event":"data_json","sid":"20260304T075925.467286Z-H8d819085-P00096844","thread":"main","time":"2026-03-04T07:59:25.473172Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.006077,"t_rel":0.000029,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
-{"event":"data","sid":"20260304T075925.467286Z-H8d819085-P00096844","thread":"main","time":"2026-03-04T07:59:25.468889Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001793,"t_rel":0.001793,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260304T075925.467286Z-H8d819085-P00096844","thread":"main","time":"2026-03-04T07:59:25.468918Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001825,"t_rel":0.001825,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"1"}
+{"event":"data_json","sid":"20250130T021228.509960Z-H5c947e1c-P001cb250","thread":"main","time":"2025-01-30T02:12:28.519772Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.010023,"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":"20250130T021228.509960Z-H5c947e1c-P001cb250","thread":"main","time":"2025-01-30T02:12:28.519604Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.009852,"t_rel":0.009852,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250130T021228.509960Z-H5c947e1c-P001cb250","thread":"main","time":"2025-01-30T02:12:28.519638Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.009890,"t_rel":0.009890,"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(-)
@@ -304715,12 +304716,12 @@
  create mode 100644 foo
  delete mode 100644 foo/bar
  mode change 100644 => 100755 mode/script.sh
-{"event":"data_json","sid":"20260304T075925.910601Z-H8d819085-P000969f4","thread":"main","time":"2026-03-04T07:59:25.912606Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.002201,"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":"20260304T075925.910601Z-H8d819085-P000969f4","thread":"main","time":"2026-03-04T07:59:25.912434Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.002027,"t_rel":0.002027,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260304T075925.910601Z-H8d819085-P000969f4","thread":"main","time":"2026-03-04T07:59:25.912465Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002060,"t_rel":0.002060,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"2"}
-{"event":"data_json","sid":"20260304T075926.285712Z-H8d819085-P00096b4b","thread":"main","time":"2026-03-04T07:59:26.287585Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.002063,"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":"20260304T075926.285712Z-H8d819085-P00096b4b","thread":"main","time":"2026-03-04T07:59:26.287435Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001910,"t_rel":0.001910,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260304T075926.285712Z-H8d819085-P00096b4b","thread":"main","time":"2026-03-04T07:59:26.287463Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001941,"t_rel":0.001941,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data_json","sid":"20250130T021229.175611Z-H5c947e1c-P001cb46f","thread":"main","time":"2025-01-30T02:12:29.177663Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.002268,"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":"20250130T021229.175611Z-H5c947e1c-P001cb46f","thread":"main","time":"2025-01-30T02:12:29.177508Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.002111,"t_rel":0.002111,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250130T021229.175611Z-H5c947e1c-P001cb46f","thread":"main","time":"2025-01-30T02:12:29.177536Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002142,"t_rel":0.002142,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"2"}
+{"event":"data_json","sid":"20250130T021229.733984Z-H5c947e1c-P001cb5f2","thread":"main","time":"2025-01-30T02:12:29.744257Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.010473,"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":"20250130T021229.733984Z-H5c947e1c-P001cb5f2","thread":"main","time":"2025-01-30T02:12:29.744091Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.010305,"t_rel":0.010305,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250130T021229.733984Z-H5c947e1c-P001cb5f2","thread":"main","time":"2025-01-30T02:12:29.744123Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.010339,"t_rel":0.010339,"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': 
@@ -304742,10 +304743,10 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4216-log-bloom/empty/.git/
 [main (root-commit) 9c26810] initial commit
  Author: A U Thor <author@example.com>
-{"event":"data","sid":"20260304T075926.874664Z-H8d819085-P00096d82","thread":"main","time":"2026-03-04T07:59:26.876089Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001616,"t_rel":0.001616,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260304T075926.874664Z-H8d819085-P00096d82","thread":"main","time":"2026-03-04T07:59:26.876105Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.001635,"t_rel":0.001635,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"0"}
-{"event":"data","sid":"20260304T075926.874664Z-H8d819085-P00096d82","thread":"main","time":"2026-03-04T07:59:26.876112Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.001641,"t_rel":0.001641,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"1"}
-{"event":"data","sid":"20260304T075926.874664Z-H8d819085-P00096d82","thread":"main","time":"2026-03-04T07:59:26.876116Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001646,"t_rel":0.001646,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250130T021230.490012Z-H5c947e1c-P001cb7d4","thread":"main","time":"2025-01-30T02:12:30.499579Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.009773,"t_rel":0.009773,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250130T021230.490012Z-H5c947e1c-P001cb7d4","thread":"main","time":"2025-01-30T02:12:30.499600Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.009798,"t_rel":0.009798,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"0"}
+{"event":"data","sid":"20250130T021230.490012Z-H5c947e1c-P001cb7d4","thread":"main","time":"2025-01-30T02:12:30.499606Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.009804,"t_rel":0.009804,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"1"}
+{"event":"data","sid":"20250130T021230.490012Z-H5c947e1c-P001cb7d4","thread":"main","time":"2025-01-30T02:12:30.499610Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.009809,"t_rel":0.009809,"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': 
@@ -304777,10 +304778,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 no-filter
-{"event":"data","sid":"20260304T075927.289676Z-H8d819085-P00096ec3","thread":"main","time":"2026-03-04T07:59:27.291494Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.002024,"t_rel":0.002024,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260304T075927.289676Z-H8d819085-P00096ec3","thread":"main","time":"2026-03-04T07:59:27.291513Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.002046,"t_rel":0.002046,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"3"}
-{"event":"data","sid":"20260304T075927.289676Z-H8d819085-P00096ec3","thread":"main","time":"2026-03-04T07:59:27.291518Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.002051,"t_rel":0.002051,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20260304T075927.289676Z-H8d819085-P00096ec3","thread":"main","time":"2026-03-04T07:59:27.291523Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002056,"t_rel":0.002056,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250130T021230.893707Z-H5c947e1c-P001cb8f0","thread":"main","time":"2025-01-30T02:12:30.897337Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.003820,"t_rel":0.003820,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250130T021230.893707Z-H5c947e1c-P001cb8f0","thread":"main","time":"2025-01-30T02:12:30.897355Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.003842,"t_rel":0.003842,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"3"}
+{"event":"data","sid":"20250130T021230.893707Z-H5c947e1c-P001cb8f0","thread":"main","time":"2025-01-30T02:12:30.897360Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.003848,"t_rel":0.003848,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20250130T021230.893707Z-H5c947e1c-P001cb8f0","thread":"main","time":"2025-01-30T02:12:30.897365Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.003852,"t_rel":0.003852,"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': 
@@ -304799,10 +304800,10 @@
 		test_filter_trunc_large 0 trace.event
 	)
 
-{"event":"data","sid":"20260304T075927.451967Z-H8d819085-P00096f4c","thread":"main","time":"2026-03-04T07:59:27.453629Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001844,"t_rel":0.001844,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260304T075927.451967Z-H8d819085-P00096f4c","thread":"main","time":"2026-03-04T07:59:27.453648Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.001866,"t_rel":0.001866,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20260304T075927.451967Z-H8d819085-P00096f4c","thread":"main","time":"2026-03-04T07:59:27.453654Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.001871,"t_rel":0.001871,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20260304T075927.451967Z-H8d819085-P00096f4c","thread":"main","time":"2026-03-04T07:59:27.453659Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001876,"t_rel":0.001876,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250130T021231.041899Z-H5c947e1c-P001cb95c","thread":"main","time":"2025-01-30T02:12:31.049535Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.007822,"t_rel":0.007822,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250130T021231.041899Z-H5c947e1c-P001cb95c","thread":"main","time":"2025-01-30T02:12:31.049558Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.007848,"t_rel":0.007848,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20250130T021231.041899Z-H5c947e1c-P001cb95c","thread":"main","time":"2025-01-30T02:12:31.049563Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.007853,"t_rel":0.007853,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20250130T021231.041899Z-H5c947e1c-P001cb95c","thread":"main","time":"2025-01-30T02:12:31.049568Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.007858,"t_rel":0.007858,"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': 
@@ -304833,10 +304834,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-{"event":"data","sid":"20260304T075927.834565Z-H8d819085-P0009707c","thread":"main","time":"2026-03-04T07:59:27.836163Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001772,"t_rel":0.001772,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260304T075927.834565Z-H8d819085-P0009707c","thread":"main","time":"2026-03-04T07:59:27.836181Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.001791,"t_rel":0.001791,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"1"}
-{"event":"data","sid":"20260304T075927.834565Z-H8d819085-P0009707c","thread":"main","time":"2026-03-04T07:59:27.836186Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.001797,"t_rel":0.001797,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20260304T075927.834565Z-H8d819085-P0009707c","thread":"main","time":"2026-03-04T07:59:27.836191Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001802,"t_rel":0.001802,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250130T021231.454171Z-H5c947e1c-P001cba9b","thread":"main","time":"2025-01-30T02:12:31.471897Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.017930,"t_rel":0.017930,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250130T021231.454171Z-H5c947e1c-P001cba9b","thread":"main","time":"2025-01-30T02:12:31.471918Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.017954,"t_rel":0.017954,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"1"}
+{"event":"data","sid":"20250130T021231.454171Z-H5c947e1c-P001cba9b","thread":"main","time":"2025-01-30T02:12:31.471924Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.017960,"t_rel":0.017960,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20250130T021231.454171Z-H5c947e1c-P001cba9b","thread":"main","time":"2025-01-30T02:12:31.471929Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.017965,"t_rel":0.017965,"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': 
@@ -304887,22 +304888,22 @@
  Author: A U Thor <author@example.com>
 [main 55bcad0] 6
  Author: A U Thor <author@example.com>
-{"event":"data","sid":"20260304T075928.258547Z-H8d819085-P00097211","thread":"main","time":"2026-03-04T07:59:28.260105Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001745,"t_rel":0.001745,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260304T075928.258547Z-H8d819085-P00097211","thread":"main","time":"2026-03-04T07:59:28.260121Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.001763,"t_rel":0.001763,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20260304T075928.258547Z-H8d819085-P00097211","thread":"main","time":"2026-03-04T07:59:28.260126Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.001768,"t_rel":0.001768,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20260304T075928.258547Z-H8d819085-P00097211","thread":"main","time":"2026-03-04T07:59:28.260131Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001773,"t_rel":0.001773,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20260304T075928.378479Z-H8d819085-P0009728a","thread":"main","time":"2026-03-04T07:59:28.380027Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001737,"t_rel":0.001737,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260304T075928.378479Z-H8d819085-P0009728a","thread":"main","time":"2026-03-04T07:59:28.380044Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.001756,"t_rel":0.001756,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20260304T075928.378479Z-H8d819085-P0009728a","thread":"main","time":"2026-03-04T07:59:28.380050Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.001763,"t_rel":0.001763,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20260304T075928.378479Z-H8d819085-P0009728a","thread":"main","time":"2026-03-04T07:59:28.380055Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001767,"t_rel":0.001767,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20260304T075928.490803Z-H8d819085-P000972fc","thread":"main","time":"2026-03-04T07:59:28.492561Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001935,"t_rel":0.001935,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260304T075928.490803Z-H8d819085-P000972fc","thread":"main","time":"2026-03-04T07:59:28.492579Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.001957,"t_rel":0.001957,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20260304T075928.490803Z-H8d819085-P000972fc","thread":"main","time":"2026-03-04T07:59:28.492584Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.001962,"t_rel":0.001962,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20260304T075928.490803Z-H8d819085-P000972fc","thread":"main","time":"2026-03-04T07:59:28.492589Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001967,"t_rel":0.001967,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20260304T075928.606699Z-H8d819085-P00097367","thread":"main","time":"2026-03-04T07:59:28.608258Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001743,"t_rel":0.001743,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
-{"event":"data","sid":"20260304T075928.606699Z-H8d819085-P00097367","thread":"main","time":"2026-03-04T07:59:28.608278Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.001767,"t_rel":0.001767,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"6"}
-{"event":"data","sid":"20260304T075928.606699Z-H8d819085-P00097367","thread":"main","time":"2026-03-04T07:59:28.608284Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.001773,"t_rel":0.001773,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20260304T075928.606699Z-H8d819085-P00097367","thread":"main","time":"2026-03-04T07:59:28.608289Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001777,"t_rel":0.001777,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250130T021231.952387Z-H5c947e1c-P001cbc13","thread":"main","time":"2025-01-30T02:12:31.954255Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.002057,"t_rel":0.002057,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250130T021231.952387Z-H5c947e1c-P001cbc13","thread":"main","time":"2025-01-30T02:12:31.954273Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.002078,"t_rel":0.002078,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20250130T021231.952387Z-H5c947e1c-P001cbc13","thread":"main","time":"2025-01-30T02:12:31.954278Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.002083,"t_rel":0.002083,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20250130T021231.952387Z-H5c947e1c-P001cbc13","thread":"main","time":"2025-01-30T02:12:31.954283Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002088,"t_rel":0.002088,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250130T021232.046353Z-H5c947e1c-P001cbc53","thread":"main","time":"2025-01-30T02:12:32.053642Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.007477,"t_rel":0.007477,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250130T021232.046353Z-H5c947e1c-P001cbc53","thread":"main","time":"2025-01-30T02:12:32.053664Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.007503,"t_rel":0.007503,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20250130T021232.046353Z-H5c947e1c-P001cbc53","thread":"main","time":"2025-01-30T02:12:32.053669Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.007508,"t_rel":0.007508,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20250130T021232.046353Z-H5c947e1c-P001cbc53","thread":"main","time":"2025-01-30T02:12:32.053674Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.007513,"t_rel":0.007513,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250130T021232.157968Z-H5c947e1c-P001cbc94","thread":"main","time":"2025-01-30T02:12:32.167665Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.009891,"t_rel":0.009891,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250130T021232.157968Z-H5c947e1c-P001cbc94","thread":"main","time":"2025-01-30T02:12:32.167687Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.009917,"t_rel":0.009917,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20250130T021232.157968Z-H5c947e1c-P001cbc94","thread":"main","time":"2025-01-30T02:12:32.167692Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.009922,"t_rel":0.009922,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20250130T021232.157968Z-H5c947e1c-P001cbc94","thread":"main","time":"2025-01-30T02:12:32.167697Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.009927,"t_rel":0.009927,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250130T021232.274107Z-H5c947e1c-P001cbceb","thread":"main","time":"2025-01-30T02:12:32.287649Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.013737,"t_rel":0.013737,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
+{"event":"data","sid":"20250130T021232.274107Z-H5c947e1c-P001cbceb","thread":"main","time":"2025-01-30T02:12:32.287674Z","file":"commit-graph.c","line":1779,"repo":1,"t_abs":0.013766,"t_rel":0.013766,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"6"}
+{"event":"data","sid":"20250130T021232.274107Z-H5c947e1c-P001cbceb","thread":"main","time":"2025-01-30T02:12:32.287679Z","file":"commit-graph.c","line":1781,"repo":1,"t_abs":0.013772,"t_rel":0.013772,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20250130T021232.274107Z-H5c947e1c-P001cbceb","thread":"main","time":"2025-01-30T02:12:32.287685Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.013777,"t_rel":0.013777,"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': 
@@ -304982,8 +304983,8 @@
 	test_must_be_empty err
 
 warning: disabling Bloom filters for commit-graph layer '012b593000b4075aa9fd8e011d8d65ec0907d392' due to incompatible settings
-{"event":"data_json","sid":"20260304T075929.131546Z-H8d819085-P00097559","thread":"main","time":"2026-03-04T07:59:29.133503Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.002127,"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}}
-07:59:29.214544 revision.c:675               | d0 | main                     | data_json    | r1  |  0.002012 |  0.002012 | bloom        | statistics:{"filter_not_present":0,"maybe":3,"definitely_not":0,"false_positive":0}
+{"event":"data_json","sid":"20250130T021232.957983Z-H5c947e1c-P001cbeba","thread":"main","time":"2025-01-30T02:12:32.967886Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.010095,"t_rel":0.000012,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":512}}
+02:12:33.103996 revision.c:675               | d0 | main                     | data_json    | r1  |  0.010162 |  0.010162 | 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': 
@@ -305021,7 +305022,7 @@
 	grep "{\"hash_version\":2,\"num_hashes\":7,\"bits_per_entry\":10,\"max_changed_paths\":512" trace2.txt
 
 warning: disabling Bloom filters for commit-graph layer 'e338a7a1b4cfa5f6bcd31aea3e027df67d06442a' due to incompatible settings
-{"event":"data_json","sid":"20260304T075929.494271Z-H8d819085-P000976bb","thread":"main","time":"2026-03-04T07:59:29.496072Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.001986,"t_rel":0.000012,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":2,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":512}}
+{"event":"data_json","sid":"20250130T021233.406647Z-H5c947e1c-P001cbffe","thread":"main","time":"2025-01-30T02:12:33.408566Z","file":"commit-graph.c","line":1459,"repo":1,"t_abs":0.002105,"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': 
@@ -305045,8 +305046,8 @@
 
 ok 146 - setup check value of version 1 changed-path
 
---- highbit1/expect	2026-03-04 07:59:29.623352315 +0000
-+++ highbit1/actual	2026-03-04 07:59:29.651352315 +0000
+--- highbit1/expect	2025-01-30 02:12:33.656392497 +0000
++++ highbit1/actual	2025-01-30 02:12:33.700392760 +0000
 @@ -1 +1 @@
 -52a9
 +c01f
@@ -305232,10 +305233,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\302\242"
-{"event":"data","sid":"20260304T075931.106653Z-H8d819085-P00097d22","thread":"main","time":"2026-03-04T07:59:31.108329Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001868,"t_rel":0.001868,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260304T075931.106653Z-H8d819085-P00097d22","thread":"main","time":"2026-03-04T07:59:31.108364Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001906,"t_rel":0.001906,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
-{"event":"data","sid":"20260304T075931.382645Z-H8d819085-P00097e31","thread":"main","time":"2026-03-04T07:59:31.384165Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001691,"t_rel":0.001691,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260304T075931.382645Z-H8d819085-P00097e31","thread":"main","time":"2026-03-04T07:59:31.384194Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001722,"t_rel":0.001722,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+{"event":"data","sid":"20250130T021235.682497Z-H5c947e1c-P001cc68c","thread":"main","time":"2025-01-30T02:12:35.688046Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.005721,"t_rel":0.005721,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250130T021235.682497Z-H5c947e1c-P001cc68c","thread":"main","time":"2025-01-30T02:12:35.688081Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.005759,"t_rel":0.005759,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+{"event":"data","sid":"20250130T021235.961627Z-H5c947e1c-P001cc74d","thread":"main","time":"2025-01-30T02:12:35.963161Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001745,"t_rel":0.001745,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250130T021235.961627Z-H5c947e1c-P001cc74d","thread":"main","time":"2025-01-30T02:12:35.963195Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001782,"t_rel":0.001782,"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': 
@@ -305262,10 +305263,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 no-high-bits
-{"event":"data","sid":"20260304T075931.622725Z-H8d819085-P00097f19","thread":"main","time":"2026-03-04T07:59:31.624424Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001885,"t_rel":0.001885,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260304T075931.622725Z-H8d819085-P00097f19","thread":"main","time":"2026-03-04T07:59:31.624459Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001923,"t_rel":0.001923,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
-{"event":"data","sid":"20260304T075931.714591Z-H8d819085-P00097f7a","thread":"main","time":"2026-03-04T07:59:31.716129Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001701,"t_rel":0.001701,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
-{"event":"data","sid":"20260304T075931.714591Z-H8d819085-P00097f7a","thread":"main","time":"2026-03-04T07:59:31.716163Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001740,"t_rel":0.001740,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"1"}
+{"event":"data","sid":"20250130T021236.239820Z-H5c947e1c-P001cc81b","thread":"main","time":"2025-01-30T02:12:36.241543Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001907,"t_rel":0.001907,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250130T021236.239820Z-H5c947e1c-P001cc81b","thread":"main","time":"2025-01-30T02:12:36.241578Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001945,"t_rel":0.001945,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+{"event":"data","sid":"20250130T021236.317280Z-H5c947e1c-P001cc851","thread":"main","time":"2025-01-30T02:12:36.318830Z","file":"commit-graph.c","line":1777,"repo":1,"t_abs":0.001743,"t_rel":0.001743,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
+{"event":"data","sid":"20250130T021236.317280Z-H5c947e1c-P001cc851","thread":"main","time":"2025-01-30T02:12:36.318862Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001780,"t_rel":0.001780,"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': 
@@ -305336,16 +305337,16 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 B.t
-{"event":"data","sid":"20260304T075930.028214Z-H8d819085-P000978dc","thread":"main","time":"2026-03-04T07:59:30.029530Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001485,"t_rel":0.001485,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260304T075930.028214Z-H8d819085-P000978dc","thread":"main","time":"2026-03-04T07:59:30.029534Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001489,"t_rel":0.001489,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250130T021233.504577Z-H5c947e1c-P001cc046","thread":"main","time":"2025-01-30T02:12:33.505813Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001421,"t_rel":0.001421,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250130T021233.504577Z-H5c947e1c-P001cc046","thread":"main","time":"2025-01-30T02:12:33.505817Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001425,"t_rel":0.001425,"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":"20260304T075930.142510Z-H8d819085-P0009795e","thread":"main","time":"2026-03-04T07:59:30.143714Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001370,"t_rel":0.001370,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260304T075930.142510Z-H8d819085-P0009795e","thread":"main","time":"2026-03-04T07:59:30.143718Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001374,"t_rel":0.001374,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250130T021233.630235Z-H5c947e1c-P001cc097","thread":"main","time":"2025-01-30T02:12:33.643694Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.013668,"t_rel":0.013668,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250130T021233.630235Z-H5c947e1c-P001cc097","thread":"main","time":"2025-01-30T02:12:33.643698Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.013672,"t_rel":0.013672,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 de700bb9d264590842bcbfd30aa3296a833289e8
 ok 2 - multi-pack reuse is disabled by default
 
@@ -305354,8 +305355,8 @@
 
 	test_pack_objects_reused_all 6 2
 
-{"event":"data","sid":"20260304T075930.222621Z-H8d819085-P000979a9","thread":"main","time":"2026-03-04T07:59:30.223777Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001334,"t_rel":0.001334,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20260304T075930.222621Z-H8d819085-P000979a9","thread":"main","time":"2026-03-04T07:59:30.223782Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001339,"t_rel":0.001339,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+{"event":"data","sid":"20250130T021233.738053Z-H5c947e1c-P001cc0de","thread":"main","time":"2025-01-30T02:12:33.739163Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001301,"t_rel":0.001301,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20250130T021233.738053Z-H5c947e1c-P001cc0de","thread":"main","time":"2025-01-30T02:12:33.739167Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001305,"t_rel":0.001305,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
 de700bb9d264590842bcbfd30aa3296a833289e8
 ok 3 - feature.experimental implies multi-pack reuse
 
@@ -305365,8 +305366,8 @@
 
 	test_pack_objects_reused_all 3 1
 
-{"event":"data","sid":"20260304T075930.305373Z-H8d819085-P000979f5","thread":"main","time":"2026-03-04T07:59:30.306592Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001392,"t_rel":0.001392,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260304T075930.305373Z-H8d819085-P000979f5","thread":"main","time":"2026-03-04T07:59:30.306596Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001396,"t_rel":0.001396,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250130T021233.922030Z-H5c947e1c-P001cc15d","thread":"main","time":"2025-01-30T02:12:33.923267Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001424,"t_rel":0.001424,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250130T021233.922030Z-H5c947e1c-P001cc15d","thread":"main","time":"2025-01-30T02:12:33.923272Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001428,"t_rel":0.001428,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 de700bb9d264590842bcbfd30aa3296a833289e8
 ok 4 - multi-pack reuse can be disabled with feature.experimental
 
@@ -305392,16 +305393,16 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 C.t
-{"event":"data","sid":"20260304T075930.653931Z-H8d819085-P00097b4c","thread":"main","time":"2026-03-04T07:59:30.655095Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001371,"t_rel":0.001371,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20260304T075930.653931Z-H8d819085-P00097b4c","thread":"main","time":"2026-03-04T07:59:30.655101Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001377,"t_rel":0.001377,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+{"event":"data","sid":"20250130T021234.360493Z-H5c947e1c-P001cc286","thread":"main","time":"2025-01-30T02:12:34.361660Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001348,"t_rel":0.001348,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20250130T021234.360493Z-H5c947e1c-P001cc286","thread":"main","time":"2025-01-30T02:12:34.361666Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001354,"t_rel":0.001354,"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":"20260304T075930.730826Z-H8d819085-P00097ba0","thread":"main","time":"2026-03-04T07:59:30.732031Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001380,"t_rel":0.001380,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"9"}
-{"event":"data","sid":"20260304T075930.730826Z-H8d819085-P00097ba0","thread":"main","time":"2026-03-04T07:59:30.732035Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001384,"t_rel":0.001384,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
+{"event":"data","sid":"20250130T021234.454220Z-H5c947e1c-P001cc2d1","thread":"main","time":"2025-01-30T02:12:34.463554Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.009530,"t_rel":0.009530,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"9"}
+{"event":"data","sid":"20250130T021234.454220Z-H5c947e1c-P001cc2d1","thread":"main","time":"2025-01-30T02:12:34.463558Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.009535,"t_rel":0.009535,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
 1340c9de031f500be0a197f1242f00a34ed6e9b8
 ok 7 - reuse all objects from all packs
 
@@ -305449,8 +305450,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F.t
-{"event":"data","sid":"20260304T075931.274626Z-H8d819085-P00097dce","thread":"main","time":"2026-03-04T07:59:31.275885Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001430,"t_rel":0.001430,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260304T075931.274626Z-H8d819085-P00097dce","thread":"main","time":"2026-03-04T07:59:31.275891Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001436,"t_rel":0.001436,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250130T021235.149980Z-H5c947e1c-P001cc4d5","thread":"main","time":"2025-01-30T02:12:35.151240Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001440,"t_rel":0.001440,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250130T021235.149980Z-H5c947e1c-P001cc4d5","thread":"main","time":"2025-01-30T02:12:35.151246Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001446,"t_rel":0.001446,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
 ok 8 - reuse objects from first pack with middle gap
 
@@ -305470,8 +305471,8 @@
 	test_pack_objects_reused 3 1 <in
 
 warning: unknown preferred pack: 'pack-.idx'
-{"event":"data","sid":"20260304T075931.382767Z-H8d819085-P00097e3b","thread":"main","time":"2026-03-04T07:59:31.383953Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001364,"t_rel":0.001364,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260304T075931.382767Z-H8d819085-P00097e3b","thread":"main","time":"2026-03-04T07:59:31.383960Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001371,"t_rel":0.001371,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250130T021235.351704Z-H5c947e1c-P001cc580","thread":"main","time":"2025-01-30T02:12:35.352987Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001491,"t_rel":0.001491,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250130T021235.351704Z-H5c947e1c-P001cc580","thread":"main","time":"2025-01-30T02:12:35.352993Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001497,"t_rel":0.001497,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
 ok 9 - reuse objects from middle pack with middle gap
 
@@ -305526,8 +305527,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-{"event":"data","sid":"20260304T075931.846635Z-H8d819085-P00097ff3","thread":"main","time":"2026-03-04T07:59:31.847883Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001431,"t_rel":0.001431,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260304T075931.846635Z-H8d819085-P00097ff3","thread":"main","time":"2026-03-04T07:59:31.847889Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001437,"t_rel":0.001437,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250130T021235.959967Z-H5c947e1c-P001cc75a","thread":"main","time":"2025-01-30T02:12:35.961232Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001469,"t_rel":0.001469,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250130T021235.959967Z-H5c947e1c-P001cc75a","thread":"main","time":"2025-01-30T02:12:35.961238Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001475,"t_rel":0.001475,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 341840e0d76cb213079e38bae778b53364232eb5
 ok 10 - omit delta with uninteresting base (same pack)
 
@@ -305546,8 +305547,8 @@
 
 	test_pack_objects_reused_all $(($objects_nr - 1)) $packs_nr
 
-{"event":"data","sid":"20260304T075932.026000Z-H8d819085-P000980b1","thread":"main","time":"2026-03-04T07:59:32.027561Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001790,"t_rel":0.001790,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"26"}
-{"event":"data","sid":"20260304T075932.026000Z-H8d819085-P000980b1","thread":"main","time":"2026-03-04T07:59:32.027565Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001795,"t_rel":0.001795,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
+{"event":"data","sid":"20250130T021236.258391Z-H5c947e1c-P001cc826","thread":"main","time":"2025-01-30T02:12:36.264330Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.006120,"t_rel":0.006120,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"26"}
+{"event":"data","sid":"20250130T021236.258391Z-H5c947e1c-P001cc826","thread":"main","time":"2025-01-30T02:12:36.264335Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.006124,"t_rel":0.006124,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
 def7cb61a9e70183adbf1acab0912d686622303a
 ok 11 - omit delta from uninteresting base (cross pack)
 
@@ -305576,8 +305577,8 @@
 
 	test_pack_objects_reused_all $(wc -l <expect) 1
 
-{"event":"data","sid":"20260304T075932.342647Z-H8d819085-P00098205","thread":"main","time":"2026-03-04T07:59:32.361554Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.019081,"t_rel":0.019081,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20260304T075932.342647Z-H8d819085-P00098205","thread":"main","time":"2026-03-04T07:59:32.361559Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.019086,"t_rel":0.019086,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250130T021236.690468Z-H5c947e1c-P001cc945","thread":"main","time":"2025-01-30T02:12:36.731912Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.041671,"t_rel":0.041671,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20250130T021236.690468Z-H5c947e1c-P001cc945","thread":"main","time":"2025-01-30T02:12:36.731916Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.041675,"t_rel":0.041675,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 48c334c15e539df3382db77f74c864a1d31091b9
 ok 12 - non-omitted delta in MIDX preferred pack
 
@@ -305608,8 +305609,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"data","sid":"20260304T075932.759486Z-H8d819085-P000983cb","thread":"main","time":"2026-03-04T07:59:32.760744Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001434,"t_rel":0.001434,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260304T075932.759486Z-H8d819085-P000983cb","thread":"main","time":"2026-03-04T07:59:32.760748Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001438,"t_rel":0.001438,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+{"event":"data","sid":"20250130T021237.164579Z-H5c947e1c-P001cca8d","thread":"main","time":"2025-01-30T02:12:37.165742Z","file":"builtin/pack-objects.c","line":4669,"repo":1,"t_abs":0.001335,"t_rel":0.001335,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250130T021237.164579Z-H5c947e1c-P001cca8d","thread":"main","time":"2025-01-30T02:12:37.165746Z","file":"builtin/pack-objects.c","line":4670,"repo":1,"t_abs":0.001339,"t_rel":0.001339,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
 b572b333cdb15dbb54fe65e0e1361617040627d7
 ok 13 - duplicate objects
 
@@ -305779,6 +305780,1141 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t4255-am-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/.git/
+expecting success of 4255.1 'am: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - am: added submodule creates empty directory
+
+expecting success of 4255.2 'am: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - am: added submodule leaves existing empty directory alone
+
+expecting success of 4255.3 'am: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Applying: Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - am: replace tracked file with submodule creates empty directory
+
+expecting success of 4255.4 'am: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Applying: Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - am: replace directory with submodule
+
+expecting success of 4255.5 'am: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Revert "Add sub1"
+ok 5 - am: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 4255.6 'am: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Revert "Add sub1"
+ok 6 - am: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 4255.7 'am: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: sub1/file1: already exists in working directory
+error: sub1/file2: already exists in working directory
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Applying: Replace sub1 with directory
+Patch failed at 0001 Replace sub1 with directory
+ok 7 - am: replace submodule with a directory must fail
+
+expecting success of 4255.8 'am: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: sub1/file1: already exists in working directory
+error: sub1/file2: already exists in working directory
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Applying: Replace sub1 with directory
+Patch failed at 0001 Replace sub1 with directory
+ok 8 - am: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 4255.9 'am: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+warning: unable to rmdir 'sub1': Directory not empty
+error: unable to write file 'sub1' mode 100644: Directory not empty
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Applying: Replace sub1 with file
+Patch failed at 0001 Replace sub1 with file
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 9 - am: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 4255.10 'am: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+warning: unable to rmdir 'sub1': Directory not empty
+error: unable to write file 'sub1' mode 100644: Directory not empty
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Applying: Replace sub1 with file
+Patch failed at 0001 Replace sub1 with file
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 10 - am: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 4255.11 'am: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Modify sub1
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - am: modified submodule does not update submodule work tree
+
+expecting success of 4255.12 'am: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Invalid sub1 commit
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - am: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 4255.13 'am: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Applying: Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - am: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 4255.14 'am: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: sub1: already exists in working directory
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Applying: Add sub1
+Patch failed at 0001 Add sub1
+ok 14 - am: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 4255.15 'am_3way: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 15 - am_3way: added submodule creates empty directory
+
+expecting success of 4255.16 'am_3way: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 16 - am_3way: added submodule leaves existing empty directory alone
+
+expecting success of 4255.17 'am_3way: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Applying: Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 17 - am_3way: replace tracked file with submodule creates empty directory
+
+expecting success of 4255.18 'am_3way: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Applying: Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 18 - am_3way: replace directory with submodule
+
+expecting success of 4255.19 'am_3way: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Applying: Revert "Add sub1"
+ok 19 - am_3way: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 4255.20 'am_3way: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Applying: Revert "Add sub1"
+ok 20 - am_3way: removed submodule leaves submodule containing a .git directory alone
+
+checking known breakage of 4255.21 'am_3way: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Applying: Replace sub1 with directory
+error: refusing to lose untracked file at 'sub1/file2'
+error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with directory
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+Adding sub1/file3
+Adding sub1/file2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with directory
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 21 - am_3way: replace submodule with a directory must fail # TODO known breakage
+
+checking known breakage of 4255.22 'am_3way: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Applying: Replace sub1 with directory
+error: refusing to lose untracked file at 'sub1/file2'
+error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with directory
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+Adding sub1/file3
+Adding sub1/file2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with directory
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 22 - am_3way: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+
+checking known breakage of 4255.23 'am_3way: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Applying: Replace sub1 with file
+error: Your local changes to the following files would be overwritten by merge:
+	.gitmodules
+Please commit your changes or stash them before you merge.
+Aborting
+error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with file
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with file
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 23 - am_3way: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 4255.24 'am_3way: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Applying: Replace sub1 with file
+error: Your local changes to the following files would be overwritten by merge:
+	.gitmodules
+Please commit your changes or stash them before you merge.
+Aborting
+error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with file
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with file
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 24 - am_3way: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 4255.25 'am_3way: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Applying: Modify sub1
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 25 - am_3way: modified submodule does not update submodule work tree
+
+expecting success of 4255.26 'am_3way: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Applying: Invalid sub1 commit
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 26 - am_3way: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 4255.27 'am_3way: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Applying: Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 27 - am_3way: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 4255.28 'am_3way: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+error: merging of trees ec38489b3f8eda08fda17055ad272abc24bdf929 and 82fc70d33d0f376c5a25b599423c89e5452a2bf1 failed
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+27611a5 Base
+virtual Add sub1
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 Add sub1
+ok 28 - am_3way: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 4255.29 'setup diff.submodule': 
+	test_commit one &&
+	INITIAL=$(git rev-parse HEAD) &&
+
+	git init submodule &&
+	(
+		cd submodule &&
+		test_commit two &&
+		git rev-parse HEAD >../initial-submodule
+	) &&
+	git submodule add ./submodule &&
+	git commit -m first &&
+
+	(
+		cd submodule &&
+		test_commit three &&
+		git rev-parse HEAD >../first-submodule
+	) &&
+	git add submodule &&
+	git commit -m second &&
+	SECOND=$(git rev-parse HEAD) &&
+
+	(
+		cd submodule &&
+		git mv two.t four.t &&
+		git commit -m "second submodule" &&
+		git rev-parse HEAD >../second-submodule
+	) &&
+	test_commit four &&
+	git add submodule &&
+	git commit --amend --no-edit &&
+	THIRD=$(git rev-parse HEAD) &&
+	git submodule update --init
+
+[master (root-commit) 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.47.2/t/trash directory.t4255-am-submodule/submodule/.git/
+[master (root-commit) 274aeeb] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Adding existing repo at 'submodule' to the index
+[master 8fb6b7a] first
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+[master 2b16875] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[master 7cdc426] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master a623af5] second submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename two.t => four.t (100%)
+[master d6b9f1d] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+[master be614db] four
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 four.t
+ok 29 - setup diff.submodule
+
+expecting success of 4255.30 'diff.submodule unset': 
+	test_unconfig diff.submodule &&
+	run_test $SECOND first-submodule
+
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at 7cdc426 second
+0001-second.patch
+HEAD is now at 8fb6b7a first
+Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: second
+Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
+ok 30 - diff.submodule unset
+
+expecting success of 4255.31 'diff.submodule unset with extra file': 
+	test_unconfig diff.submodule &&
+	run_test $THIRD second-submodule
+
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at be614db four
+0001-four.patch
+HEAD is now at 7cdc426 second
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: four
+Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
+ok 31 - diff.submodule unset with extra file
+
+expecting success of 4255.32 'diff.submodule=log': 
+	test_config diff.submodule log &&
+	run_test $SECOND first-submodule
+
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at 7cdc426 second
+0001-second.patch
+HEAD is now at 8fb6b7a first
+Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: second
+Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
+ok 32 - diff.submodule=log
+
+expecting success of 4255.33 'diff.submodule=log with extra file': 
+	test_config diff.submodule log &&
+	run_test $THIRD second-submodule
+
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at be614db four
+0001-four.patch
+HEAD is now at 7cdc426 second
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: four
+Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
+ok 33 - diff.submodule=log with extra file
+
+# still have 6 known breakage(s)
+# passed all remaining 27 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5401-update-hooks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5401-update-hooks/.git/
 expecting success of 5401.1 'setup': 
@@ -306901,1139 +308037,497 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t4255-am-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/.git/
-expecting success of 4255.1 'am: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
+*** t5404-tracking-branches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5404-tracking-branches/.git/
+expecting success of 5404.1 'setup': 
+	echo 1 >file &&
+	git add file &&
+	git commit -m 1 &&
+	git branch b1 &&
+	git branch b2 &&
+	git branch b3 &&
+	git clone . aa &&
+	git checkout b1 &&
+	echo b1 >>file &&
+	git commit -a -m b1 &&
+	git checkout b2 &&
+	echo b2 >>file &&
+	git commit -a -m b2
+
+[main (root-commit) c663a66] 1
  Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1/sub2'...
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'aa'...
 done.
-[add_nested_sub 8b3b335] add a nested submodule
+Switched to branch 'b1'
+[b1 30569e6] b1
  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
+ 1 file changed, 1 insertion(+)
+Switched to branch 'b2'
+[b2 f149455] b2
  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
+ 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(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
+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(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ 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>
-To /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ 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.47.2/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.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5405-send-pack-rewind.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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>
- 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"
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5405-send-pack-rewind/another/.git/
+From ..
+ * [new branch]      main       -> main
+[main 3dc47c1] Second
  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
+ 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5403-post-checkout-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main a193130] rebase-on-me
  Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ 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>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - am: added submodule creates empty directory
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 1 - setup
 
-expecting success of 4255.2 'am: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - am: added submodule leaves existing empty directory alone
+expecting success of 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
 
-expecting success of 4255.3 'am: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Applying: Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - am: replace tracked file with submodule creates empty directory
+Already on 'main'
+ok 2 - post-checkout receives the right arguments with HEAD unchanged 
 
-expecting success of 4255.4 'am: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Applying: Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - am: replace directory with submodule
+expecting success of 5403.3 'post-checkout args are correct with git checkout -b ': 
+	test_when_finished "rm -f .git/post-checkout.args" &&
+	git checkout -b new1 &&
+	read old new flag <.git/post-checkout.args &&
+	test $old = $new && test $flag = 1
 
-expecting success of 4255.5 'am: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Revert "Add sub1"
-ok 5 - am: removed submodule leaves submodule directory and its contents in place
+Switched to a new branch 'new1'
+ok 3 - post-checkout args are correct with git checkout -b 
 
-expecting success of 4255.6 'am: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Revert "Add sub1"
-ok 6 - am: removed submodule leaves submodule containing a .git directory alone
+expecting success of 5403.4 'post-checkout receives the right args with HEAD changed ': 
+	test_when_finished "rm -f .git/post-checkout.args" &&
+	git checkout two &&
+	read old new flag <.git/post-checkout.args &&
+	test $old != $new && test $flag = 1
 
-expecting success of 4255.7 'am: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: sub1/file1: already exists in working directory
-error: sub1/file2: already exists in working directory
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Applying: Replace sub1 with directory
-Patch failed at 0001 Replace sub1 with directory
-ok 7 - am: replace submodule with a directory must fail
+Note: switching to 'two'.
 
-expecting success of 4255.8 'am: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: sub1/file1: already exists in working directory
-error: sub1/file2: already exists in working directory
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Applying: Replace sub1 with directory
-Patch failed at 0001 Replace sub1 with directory
-ok 8 - am: replace submodule containing a .git directory with a directory must fail
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 4255.9 'am: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-warning: unable to rmdir 'sub1': Directory not empty
-error: unable to write file 'sub1' mode 100644: Directory not empty
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Applying: Replace sub1 with file
-Patch failed at 0001 Replace sub1 with file
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 9 - am: replace submodule with a file must fail # TODO known breakage
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-checking known breakage of 4255.10 'am: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-warning: unable to rmdir 'sub1': Directory not empty
-error: unable to write file 'sub1' mode 100644: Directory not empty
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Applying: Replace sub1 with file
-Patch failed at 0001 Replace sub1 with file
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 10 - am: replace submodule containing a .git directory with a file must fail # TODO known breakage
+  git switch -c <new-branch-name>
 
-expecting success of 4255.11 'am: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Modify sub1
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - am: modified submodule does not update submodule work tree
+Or undo this operation with:
 
-expecting success of 4255.12 'am: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Invalid sub1 commit
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - am: modified submodule does not update submodule work tree to invalid commit
+  git switch -
 
-expecting success of 4255.13 'am: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Applying: Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - am: modified submodule does not update submodule work tree from invalid commit
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 4255.14 'am: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: sub1: already exists in working directory
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Applying: Add sub1
-Patch failed at 0001 Add sub1
-ok 14 - am: added submodule doesn't remove untracked unignored file with same name
+HEAD is now at 139b20d two
+ok 4 - post-checkout receives the right args with HEAD changed 
 
-expecting success of 4255.15 'am_3way: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 15 - am_3way: added submodule creates empty directory
+expecting success of 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
 
-expecting success of 4255.16 'am_3way: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 16 - am_3way: added submodule leaves existing empty directory alone
+ok 5 - post-checkout receives the right args when not switching branches 
 
-expecting success of 4255.17 'am_3way: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
+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
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Applying: Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 17 - am_3way: replace tracked file with submodule creates empty directory
+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 4255.18 'am_3way: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
+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
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Applying: Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 18 - am_3way: replace directory with submodule
+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 4255.19 'am_3way: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+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
 	
-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.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Applying: Revert "Add sub1"
-ok 19 - am_3way: removed submodule leaves submodule directory and its contents in place
+Note: switching to 'two'.
 
-expecting success of 4255.20 'am_3way: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Applying: Revert "Add sub1"
-ok 20 - am_3way: removed submodule leaves submodule containing a .git directory alone
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 4255.21 'am_3way: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Applying: Replace sub1 with directory
-error: refusing to lose untracked file at 'sub1/file2'
-error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with directory
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-Adding sub1/file3
-Adding sub1/file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with directory
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 21 - am_3way: replace submodule with a directory must fail # TODO known breakage
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-checking known breakage of 4255.22 'am_3way: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Applying: Replace sub1 with directory
-error: refusing to lose untracked file at 'sub1/file2'
-error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with directory
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-Adding sub1/file3
-Adding sub1/file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with directory
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 22 - am_3way: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+  git switch -c <new-branch-name>
 
-checking known breakage of 4255.23 'am_3way: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Applying: Replace sub1 with file
-error: Your local changes to the following files would be overwritten by merge:
-	.gitmodules
-Please commit your changes or stash them before you merge.
-Aborting
-error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with file
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with file
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 23 - am_3way: replace submodule with a file must fail # TODO known breakage
+Or undo this operation with:
 
-checking known breakage of 4255.24 'am_3way: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Applying: Replace sub1 with file
-error: Your local changes to the following files would be overwritten by merge:
-	.gitmodules
-Please commit your changes or stash them before you merge.
-Aborting
-error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with file
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with file
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 24 - am_3way: replace submodule containing a .git directory with a file must fail # TODO known breakage
+  git switch -
 
-expecting success of 4255.25 'am_3way: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Applying: Modify sub1
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 25 - am_3way: modified submodule does not update submodule work tree
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 4255.26 'am_3way: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+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
 	
-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.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Applying: Invalid sub1 commit
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 26 - am_3way: modified submodule does not update submodule work tree to invalid commit
+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 4255.27 'am_3way: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
+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
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Applying: Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 27 - am_3way: modified submodule does not update submodule work tree from invalid commit
+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 4255.28 'am_3way: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
+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
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-error: merging of trees ec38489b3f8eda08fda17055ad272abc24bdf929 and 82fc70d33d0f376c5a25b599423c89e5452a2bf1 failed
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-27611a5 Base
-virtual Add sub1
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 Add sub1
-ok 28 - am_3way: added submodule doesn't remove untracked unignored file with same name
+Note: switching to 'two'.
 
-expecting success of 4255.29 'setup diff.submodule': 
-	test_commit one &&
-	INITIAL=$(git rev-parse 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.
 
-	git init submodule &&
-	(
-		cd submodule &&
-		test_commit two &&
-		git rev-parse HEAD >../initial-submodule
-	) &&
-	git submodule add ./submodule &&
-	git commit -m 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:
 
-	(
-		cd submodule &&
-		test_commit three &&
-		git rev-parse HEAD >../first-submodule
-	) &&
-	git add submodule &&
-	git commit -m second &&
-	SECOND=$(git rev-parse HEAD) &&
+  git switch -c <new-branch-name>
 
-	(
-		cd submodule &&
-		git mv two.t four.t &&
-		git commit -m "second submodule" &&
-		git rev-parse HEAD >../second-submodule
-	) &&
-	test_commit four &&
-	git add submodule &&
-	git commit --amend --no-edit &&
-	THIRD=$(git rev-parse HEAD) &&
-	git submodule update --init
+Or undo this operation with:
 
-[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.47.2/t/trash directory.t4255-am-submodule/submodule/.git/
-[master (root-commit) 274aeeb] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Adding existing repo at 'submodule' to the index
-[master 8fb6b7a] first
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-[master 2b16875] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[master 7cdc426] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master a623af5] second submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename two.t => four.t (100%)
-[master d6b9f1d] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-[master be614db] four
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 four.t
-ok 29 - setup diff.submodule
+  git switch -
 
-expecting success of 4255.30 'diff.submodule unset': 
-	test_unconfig diff.submodule &&
-	run_test $SECOND first-submodule
+Turn off this advice by setting config variable advice.detachedHead to false
 
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at 7cdc426 second
-0001-second.patch
-HEAD is now at 8fb6b7a first
-Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: second
-Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
-ok 30 - diff.submodule unset
+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 4255.31 'diff.submodule unset with extra file': 
-	test_unconfig diff.submodule &&
-	run_test $THIRD second-submodule
+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
 
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at be614db four
-0001-four.patch
-HEAD is now at 7cdc426 second
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: four
-Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
-ok 31 - diff.submodule unset with extra file
 
-expecting success of 4255.32 'diff.submodule=log': 
-	test_config diff.submodule log &&
-	run_test $SECOND first-submodule
+Note: switching to 'two'.
 
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at 7cdc426 second
-0001-second.patch
-HEAD is now at 8fb6b7a first
-Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: second
-Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
-ok 32 - diff.submodule=log
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 4255.33 'diff.submodule=log with extra file': 
-	test_config diff.submodule log &&
-	run_test $THIRD second-submodule
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at be614db four
-0001-four.patch
-HEAD is now at 7cdc426 second
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: four
-Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
-ok 33 - diff.submodule=log with extra file
+  git switch -c <new-branch-name>
 
-# still have 6 known breakage(s)
-# passed all remaining 27 test(s)
-1..33
+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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5318-commit-graph.sh ***
@@ -308922,10 +309416,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.764e-05 s, 26.6 kB/s
+1 byte copied, 0.00703008 s, 0.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.34e-05 s, 0.0 kB/s
+0 bytes copied, 2.2e-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
@@ -308939,10 +309433,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.364e-05 s, 29.7 kB/s
+1 byte copied, 0.00748628 s, 0.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.26e-05 s, 0.0 kB/s
+0 bytes copied, 2.236e-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
@@ -308956,7 +309450,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0129619 s, 0.1 kB/s
+1 byte copied, 3.964e-05 s, 25.2 kB/s
 0+0 records in
 0+0 records out
 0 bytes copied, 2.156e-05 s, 0.0 kB/s
@@ -308973,10 +309467,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00034232 s, 2.9 kB/s
+1 byte copied, 5.476e-05 s, 18.3 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.376e-05 s, 0.0 kB/s
+0 bytes copied, 2.108e-05 s, 0.0 kB/s
 error: final chunk has non-zero id 4f49444c
 error: final chunk has non-zero id 4f49444c
 ?? expect
@@ -308990,10 +309484,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00029636 s, 3.4 kB/s
+1 byte copied, 3.768e-05 s, 26.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.212e-05 s, 0.0 kB/s
+0 bytes copied, 2.228e-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
@@ -309007,10 +309501,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.708e-05 s, 27.0 kB/s
+1 byte copied, 3.656e-05 s, 27.4 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 3.208e-05 s, 0.0 kB/s
+0 bytes copied, 2.16e-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
@@ -309024,10 +309518,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00764028 s, 0.1 kB/s
+1 byte copied, 3.752e-05 s, 26.7 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.3561e-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
@@ -309041,10 +309535,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.42e-05 s, 29.2 kB/s
+1 byte copied, 3.392e-05 s, 29.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.992e-05 s, 0.0 kB/s
+0 bytes copied, 2.28e-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
@@ -309060,10 +309554,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00866312 s, 0.1 kB/s
+1 byte copied, 3.848e-05 s, 26.0 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.976e-05 s, 0.0 kB/s
+0 bytes copied, 2.284e-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
@@ -309079,10 +309573,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00032084 s, 3.1 kB/s
+1 byte copied, 3.736e-05 s, 26.8 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.284e-05 s, 0.0 kB/s
+0 bytes copied, 2.208e-05 s, 0.0 kB/s
 commit-graph has incorrect OID order: d0dcf978085b712ac89a73020e40fb8b7e540ec4 then 01c8575ed6fc205127629848895ac35ba7529ace
 ?? expect
 ?? output
@@ -309094,10 +309588,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.604e-05 s, 27.7 kB/s
+1 byte copied, 3.852e-05 s, 26.0 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.44e-05 s, 0.0 kB/s
+0 bytes copied, 2.632e-05 s, 0.0 kB/s
 failed to parse commit 76c4cb0cede3ceaca44a01b27edce46ba498dfad from object database for commit-graph
 ?? expect
 ?? output
@@ -309109,10 +309603,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.916e-05 s, 20.3 kB/s
+1 byte copied, 3.236e-05 s, 30.9 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.136e-05 s, 0.0 kB/s
+0 bytes copied, 2.16e-05 s, 0.0 kB/s
 root tree OID for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 016f0284c84f93b3e8df8c402054b760afac7e76 != 566f0284c84f93b3e8df8c402054b760afac7e76
 ?? expect
 ?? output
@@ -309124,10 +309618,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00348668 s, 0.3 kB/s
+1 byte copied, 3.636e-05 s, 27.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.448e-05 s, 0.0 kB/s
+0 bytes copied, 2.128e-05 s, 0.0 kB/s
 fatal: invalid parent position 16777220
 ?? expect
 ?? output
@@ -309139,10 +309633,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.584e-05 s, 17.9 kB/s
+1 byte copied, 3.608e-05 s, 27.7 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.284e-05 s, 0.0 kB/s
+0 bytes copied, 2.08e-05 s, 0.0 kB/s
 commit-graph parent list for commit 12a06f3a2c235980d878903e940b0570ddda4359 is too long
 ?? expect
 ?? output
@@ -309154,10 +309648,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0171611 s, 0.1 kB/s
+1 byte copied, 3.4281e-05 s, 29.2 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.216e-05 s, 0.0 kB/s
+0 bytes copied, 2.168e-05 s, 0.0 kB/s
 commit-graph parent for 12a06f3a2c235980d878903e940b0570ddda4359 is 2c45687afab8ea0442fe2feb61881deac6f37339 != 76c4cb0cede3ceaca44a1bb27edce46ba498dfad
 ?? expect
 ?? output
@@ -309169,10 +309663,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00732396 s, 0.1 kB/s
+1 byte copied, 3.232e-05 s, 30.9 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.012e-05 s, 0.0 kB/s
+0 bytes copied, 2.196e-05 s, 0.0 kB/s
 commit-graph generation for commit 2ff07863aadb0941159dda60d980783f6b7c6213 is 5 < 15
 ?? expect
 ?? output
@@ -309184,10 +309678,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.512e-05 s, 28.5 kB/s
+1 byte copied, 3.252e-05 s, 30.8 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.912e-05 s, 0.0 kB/s
+0 bytes copied, 2.208e-05 s, 0.0 kB/s
 commit date for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 22393313 != 1112912353
 ?? expect
 ?? output
@@ -309199,10 +309693,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.000258 s, 3.9 kB/s
+1 byte copied, 3.6841e-05 s, 27.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.348e-05 s, 0.0 kB/s
+0 bytes copied, 2.428e-05 s, 0.0 kB/s
 fatal: invalid parent position 16777216
 ?? expect
 ?? output
@@ -309214,10 +309708,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.564e-05 s, 28.1 kB/s
+1 byte copied, 0.00791541 s, 0.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.3e-05 s, 0.0 kB/s
+0 bytes copied, 2.308e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -309230,10 +309724,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0038186 s, 0.3 kB/s
+1 byte copied, 3.792e-05 s, 26.4 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.176e-05 s, 0.0 kB/s
+0 bytes copied, 2.212e-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
@@ -309247,10 +309741,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.916e-05 s, 102 kB/s
+4 bytes copied, 3.688e-05 s, 108 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.264e-05 s, 0.0 kB/s
+0 bytes copied, 2.272e-05 s, 0.0 kB/s
 commit-graph has both zero and non-zero generations (e.g., commits 'ddc8575ed6fc205127629848895ac35ba7529ace' and 'd0dcf978085b712ac89a73020e40fb8b7e540ec4')
 ?? expect
 ?? output
@@ -309262,10 +309756,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 0.0035272 s, 1.1 kB/s
+4 bytes copied, 0.0065618 s, 0.6 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.012e-05 s, 0.0 kB/s
+0 bytes copied, 2.18e-05 s, 0.0 kB/s
 commit-graph has both zero and non-zero generations (e.g., commits '12a06f3a2c235980d878903e940b0570ddda4359' and 'ddc8575ed6fc205127629848895ac35ba7529ace')
 ?? expect
 ?? output
@@ -309282,10 +309776,10 @@
 dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
 1+0 records in
 1+0 records out
-1 byte copied, 0.003571 s, 0.3 kB/s
+1 byte copied, 3.488e-05 s, 28.7 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.2e-05 s, 0.0 kB/s
+0 bytes copied, 2.128e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -309305,10 +309799,10 @@
 dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
 1+0 records in
 1+0 records out
-1 byte copied, 3.228e-05 s, 31.0 kB/s
+1 byte copied, 3.584e-05 s, 27.9 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.08e-05 s, 0.0 kB/s
+0 bytes copied, 2.22e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -309330,10 +309824,10 @@
 dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
 1+0 records in
 1+0 records out
-1 byte copied, 0.0032832 s, 0.3 kB/s
+1 byte copied, 3.412e-05 s, 29.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.104e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -309746,535 +310240,6 @@
 1..108
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5405-send-pack-rewind.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5404-tracking-branches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5403-post-checkout-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5406-remote-rejects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5329-pack-objects-cruft.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5329-pack-objects-cruft/.git/
 expecting success of 5329.1 'unreachable loose objects are packed (expire never)': 
@@ -311393,8 +311358,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"child_start","sid":"20260304T075937.078639Z-H8d819085-P000993fe","thread":"main","time":"2026-03-04T07:59:37.089428Z","file":"run-command.c","line":733,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-627710-pack","--cruft","--honor-pack-keep","--non-empty"]}
-{"event":"start","sid":"20260304T075937.078639Z-H8d819085-P000993fe/20260304T075937.098100Z-H8d819085-P00099411","thread":"main","time":"2026-03-04T07:59:37.098175Z","file":"common-main.c","line":58,"t_abs":0.000263,"argv":["/build/reproducible-path/git-2.47.2/git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-627710-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"child_start","sid":"20250130T021241.414132Z-H5c947e1c-P001cd6fc","thread":"main","time":"2025-01-30T02:12:41.443124Z","file":"run-command.c","line":733,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-1890044-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"start","sid":"20250130T021241.414132Z-H5c947e1c-P001cd6fc/20250130T021241.460547Z-H5c947e1c-P001cd714","thread":"main","time":"2025-01-30T02:12:41.460651Z","file":"common-main.c","line":58,"t_abs":0.000292,"argv":["/build/reproducible-path/git-2.47.2/git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-1890044-pack","--cruft","--honor-pack-keep","--non-empty"]}
 ok 25 - cruft repack respects repack.cruftWindow
 
 expecting success of 5329.26 'cruft repack respects --window by default': 
@@ -311416,8 +311381,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"child_start","sid":"20260304T075937.257853Z-H8d819085-P000994a1","thread":"main","time":"2026-03-04T07:59:37.269153Z","file":"run-command.c","line":733,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-627873-pack","--cruft","--honor-pack-keep","--non-empty"]}
-{"event":"start","sid":"20260304T075937.257853Z-H8d819085-P000994a1/20260304T075937.286076Z-H8d819085-P000994c8","thread":"main","time":"2026-03-04T07:59:37.286147Z","file":"common-main.c","line":58,"t_abs":0.000250,"argv":["/build/reproducible-path/git-2.47.2/git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-627873-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"child_start","sid":"20250130T021241.689932Z-H5c947e1c-P001cd7c6","thread":"main","time":"2025-01-30T02:12:41.711541Z","file":"run-command.c","line":733,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-1890246-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"start","sid":"20250130T021241.689932Z-H5c947e1c-P001cd7c6/20250130T021241.728506Z-H5c947e1c-P001cd7e4","thread":"main","time":"2025-01-30T02:12:41.728582Z","file":"common-main.c","line":58,"t_abs":0.000266,"argv":["/build/reproducible-path/git-2.47.2/git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-1890246-pack","--cruft","--honor-pack-keep","--non-empty"]}
 ok 26 - cruft repack respects --window by default
 
 expecting success of 5329.27 'cruft repack respects --quiet': 
@@ -311488,7 +311453,7 @@
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
 df967b96a579e45a18b8251732d16804b2e56a55
-822216280fd1de308f55f27cdd7a4196a8f5a189 1772611177
+822216280fd1de308f55f27cdd7a4196a8f5a189 1738203162
 ok 28 - cruft --local drops unreachable objects
 
 expecting success of 5329.29 'MIDX bitmaps tolerate reachable cruft objects': 
@@ -311563,7 +311528,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-822216280fd1de308f55f27cdd7a4196a8f5a189 1772611178
+822216280fd1de308f55f27cdd7a4196a8f5a189 1738203163
 822216280fd1de308f55f27cdd7a4196a8f5a189
 ok 30 - cruft objects are freshend via loose
 
@@ -311801,6 +311766,42 @@
 1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5406-remote-rejects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5319-multi-pack-index.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5319-multi-pack-index/.git/
 expecting success of 5319.1 'setup': 
@@ -312302,7 +312303,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00357848 s, 0.3 kB/s
+1 byte copied, 3.32e-05 s, 30.1 kB/s
 fatal: multi-pack-index signature 0x00494458 does not match signature 0x4d494458
 ok 31 - verify bad signature
 
@@ -312312,7 +312313,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.452e-05 s, 29.0 kB/s
+1 byte copied, 3.576e-05 s, 28.0 kB/s
 fatal: multi-pack-index version 0 not recognized
 ok 32 - verify bad version
 
@@ -312322,7 +312323,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00526324 s, 0.2 kB/s
+1 byte copied, 3.68e-05 s, 27.2 kB/s
 error: multi-pack-index hash version 3 does not match version 1
 ok 33 - verify bad OID version
 
@@ -312332,7 +312333,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00652752 s, 0.2 kB/s
+1 byte copied, 3.62e-05 s, 27.6 kB/s
 error: final chunk has non-zero id 4f494446
 ok 34 - verify truncated chunk count
 
@@ -312342,7 +312343,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.66e-05 s, 17.7 kB/s
+1 byte copied, 3.4881e-05 s, 28.7 kB/s
 error: terminating chunk id appears earlier than expected
 ok 35 - verify extended chunk count
 
@@ -312352,7 +312353,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00586064 s, 0.2 kB/s
+1 byte copied, 3.824e-05 s, 26.2 kB/s
 fatal: multi-pack-index required pack-name chunk missing or corrupted
 ok 36 - verify missing required chunk
 
@@ -312362,7 +312363,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00032208 s, 3.1 kB/s
+1 byte copied, 3.46e-05 s, 28.9 kB/s
 error: improper chunk offset(s) 100000000000048 and 2d4
 ok 37 - verify invalid chunk offset
 
@@ -312372,7 +312373,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0102201 s, 0.1 kB/s
+1 byte copied, 3.664e-05 s, 27.3 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
 
@@ -312382,7 +312383,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00456364 s, 0.2 kB/s
+1 byte copied, 3.592e-05 s, 27.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
@@ -312393,7 +312394,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.572e-05 s, 28.0 kB/s
+1 byte copied, 5.38e-05 s, 18.6 kB/s
 error: oid fanout out of order: fanout[250] = 1004a > 4a = fanout[251]
 ok 40 - verify oid fanout out of order
 
@@ -312403,7 +312404,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00031276 s, 3.2 kB/s
+1 byte copied, 3.548e-05 s, 28.2 kB/s
 oid lookup out of order: oid[15] = 2f695f39a9ae90106abc3a1efc22b6cfe2522e89 >= 005f923c2d2e1fff9ec067b42443fff88aeebc67 = oid[16]
 ok 41 - verify oid lookup out of order
 
@@ -312413,7 +312414,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00740496 s, 0.1 kB/s
+1 byte copied, 3.636e-05 s, 27.5 kB/s
 fatal: bad pack-int-id: 1797 (12 total packs)
 ok 42 - verify incorrect pack-int-id
 
@@ -312423,7 +312424,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.264e-05 s, 30.6 kB/s
+1 byte copied, 3.86e-05 s, 25.9 kB/s
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
 ok 43 - verify incorrect offset
 
@@ -312437,7 +312438,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.448e-05 s, 29.0 kB/s
+1 byte copied, 3.732e-05 s, 26.8 kB/s
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
 incorrect checksum
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
@@ -312468,7 +312469,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0193029 s, 0.1 kB/s
+1 byte copied, 3.536e-05 s, 28.3 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
@@ -312481,7 +312482,7 @@
 
 10+0 records in
 10+0 records out
-10 bytes copied, 4.108e-05 s, 243 kB/s
+10 bytes copied, 4.124e-05 s, 242 kB/s
 incorrect checksum
 ok 48 - verify incorrect checksum
 
@@ -312567,21 +312568,21 @@
  1 file changed, 1 insertion(+)
  create mode 100644 4.t
 total 44
-drwxr-xr-x 2 pbuilder1 pbuilder1  300 Mar  4 07:59 .
-drwxr-xr-x 4 pbuilder1 pbuilder1   80 Mar  4 07:59 ..
--rw-r--r-- 1 pbuilder1 pbuilder1 1300 Mar  4 07:59 multi-pack-index
--rw-r--r-- 1 pbuilder1 pbuilder1 1300 Mar  4 07:59 multi-pack-index.bak
--r--r--r-- 1 pbuilder1 pbuilder1 1072 Mar  4 07:59 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.idx
--rw-r--r-- 1 pbuilder1 pbuilder1    0 Mar  4 07:59 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.keep
--r--r--r-- 1 pbuilder1 pbuilder1   32 Mar  4 07:59 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.pack
--r--r--r-- 1 pbuilder1 pbuilder1   52 Mar  4 07:59 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1156 Mar  4 07:59 pack-759d6abd76f238b50cff99be39e99979d3691e8c.idx
--rw-r--r-- 1 pbuilder1 pbuilder1    0 Mar  4 07:59 pack-759d6abd76f238b50cff99be39e99979d3691e8c.keep
--r--r--r-- 1 pbuilder1 pbuilder1  211 Mar  4 07:59 pack-759d6abd76f238b50cff99be39e99979d3691e8c.pack
--r--r--r-- 1 pbuilder1 pbuilder1   64 Mar  4 07:59 pack-759d6abd76f238b50cff99be39e99979d3691e8c.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1324 Mar  4 07:59 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.idx
--r--r--r-- 1 pbuilder1 pbuilder1  676 Mar  4 07:59 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.pack
--r--r--r-- 1 pbuilder1 pbuilder1   88 Mar  4 07:59 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.rev
+drwxr-xr-x 2 pbuilder2 pbuilder2  300 Jan 30 02:12 .
+drwxr-xr-x 4 pbuilder2 pbuilder2   80 Jan 30 02:12 ..
+-rw-r--r-- 1 pbuilder2 pbuilder2 1300 Jan 30 02:12 multi-pack-index
+-rw-r--r-- 1 pbuilder2 pbuilder2 1300 Jan 30 02:12 multi-pack-index.bak
+-r--r--r-- 1 pbuilder2 pbuilder2 1072 Jan 30 02:12 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.idx
+-rw-r--r-- 1 pbuilder2 pbuilder2    0 Jan 30 02:12 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.keep
+-r--r--r-- 1 pbuilder2 pbuilder2   32 Jan 30 02:12 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   52 Jan 30 02:12 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1156 Jan 30 02:12 pack-759d6abd76f238b50cff99be39e99979d3691e8c.idx
+-rw-r--r-- 1 pbuilder2 pbuilder2    0 Jan 30 02:12 pack-759d6abd76f238b50cff99be39e99979d3691e8c.keep
+-r--r--r-- 1 pbuilder2 pbuilder2  211 Jan 30 02:12 pack-759d6abd76f238b50cff99be39e99979d3691e8c.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   64 Jan 30 02:12 pack-759d6abd76f238b50cff99be39e99979d3691e8c.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1324 Jan 30 02:12 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  676 Jan 30 02:12 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   88 Jan 30 02:12 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.rev
 ok 53 - repack preserves multi-pack-index when creating packs
 
 expecting success of 5319.54 'check normal git operations: after repack': 
@@ -312689,7 +312690,7 @@
 HEAD is now at 287f5d9
 1+0 records in
 1+0 records out
-1 byte copied, 0.0032126 s, 0.3 kB/s
+1 byte copied, 3.74e-05 s, 26.7 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5319-multi-pack-index/repo/.git/
 ok 60 - force some 64-bit offsets with pack-objects
 
@@ -312704,8 +312705,8 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.396e-05 s, 29.4 kB/s
-incorrect object offset for oid[61] = f2377b316d0d92e3c29a2d6dba598ca02fb80e9c: 70b79 != b79
+1 byte copied, 3.288e-05 s, 30.4 kB/s
+incorrect object offset for oid[61] = f2377b316d0d92e3c29a2d6dba598ca02fb80e9c: 70be4 != be4
 ok 62 - verify incorrect 64-bit offset
 
 expecting success of 5319.63 'setup expire tests': 
@@ -313080,12 +313081,12 @@
 		test_line_count = 4 midx-list
 	)
 
--r--r--r-- 1 pbuilder1 pbuilder1 1173 Mar  4 07:59 .git/objects/pack/pack-9f73b959cfe08e36fd7f07d25de6069c4ad20450.pack
--r--r--r-- 1 pbuilder1 pbuilder1 2239 Mar  4 07:59 .git/objects/pack/pack-A-40289997979ee9f2d7198a5b4ac9fe14e27cbe4b.pack
--r--r--r-- 1 pbuilder1 pbuilder1 1385 Mar  4 07:59 .git/objects/pack/pack-B-926e20b0e641003b2f6bcddd6ccf53e7741c8642.pack
--r--r--r-- 1 pbuilder1 pbuilder1  838 Mar  4 07:59 .git/objects/pack/pack-C-b33c048d7202659249bb0cea7bbc997ce448c75d.pack
--r--r--r-- 1 pbuilder1 pbuilder1  560 Mar  4 07:59 .git/objects/pack/pack-D-49ca36507a52bbba6d1768e28666eb0f4e5f7d95.pack
--r--r--r-- 1 pbuilder1 pbuilder1 4587 Mar  4 07:59 .git/objects/pack/pack-E-31ea0966bb15206fbfd1b4c2f5be4b24a03050f5.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 1173 Jan 30 02:12 .git/objects/pack/pack-9f73b959cfe08e36fd7f07d25de6069c4ad20450.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 2239 Jan 30 02:12 .git/objects/pack/pack-A-40289997979ee9f2d7198a5b4ac9fe14e27cbe4b.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 1385 Jan 30 02:12 .git/objects/pack/pack-B-926e20b0e641003b2f6bcddd6ccf53e7741c8642.pack
+-r--r--r-- 1 pbuilder2 pbuilder2  838 Jan 30 02:12 .git/objects/pack/pack-C-b33c048d7202659249bb0cea7bbc997ce448c75d.pack
+-r--r--r-- 1 pbuilder2 pbuilder2  560 Jan 30 02:12 .git/objects/pack/pack-D-49ca36507a52bbba6d1768e28666eb0f4e5f7d95.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 4587 Jan 30 02:12 .git/objects/pack/pack-E-31ea0966bb15206fbfd1b4c2f5be4b24a03050f5.pack
 ok 74 - expire removes repacked packs
 
 expecting success of 5319.75 'expire works when adding new packs': 
@@ -313647,8 +313648,8 @@
 	test_must_be_empty merges &&
 	test_cmp expect actual
 
-{"event":"data","sid":"20260304T075932.627789Z-H8d819085-P00098348","thread":"main","time":"2026-03-04T07:59:32.638544Z","file":"pack-bitmap.c","line":2028,"repo":1,"t_abs":0.010932,"t_rel":0.010932,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"0"}
-{"event":"data","sid":"20260304T075932.627789Z-H8d819085-P00098348","thread":"main","time":"2026-03-04T07:59:32.638551Z","file":"pack-bitmap.c","line":2030,"repo":1,"t_abs":0.010939,"t_rel":0.010939,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"0"}
+{"event":"data","sid":"20250130T021237.006094Z-H5c947e1c-P001cca25","thread":"main","time":"2025-01-30T02:12:37.022802Z","file":"pack-bitmap.c","line":2028,"repo":1,"t_abs":0.016901,"t_rel":0.016901,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"0"}
+{"event":"data","sid":"20250130T021237.006094Z-H5c947e1c-P001cca25","thread":"main","time":"2025-01-30T02:12:37.022810Z","file":"pack-bitmap.c","line":2030,"repo":1,"t_abs":0.016909,"t_rel":0.016909,"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': 
@@ -313686,8 +313687,8 @@
 	test_pseudo_merges_cascades 1 <trace2.txt &&
 	test_cmp expect actual
 
-{"event":"data","sid":"20260304T075934.002735Z-H8d819085-P0009889a","thread":"main","time":"2026-03-04T07:59:34.013547Z","file":"pack-bitmap.c","line":2028,"repo":1,"t_abs":0.010989,"t_rel":0.010989,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
-{"event":"data","sid":"20260304T075934.002735Z-H8d819085-P0009889a","thread":"main","time":"2026-03-04T07:59:34.013569Z","file":"pack-bitmap.c","line":2030,"repo":1,"t_abs":0.011014,"t_rel":0.011014,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20250130T021238.498809Z-H5c947e1c-P001ccebf","thread":"main","time":"2025-01-30T02:12:38.511633Z","file":"pack-bitmap.c","line":2028,"repo":1,"t_abs":0.013009,"t_rel":0.013009,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
+{"event":"data","sid":"20250130T021238.498809Z-H5c947e1c-P001ccebf","thread":"main","time":"2025-01-30T02:12:38.511644Z","file":"pack-bitmap.c","line":2030,"repo":1,"t_abs":0.013021,"t_rel":0.013021,"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': 
@@ -313706,8 +313707,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-{"event":"data","sid":"20260304T075934.240880Z-H8d819085-P0009897c","thread":"main","time":"2026-03-04T07:59:34.267296Z","file":"pack-bitmap.c","line":2028,"repo":1,"t_abs":0.026591,"t_rel":0.026591,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
-{"event":"data","sid":"20260304T075934.240880Z-H8d819085-P0009897c","thread":"main","time":"2026-03-04T07:59:34.267310Z","file":"pack-bitmap.c","line":2030,"repo":1,"t_abs":0.026607,"t_rel":0.026607,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20250130T021238.774570Z-H5c947e1c-P001ccfa9","thread":"main","time":"2025-01-30T02:12:38.789838Z","file":"pack-bitmap.c","line":2028,"repo":1,"t_abs":0.015445,"t_rel":0.015445,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
+{"event":"data","sid":"20250130T021238.774570Z-H5c947e1c-P001ccfa9","thread":"main","time":"2025-01-30T02:12:38.789852Z","file":"pack-bitmap.c","line":2030,"repo":1,"t_abs":0.015459,"t_rel":0.015459,"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': 
@@ -314251,8 +314252,8 @@
 		test_cmp expect actual
 	)
 
-{"event":"data","sid":"20260304T075940.198548Z-H8d819085-P0009a0f5","thread":"main","time":"2026-03-04T07:59:40.214650Z","file":"pack-bitmap.c","line":2028,"repo":1,"t_abs":0.016275,"t_rel":0.016275,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
-{"event":"data","sid":"20260304T075940.198548Z-H8d819085-P0009a0f5","thread":"main","time":"2026-03-04T07:59:40.214657Z","file":"pack-bitmap.c","line":2030,"repo":1,"t_abs":0.016282,"t_rel":0.016282,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20250130T021246.043689Z-H5c947e1c-P001ce4cd","thread":"main","time":"2025-01-30T02:12:46.061619Z","file":"pack-bitmap.c","line":2028,"repo":1,"t_abs":0.018124,"t_rel":0.018124,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
+{"event":"data","sid":"20250130T021246.043689Z-H5c947e1c-P001ce4cd","thread":"main","time":"2025-01-30T02:12:46.061628Z","file":"pack-bitmap.c","line":2030,"repo":1,"t_abs":0.018133,"t_rel":0.018133,"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': 
@@ -314275,8 +314276,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-{"event":"data","sid":"20260304T075940.406568Z-H8d819085-P0009a1ec","thread":"main","time":"2026-03-04T07:59:40.411188Z","file":"pack-bitmap.c","line":2028,"repo":1,"t_abs":0.004797,"t_rel":0.004797,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
-{"event":"data","sid":"20260304T075940.406568Z-H8d819085-P0009a1ec","thread":"main","time":"2026-03-04T07:59:40.411200Z","file":"pack-bitmap.c","line":2030,"repo":1,"t_abs":0.004810,"t_rel":0.004810,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20250130T021246.318341Z-H5c947e1c-P001ce5a8","thread":"main","time":"2025-01-30T02:12:46.330692Z","file":"pack-bitmap.c","line":2028,"repo":1,"t_abs":0.012529,"t_rel":0.012529,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
+{"event":"data","sid":"20250130T021246.318341Z-H5c947e1c-P001ce5a8","thread":"main","time":"2025-01-30T02:12:46.330702Z","file":"pack-bitmap.c","line":2030,"repo":1,"t_abs":0.012540,"t_rel":0.012540,"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': 
@@ -314389,7 +314390,7 @@
 pack_report: pack_mapped              =      55372 /      55372
 ---------------------------------------------------------------------
 
-{"event":"data","sid":"20260304T075941.098750Z-H8d819085-P0009a4de/20260304T075941.107845Z-H8d819085-P0009a4e4","thread":"main","time":"2026-03-04T07:59:41.184129Z","file":"pack-bitmap-write.c","line":641,"repo":1,"t_abs":0.076452,"t_rel":0.003066,"nesting":2,"category":"pack-bitmap-write","key":"building_bitmaps_pseudo_merge_reused","value":"1"}
+{"event":"data","sid":"20250130T021247.150064Z-H5c947e1c-P001ce820/20250130T021247.164508Z-H5c947e1c-P001ce830","thread":"main","time":"2025-01-30T02:12:47.234390Z","file":"pack-bitmap-write.c","line":641,"repo":1,"t_abs":0.070068,"t_rel":0.002962,"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': 
@@ -316194,108 +316195,781 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5324-split-commit-graph.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5324-split-commit-graph/.git/
-expecting success of 5324.1 'setup repo': 
-	git init &&
-	git config core.commitGraph true &&
-	git config gc.writeCommitGraph false &&
-	objdir=".git/objects" &&
-	infodir="$objdir/info" &&
-	graphdir="$infodir/commit-graphs" &&
-	test_oid_cache <<-EOM
-	shallow sha1:2132
-	shallow sha256:2436
-
-	base sha1:1408
-	base sha256:1528
-
-	oid_version sha1:1
-	oid_version sha256:2
-	EOM
-
-Reinitialized existing Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5324-split-commit-graph/.git/
-ok 1 - setup repo
-
-expecting success of 5324.2 'tweak umask for modebit tests': 
-	umask 022
-
-ok 2 - tweak umask for modebit tests
+*** t5407-post-rewrite-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
 
-expecting success of 5324.3 'create commits and write commit-graph': 
-	for i in $(test_seq 3)
-	do
-		test_commit $i &&
-		git branch commits/$i || return 1
-	done &&
-	git commit-graph write --reachable &&
-	test_path_is_file $infodir/commit-graph &&
-	graph_read_expect 3
+	test_hook --setup post-rewrite <<-EOF
+	echo \$@ > "$TRASH_DIRECTORY"/post-rewrite.args
+	cat > "$TRASH_DIRECTORY"/post-rewrite.data
+	EOF
 
-[master (root-commit) d0dcf97] 1
+[main (root-commit) be6e19b] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 82335b2] 2
+ create mode 100644 foo
+[main df02547] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master ddc8575] 3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2362ae8] C
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-ok 3 - create commits and write commit-graph
+ 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'.
 
-expecting success of 5324.4 'check normal git operations: graph exists': 
-		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
-		graph_git_two_modes "branch -vv" "$DIR" &&
-		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
-	
-ok 4 - check normal git operations: graph exists
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 5324.5 'add more commits, and write a new base graph': 
-	git reset --hard commits/1 &&
-	for i in $(test_seq 4 5)
-	do
-		test_commit $i &&
-		git branch commits/$i || return 1
-	done &&
-	git reset --hard commits/2 &&
-	for i in $(test_seq 6 10)
-	do
-		test_commit $i &&
-		git branch commits/$i || return 1
-	done &&
-	git reset --hard commits/2 &&
-	git merge commits/4 &&
-	git branch merge/1 &&
-	git reset --hard commits/4 &&
-	git merge commits/6 &&
-	git branch merge/2 &&
-	git commit-graph write --reachable &&
-	graph_read_expect 12
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-HEAD is now at d0dcf97 1
-[master 6efda21] 4
+  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 4.t
-[master 7ec8a1d] 5
+ 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 5.t
-HEAD is now at 82335b2 2
-[master 76c4cb0] 6
+ create mode 100644 bar
+[detached HEAD 8b1f855] G
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 6.t
-[master 12a06f3] 7
+ create mode 100644 G
+[detached HEAD 33a20ae] H
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 7.t
-[master 1883fab] 8
+ 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...
+Merging:
+be6e19b A
+virtual C
+found 1 common ancestor:
+virtual e6a635ee70776f6585de405639ebebd74da5c390
+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 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...
+Merging:
+be6e19b A
+virtual C
+found 1 common ancestor:
+virtual e6a635ee70776f6585de405639ebebd74da5c390
+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 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...
+Merging:
+be6e19b A
+virtual D
+found 1 common ancestor:
+virtual a0d64960e32dc5d0cf8eff7ded11a413a31c0891
+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 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...
+Merging:
+0aed93c E
+virtual F
+found 1 common ancestor:
+virtual bdb58bd8ea55127260d069a5e7ee2995726633f9
+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 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 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 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 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 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 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 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 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 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 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5324-split-commit-graph.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5324-split-commit-graph/.git/
+expecting success of 5324.1 'setup repo': 
+	git init &&
+	git config core.commitGraph true &&
+	git config gc.writeCommitGraph false &&
+	objdir=".git/objects" &&
+	infodir="$objdir/info" &&
+	graphdir="$infodir/commit-graphs" &&
+	test_oid_cache <<-EOM
+	shallow sha1:2132
+	shallow sha256:2436
+
+	base sha1:1408
+	base sha256:1528
+
+	oid_version sha1:1
+	oid_version sha256:2
+	EOM
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5324-split-commit-graph/.git/
+ok 1 - setup repo
+
+expecting success of 5324.2 'tweak umask for modebit tests': 
+	umask 022
+
+ok 2 - tweak umask for modebit tests
+
+expecting success of 5324.3 'create commits and write commit-graph': 
+	for i in $(test_seq 3)
+	do
+		test_commit $i &&
+		git branch commits/$i || return 1
+	done &&
+	git commit-graph write --reachable &&
+	test_path_is_file $infodir/commit-graph &&
+	graph_read_expect 3
+
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 82335b2] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master ddc8575] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+ok 3 - create commits and write commit-graph
+
+expecting success of 5324.4 'check normal git operations: graph exists': 
+		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
+		graph_git_two_modes "branch -vv" "$DIR" &&
+		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
+	
+ok 4 - check normal git operations: graph exists
+
+expecting success of 5324.5 'add more commits, and write a new base graph': 
+	git reset --hard commits/1 &&
+	for i in $(test_seq 4 5)
+	do
+		test_commit $i &&
+		git branch commits/$i || return 1
+	done &&
+	git reset --hard commits/2 &&
+	for i in $(test_seq 6 10)
+	do
+		test_commit $i &&
+		git branch commits/$i || return 1
+	done &&
+	git reset --hard commits/2 &&
+	git merge commits/4 &&
+	git branch merge/1 &&
+	git reset --hard commits/4 &&
+	git merge commits/6 &&
+	git branch merge/2 &&
+	git commit-graph write --reachable &&
+	graph_read_expect 12
+
+HEAD is now at d0dcf97 1
+[master 6efda21] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[master 7ec8a1d] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+HEAD is now at 82335b2 2
+[master 76c4cb0] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+[master 12a06f3] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7.t
+[master 1883fab] 8
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 8.t
@@ -316588,7 +317262,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.00027564 s, 3.6 kB/s
+1 byte copied, 0.00708092 s, 0.1 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 17 - verify hashes along chain, even in shallow
 
@@ -316643,7 +317317,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.0141394 s, 0.1 kB/s
+1 byte copied, 0.0152506 s, 0.1 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 20 - verify --shallow does not check base contents
 
@@ -316663,7 +317337,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.00722368 s, 0.1 kB/s
+1 byte copied, 0.0109227 s, 0.1 kB/s
 warning: commit-graph chain does not match
 ok 21 - warn on base graph chunk incorrect
 
@@ -316685,11 +317359,11 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.0002974 s, 3.4 kB/s
+1 byte copied, 0.00741288 s, 0.1 kB/s
 warning: invalid commit-graph chain: line 'a849e3566469ef6eec0d724b211560Ga5617cb1c' not a hash
 1+0 records in
 1+0 records out
-1 byte copied, 0.0257976 s, 0.0 kB/s
+1 byte copied, 3.4201e-05 s, 29.2 kB/s
 warning: unable to find all commit-graph files
 ok 22 - verify after commit-graph-chain corruption (base)
 
@@ -316711,11 +317385,11 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.00385564 s, 0.3 kB/s
+1 byte copied, 3.924e-05 s, 25.5 kB/s
 warning: invalid commit-graph chain: line '944c3272bbe885450ef5fcad419a8Gcf35d1c284' not a hash
 1+0 records in
 1+0 records out
-1 byte copied, 0.0064674 s, 0.2 kB/s
+1 byte copied, 0.0110539 s, 0.1 kB/s
 warning: unable to find all commit-graph files
 ok 23 - verify after commit-graph-chain corruption (tip)
 
@@ -316760,7 +317434,7 @@
  create mode 100644 extra.t
 1+0 records in
 1+0 records out
-1 byte copied, 3.348e-05 s, 29.9 kB/s
+1 byte copied, 0.0134779 s, 0.1 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 25 - verify across alternates
 
@@ -317845,677 +318519,98 @@
 1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5407-post-rewrite-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t5507-remote-environment.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5507-remote-environment/.git/
+expecting success of 5507.1 'set up "remote" push situation': 
+	test_commit one &&
+	git config push.default current &&
+	git init remote
 
-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
+[master (root-commit) d79ce16] one
  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...
-Merging:
-be6e19b A
-virtual C
-found 1 common ancestor:
-virtual e6a635ee70776f6585de405639ebebd74da5c390
-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 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...
-Merging:
-be6e19b A
-virtual C
-found 1 common ancestor:
-virtual e6a635ee70776f6585de405639ebebd74da5c390
-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 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...
-Merging:
-be6e19b A
-virtual D
-found 1 common ancestor:
-virtual a0d64960e32dc5d0cf8eff7ded11a413a31c0891
-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 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...
-Merging:
-0aed93c E
-virtual F
-found 1 common ancestor:
-virtual bdb58bd8ea55127260d069a5e7ee2995726633f9
-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 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 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 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 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 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 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 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 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 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 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
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5507-remote-environment/remote/.git/
+ok 1 - set up "remote" push situation
 
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 C
-pick babc8a4 D
+expecting success of 5507.2 'set up fake ssh': 
+	GIT_SSH_COMMAND="f() {
+		cd \"\$TRASH_DIRECTORY\" &&
+		eval \"\$2\"
+	}; f" &&
+	export GIT_SSH_COMMAND &&
+	export TRASH_DIRECTORY
 
-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
+ok 2 - set up fake ssh
 
-  git commit --amend 
+expecting success of 5507.3 'confirm default push fails': 
+	test_must_fail git push remote
 
-Once you are satisfied with your changes, run
+remote: error: refusing to update checked out branch: refs/heads/master        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To remote
+ ! [remote rejected] master -> master (branch is currently checked out)
+error: failed to push some refs to 'remote'
+ok 3 - confirm default push fails
 
-  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
+expecting success of 5507.4 'config does not travel over same-machine push': 
+	test_must_fail git -c receive.denyCurrentBranch=false push remote
 
-  git rebase --continue
+remote: error: refusing to update checked out branch: refs/heads/master        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To remote
+ ! [remote rejected] master -> master (branch is currently checked out)
+error: failed to push some refs to 'remote'
+ok 4 - config does not travel over same-machine push
 
+expecting success of 5507.5 'config does not travel over ssh push': 
+	test_must_fail git -c receive.denyCurrentBranch=false push host:remote
 
-Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 17 - git rebase -i (exec)
+remote: error: refusing to update checked out branch: refs/heads/master        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To host:remote
+ ! [remote rejected] master -> master (branch is currently checked out)
+error: failed to push some refs to 'host:remote'
+ok 5 - config does not travel over ssh push
 
-# passed all 17 test(s)
-1..17
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5501-fetch-push-alternates.sh ***
@@ -318891,100 +318986,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5507-remote-environment.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5507-remote-environment/.git/
-expecting success of 5507.1 'set up "remote" push situation': 
-	test_commit one &&
-	git config push.default current &&
-	git init remote
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5507-remote-environment/remote/.git/
-ok 1 - set up "remote" push situation
-
-expecting success of 5507.2 'set up fake ssh': 
-	GIT_SSH_COMMAND="f() {
-		cd \"\$TRASH_DIRECTORY\" &&
-		eval \"\$2\"
-	}; f" &&
-	export GIT_SSH_COMMAND &&
-	export TRASH_DIRECTORY
-
-ok 2 - set up fake ssh
-
-expecting success of 5507.3 'confirm default push fails': 
-	test_must_fail git push remote
-
-remote: error: refusing to update checked out branch: refs/heads/master        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To remote
- ! [remote rejected] master -> master (branch is currently checked out)
-error: failed to push some refs to 'remote'
-ok 3 - confirm default push fails
-
-expecting success of 5507.4 'config does not travel over same-machine push': 
-	test_must_fail git -c receive.denyCurrentBranch=false push remote
-
-remote: error: refusing to update checked out branch: refs/heads/master        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To remote
- ! [remote rejected] master -> master (branch is currently checked out)
-error: failed to push some refs to 'remote'
-ok 4 - config does not travel over same-machine push
-
-expecting success of 5507.5 'config does not travel over ssh push': 
-	test_must_fail git -c receive.denyCurrentBranch=false push host:remote
-
-remote: error: refusing to update checked out branch: refs/heads/master        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To host:remote
- ! [remote rejected] master -> master (branch is currently checked out)
-error: failed to push some refs to 'host:remote'
-ok 5 - config does not travel over ssh push
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5400-send-pack.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5400-send-pack/.git/
 expecting success of 5400.1 'setup': 
@@ -320351,44 +320352,6 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5513-fetch-track.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5513-fetch-track/.git/
-expecting success of 5513.1 'setup': 
-	>file &&
-	git add . &&
-	test_tick &&
-	git commit -m Initial &&
-	git branch b-0 &&
-	git branch b1 &&
-	git branch b/one &&
-	test_create_repo other &&
-	(
-		cd other &&
-		git config remote.origin.url .. &&
-		git config remote.origin.fetch "+refs/heads/b/*:refs/remotes/b/*"
-	)
-
-[master (root-commit) 9d34b14] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5513-fetch-track/other/.git/
-ok 1 - setup
-
-expecting success of 5513.2 'fetch': 
-	(
-		cd other && git fetch origin &&
-		test "$(git for-each-ref --format="%(refname)")" = refs/remotes/b/one
-	)
-
-From ..
- * [new branch]      b/one      -> b/one
-ok 2 - fetch
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5310-pack-bitmaps.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5310-pack-bitmaps/.git/
 expecting success of 5310.1 'setup test repository': 
@@ -320665,8 +320628,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20260304T075914.568402Z-H8d819085-P0009376a/20260304T075914.575506Z-H8d819085-P0009377a","thread":"main","time":"2026-03-04T07:59:14.639692Z","file":"pack-bitmap-write.c","line":409,"repo":1,"t_abs":0.064371,"t_rel":0.000550,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20260304T075914.568402Z-H8d819085-P0009376a/20260304T075914.575506Z-H8d819085-P0009377a","thread":"main","time":"2026-03-04T07:59:14.639711Z","file":"pack-bitmap-write.c","line":411,"repo":1,"t_abs":0.064392,"t_rel":0.000571,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20250130T021213.933971Z-H5c947e1c-P001c86ac/20250130T021213.948458Z-H5c947e1c-P001c86b1","thread":"main","time":"2025-01-30T02:12:14.009847Z","file":"pack-bitmap-write.c","line":409,"repo":1,"t_abs":0.061565,"t_rel":0.000574,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20250130T021213.933971Z-H5c947e1c-P001c86ac/20250130T021213.948458Z-H5c947e1c-P001c86b1","thread":"main","time":"2025-01-30T02:12:14.009867Z","file":"pack-bitmap-write.c","line":411,"repo":1,"t_abs":0.061587,"t_rel":0.000596,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
 ok 4 - full repack creates bitmaps
 
 expecting success of 5310.5 'rev-list --test-bitmap verifies bitmaps': 
@@ -321203,7 +321166,7 @@
 	jgit --version
 
 )
-t5310-pack-bitmaps.sh: 7: eval: jgit: not found
+./test-lib.sh: line 1056: jgit: command not found
 prerequisite JGIT not satisfied
 checking prerequisite: SHA1
 
@@ -321472,8 +321435,8 @@
 pack_report: pack_mapped              =      26915 /      26915
 ---------------------------------------------------------------------
 
---- before	2026-03-04 07:59:23.299352315 +0000
-+++ after	2026-03-04 07:59:23.455352315 +0000
+--- before	2025-01-30 02:12:25.220341905 +0000
++++ after	2025-01-30 02:12:25.420343104 +0000
 @@ -1 +1 @@
 -5856eb049fa881263aa3ba7ed2e5edbf7e1fbcac
 +6a6543fc00ae3e5f9847cf9ca452037bed353779
@@ -321565,8 +321528,8 @@
  create mode 100644 other.t
 5925c4e1ec8bac94f428d0e74df0e946acb72c2f
 e7044c3d0754f94d7cb91400d11711b5667d7a56
-{"event":"data","sid":"20260304T075924.307467Z-H8d819085-P00096498","thread":"main","time":"2026-03-04T07:59:24.308522Z","file":"pack-bitmap.c","line":521,"repo":1,"t_abs":0.001228,"t_rel":0.001228,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-90860c48cd6b78bb32a9b104cd5b49799ab8c8ac.pack"}
-{"event":"data","sid":"20260304T075924.307467Z-H8d819085-P00096498","thread":"main","time":"2026-03-04T07:59:24.308540Z","file":"pack-bitmap.c","line":495,"repo":1,"t_abs":0.001248,"t_rel":0.001248,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-43cc18f2eec2f5958d1bddd67d64d18c30f4850b.pack"}
+{"event":"data","sid":"20250130T021226.338819Z-H5c947e1c-P001cacc9","thread":"main","time":"2025-01-30T02:12:26.344066Z","file":"pack-bitmap.c","line":521,"repo":1,"t_abs":0.005428,"t_rel":0.005428,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-90860c48cd6b78bb32a9b104cd5b49799ab8c8ac.pack"}
+{"event":"data","sid":"20250130T021226.338819Z-H5c947e1c-P001cacc9","thread":"main","time":"2025-01-30T02:12:26.344089Z","file":"pack-bitmap.c","line":495,"repo":1,"t_abs":0.005454,"t_rel":0.005454,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-43cc18f2eec2f5958d1bddd67d64d18c30f4850b.pack"}
 ok 74 - complains about multiple pack bitmaps
 
 expecting success of 5310.75 'setup test repository': 
@@ -321843,8 +321806,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20260304T075926.530736Z-H8d819085-P00096c55/20260304T075926.550081Z-H8d819085-P00096c5e","thread":"main","time":"2026-03-04T07:59:26.631356Z","file":"pack-bitmap-write.c","line":409,"repo":1,"t_abs":0.081451,"t_rel":0.000518,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20260304T075926.530736Z-H8d819085-P00096c55/20260304T075926.550081Z-H8d819085-P00096c5e","thread":"main","time":"2026-03-04T07:59:26.631371Z","file":"pack-bitmap-write.c","line":411,"repo":1,"t_abs":0.081468,"t_rel":0.000535,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20250130T021228.986330Z-H5c947e1c-P001cb39d/20250130T021228.996723Z-H5c947e1c-P001cb3c0","thread":"main","time":"2025-01-30T02:12:29.063157Z","file":"pack-bitmap-write.c","line":409,"repo":1,"t_abs":0.066659,"t_rel":0.000563,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20250130T021228.986330Z-H5c947e1c-P001cb39d/20250130T021228.996723Z-H5c947e1c-P001cb3c0","thread":"main","time":"2025-01-30T02:12:29.063174Z","file":"pack-bitmap-write.c","line":411,"repo":1,"t_abs":0.066678,"t_rel":0.000582,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
 ok 78 - full repack creates bitmaps
 
 expecting success of 5310.79 'rev-list --test-bitmap verifies bitmaps': 
@@ -322627,8 +322590,8 @@
 pack_report: pack_mapped              =      26911 /      26911
 ---------------------------------------------------------------------
 
---- before	2026-03-04 07:59:36.687352315 +0000
-+++ after	2026-03-04 07:59:36.807352315 +0000
+--- before	2025-01-30 02:12:40.916436036 +0000
++++ after	2025-01-30 02:12:41.096437115 +0000
 @@ -1 +1 @@
 -a3caed54c4e80e89b950a3dc3137850a7de9e11a
 +6d88075ba6ae7fa70257e63b62d2182dc9825ed1
@@ -322718,10 +322681,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-3cd8c16e652034892da5481183a4d7aa2f7803dc
 d9be34f11dab75a3315b4361ae577329c4c5c312
-{"event":"data","sid":"20260304T075937.615485Z-H8d819085-P00099625","thread":"main","time":"2026-03-04T07:59:37.616582Z","file":"pack-bitmap.c","line":521,"repo":1,"t_abs":0.001293,"t_rel":0.001293,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-63dbdd2da806a70649399187a2e9986677c885e5.pack"}
-{"event":"data","sid":"20260304T075937.615485Z-H8d819085-P00099625","thread":"main","time":"2026-03-04T07:59:37.616602Z","file":"pack-bitmap.c","line":495,"repo":1,"t_abs":0.001316,"t_rel":0.001316,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-19bdd1ccc6f741f53b9197695f9f145e7fcd9377.pack"}
+3cd8c16e652034892da5481183a4d7aa2f7803dc
+{"event":"data","sid":"20250130T021242.204421Z-H5c947e1c-P001cd92f","thread":"main","time":"2025-01-30T02:12:42.205557Z","file":"pack-bitmap.c","line":521,"repo":1,"t_abs":0.001347,"t_rel":0.001347,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-19bdd1ccc6f741f53b9197695f9f145e7fcd9377.pack"}
+{"event":"data","sid":"20250130T021242.204421Z-H5c947e1c-P001cd92f","thread":"main","time":"2025-01-30T02:12:42.205579Z","file":"pack-bitmap.c","line":495,"repo":1,"t_abs":0.001372,"t_rel":0.001372,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-63dbdd2da806a70649399187a2e9986677c885e5.pack"}
 ok 148 - complains about multiple pack bitmaps
 
 expecting success of 5310.149 'incremental repack fails when bitmaps are requested': 
@@ -323057,7 +323020,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260304T075938.042674Z-H8d819085-P000997f6","thread":"main","time":"2026-03-04T07:59:38.043977Z","file":"pack-bitmap.c","line":1985,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20250130T021242.774320Z-H5c947e1c-P001cdaf3","thread":"main","time":"2025-01-30T02:12:42.783684Z","file":"pack-bitmap.c","line":1985,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -323343,7 +323306,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260304T075938.066013Z-H8d819085-P0009980b","thread":"main","time":"2026-03-04T07:59:38.067245Z","file":"pack-bitmap.c","line":1985,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20250130T021242.818119Z-H5c947e1c-P001cdb0b","thread":"main","time":"2025-01-30T02:12:42.828304Z","file":"pack-bitmap.c","line":1985,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -323629,7 +323592,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260304T075938.113360Z-H8d819085-P00099830","thread":"main","time":"2026-03-04T07:59:38.114854Z","file":"pack-bitmap.c","line":1985,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20250130T021242.865969Z-H5c947e1c-P001cdb2d","thread":"main","time":"2025-01-30T02:12:42.867195Z","file":"pack-bitmap.c","line":1985,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -323915,7 +323878,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260304T075938.142568Z-H8d819085-P00099858","thread":"main","time":"2026-03-04T07:59:38.143958Z","file":"pack-bitmap.c","line":1989,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20250130T021242.907238Z-H5c947e1c-P001cdb4d","thread":"main","time":"2025-01-30T02:12:42.912785Z","file":"pack-bitmap.c","line":1989,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -324201,7 +324164,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260304T075938.182383Z-H8d819085-P00099876","thread":"main","time":"2026-03-04T07:59:38.183619Z","file":"pack-bitmap.c","line":1989,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20250130T021242.938019Z-H5c947e1c-P001cdb70","thread":"main","time":"2025-01-30T02:12:42.939264Z","file":"pack-bitmap.c","line":1989,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -324487,7 +324450,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260304T075938.202635Z-H8d819085-P00099899","thread":"main","time":"2026-03-04T07:59:38.203851Z","file":"pack-bitmap.c","line":1989,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20250130T021242.988774Z-H5c947e1c-P001cdb8d","thread":"main","time":"2025-01-30T02:12:42.990049Z","file":"pack-bitmap.c","line":1989,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -324773,7 +324736,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260304T075938.230661Z-H8d819085-P000998ae","thread":"main","time":"2026-03-04T07:59:38.232114Z","file":"pack-bitmap.c","line":1989,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20250130T021243.042006Z-H5c947e1c-P001cdbaa","thread":"main","time":"2025-01-30T02:12:43.043264Z","file":"pack-bitmap.c","line":1989,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 ok 151 - boundary-based traversal is used when requested
 
 expecting success of 5310.152 'setup test repository': 
@@ -325050,8 +325013,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20260304T075940.266577Z-H8d819085-P0009a148/20260304T075940.280357Z-H8d819085-P0009a154","thread":"main","time":"2026-03-04T07:59:40.356064Z","file":"pack-bitmap-write.c","line":409,"repo":1,"t_abs":0.075897,"t_rel":0.000572,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20260304T075940.266577Z-H8d819085-P0009a148/20260304T075940.280357Z-H8d819085-P0009a154","thread":"main","time":"2026-03-04T07:59:40.356082Z","file":"pack-bitmap-write.c","line":411,"repo":1,"t_abs":0.075917,"t_rel":0.000592,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20250130T021245.495713Z-H5c947e1c-P001ce327/20250130T021245.504480Z-H5c947e1c-P001ce333","thread":"main","time":"2025-01-30T02:12:45.569794Z","file":"pack-bitmap-write.c","line":409,"repo":1,"t_abs":0.065490,"t_rel":0.000542,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20250130T021245.495713Z-H5c947e1c-P001ce327/20250130T021245.504480Z-H5c947e1c-P001ce333","thread":"main","time":"2025-01-30T02:12:45.569811Z","file":"pack-bitmap-write.c","line":411,"repo":1,"t_abs":0.065508,"t_rel":0.000560,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
 ok 155 - full repack creates bitmaps
 
 expecting success of 5310.156 'rev-list --test-bitmap verifies bitmaps': 
@@ -325834,8 +325797,8 @@
 pack_report: pack_mapped              =      26918 /      26918
 ---------------------------------------------------------------------
 
---- before	2026-03-04 07:59:50.271352315 +0000
-+++ after	2026-03-04 07:59:50.371352315 +0000
+--- before	2025-01-30 02:12:57.056532830 +0000
++++ after	2025-01-30 02:12:57.224533837 +0000
 @@ -1 +1 @@
 -37419f6d136228aef65f8c0814262f05f954d62a
 +ed73bac8391ee3dfb2a90e3cd7df9bd765ce5b5f
@@ -325927,8 +325890,8 @@
  create mode 100644 other.t
 1a76757cab55a0d45b9ba975eda6eb7dca4f716d
 92f77f689e270db411603dd57dea5c4d12ac65b6
-{"event":"data","sid":"20260304T075951.226753Z-H8d819085-P0009d01d","thread":"main","time":"2026-03-04T07:59:51.227897Z","file":"pack-bitmap.c","line":521,"repo":1,"t_abs":0.001332,"t_rel":0.001332,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-85a84125b8486451c50fe5eac71ae4078db4a9c8.pack"}
-{"event":"data","sid":"20260304T075951.226753Z-H8d819085-P0009d01d","thread":"main","time":"2026-03-04T07:59:51.227922Z","file":"pack-bitmap.c","line":495,"repo":1,"t_abs":0.001358,"t_rel":0.001358,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-f42a38f98066647f8c129c7f6755eceddb5c21ab.pack"}
+{"event":"data","sid":"20250130T021258.237999Z-H5c947e1c-P001d0a1a","thread":"main","time":"2025-01-30T02:12:58.239023Z","file":"pack-bitmap.c","line":521,"repo":1,"t_abs":0.001219,"t_rel":0.001219,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-85a84125b8486451c50fe5eac71ae4078db4a9c8.pack"}
+{"event":"data","sid":"20250130T021258.237999Z-H5c947e1c-P001d0a1a","thread":"main","time":"2025-01-30T02:12:58.239044Z","file":"pack-bitmap.c","line":495,"repo":1,"t_abs":0.001242,"t_rel":0.001242,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-f42a38f98066647f8c129c7f6755eceddb5c21ab.pack"}
 ok 225 - complains about multiple pack bitmaps
 
 expecting success of 5310.226 'verify writing bitmap lookup table when enabled': 
@@ -325936,8 +325899,8 @@
 		git repack -ad &&
 	grep "\"label\":\"writing_lookup_table\"" trace2
 
-{"event":"region_enter","sid":"20260304T075951.322589Z-H8d819085-P0009d086/20260304T075951.332370Z-H8d819085-P0009d0a4","thread":"main","time":"2026-03-04T07:59:51.402083Z","file":"pack-bitmap-write.c","line":951,"repo":1,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-{"event":"region_leave","sid":"20260304T075951.322589Z-H8d819085-P0009d086/20260304T075951.332370Z-H8d819085-P0009d0a4","thread":"main","time":"2026-03-04T07:59:51.402092Z","file":"pack-bitmap-write.c","line":978,"repo":1,"t_rel":0.000011,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_enter","sid":"20250130T021258.370044Z-H5c947e1c-P001d0a81/20250130T021258.388674Z-H5c947e1c-P001d0a86","thread":"main","time":"2025-01-30T02:12:58.487720Z","file":"pack-bitmap-write.c","line":951,"repo":1,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_leave","sid":"20250130T021258.370044Z-H5c947e1c-P001d0a81/20250130T021258.388674Z-H5c947e1c-P001d0a86","thread":"main","time":"2025-01-30T02:12:58.487739Z","file":"pack-bitmap-write.c","line":978,"repo":1,"t_rel":0.000023,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
 ok 226 - verify writing bitmap lookup table when enabled
 
 expecting success of 5310.227 'truncated bitmap fails gracefully (lookup table)': 
@@ -325960,249 +325923,6 @@
 1..227
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5509-fetch-push-namespaces.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/.git/
-expecting success of 5509.1 'setup': 
-	git config --global protocol.ext.allow user &&
-	test_tick &&
-	git init original &&
-	(
-		cd original &&
-		echo 0 >count &&
-		git add count &&
-		test_commit 0 &&
-		echo 1 >count &&
-		git add count &&
-		test_commit 1 &&
-		git remote add pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
-		git remote add pushee-unnamespaced ../pushee
-	) &&
-	commit0=$(cd original && git rev-parse HEAD^) &&
-	commit1=$(cd original && git rev-parse HEAD) &&
-	git init --bare pushee &&
-	git init puller
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/original/.git/
-[main (root-commit) fbdf431] 0
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 0.t
- create mode 100644 count
-[main dc65a2e] 1
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 1.t
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/pushee/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/puller/.git/
-ok 1 - setup
-
-expecting success of 5509.2 'pushing into a repository using a ref namespace': 
-	(
-		cd original &&
-		git push pushee-namespaced main &&
-		git ls-remote pushee-namespaced >actual &&
-		printf "$commit1\trefs/heads/main\n" >expected &&
-		test_cmp expected actual &&
-		git push pushee-namespaced --tags &&
-		git ls-remote pushee-namespaced >actual &&
-		printf "$commit0\trefs/tags/0\n" >>expected &&
-		printf "$commit1\trefs/tags/1\n" >>expected &&
-		test_cmp expected actual &&
-		# Verify that the GIT_NAMESPACE environment variable works as well
-		GIT_NAMESPACE=namespace git ls-remote "ext::git %s ../pushee" >actual &&
-		test_cmp expected actual &&
-		# Verify that --namespace overrides GIT_NAMESPACE
-		GIT_NAMESPACE=garbage git ls-remote pushee-namespaced >actual &&
-		test_cmp expected actual &&
-		# Try a namespace with no content
-		git ls-remote "ext::git --namespace=garbage %s ../pushee" >actual &&
-		test_must_be_empty actual &&
-		git ls-remote pushee-unnamespaced >actual &&
-		sed -e "s|refs/|refs/namespaces/namespace/refs/|" expected >expected.unnamespaced &&
-		test_cmp expected.unnamespaced actual
-	)
-
-To ext::git --namespace=namespace %s ../pushee
- * [new branch]      main -> main
-To ext::git --namespace=namespace %s ../pushee
- * [new tag]         0 -> 0
- * [new tag]         1 -> 1
-ok 2 - pushing into a repository using a ref namespace
-
-expecting success of 5509.3 'pulling from a repository using a ref namespace': 
-	(
-		cd puller &&
-		git remote add -f pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
-		git for-each-ref refs/ >actual &&
-		printf "$commit1 commit\trefs/remotes/pushee-namespaced/main\n" >expected &&
-		printf "$commit0 commit\trefs/tags/0\n" >>expected &&
-		printf "$commit1 commit\trefs/tags/1\n" >>expected &&
-		test_cmp expected actual
-	)
-
-Updating pushee-namespaced
-From ext::git --namespace=namespace %s ../pushee
- * [new branch]      main       -> pushee-namespaced/main
- * [new tag]         1          -> 1
- * [new tag]         0          -> 0
-Bad commandok 3 - pulling from a repository using a ref namespace
-
-expecting success of 5509.4 'mirroring a repository using a ref namespace': 
-	git clone --mirror pushee mirror &&
-	(
-		cd mirror &&
-		git for-each-ref refs/ >actual &&
-		printf "$commit1 commit\trefs/namespaces/namespace/refs/heads/main\n" >expected &&
-		printf "$commit0 commit\trefs/namespaces/namespace/refs/tags/0\n" >>expected &&
-		printf "$commit1 commit\trefs/namespaces/namespace/refs/tags/1\n" >>expected &&
-		test_cmp expected actual
-	)
-
-Cloning into bare repository 'mirror'...
-done.
-ok 4 - mirroring a repository using a ref namespace
-
-expecting success of 5509.5 'hide namespaced refs with transfer.hideRefs': 
-	GIT_NAMESPACE=namespace \
-		git -C pushee -c transfer.hideRefs=refs/tags \
-		ls-remote "ext::git %s ." >actual &&
-	printf "$commit1\trefs/heads/main\n" >expected &&
-	test_cmp expected actual
-
-ok 5 - hide namespaced refs with transfer.hideRefs
-
-expecting success of 5509.6 'check that transfer.hideRefs does not match unstripped refs': 
-	git -C pushee pack-refs --all &&
-	GIT_NAMESPACE=namespace \
-		git -C pushee -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
-		ls-remote "ext::git %s ." >actual &&
-	printf "$commit1\trefs/heads/main\n" >expected &&
-	printf "$commit0\trefs/tags/0\n" >>expected &&
-	printf "$commit1\trefs/tags/1\n" >>expected &&
-	test_cmp expected actual
-
-ok 6 - check that transfer.hideRefs does not match unstripped refs
-
-expecting success of 5509.7 'hide full refs with transfer.hideRefs': 
-	GIT_NAMESPACE=namespace \
-		git -C pushee -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
-		ls-remote "ext::git %s ." >actual &&
-	printf "$commit1\trefs/heads/main\n" >expected &&
-	test_cmp expected actual
-
-ok 7 - hide full refs with transfer.hideRefs
-
-expecting success of 5509.8 'try to update a hidden ref': 
-	test_config -C pushee transfer.hideRefs refs/heads/main &&
-	test_must_fail git -C original push pushee-namespaced main
-
-To ext::git --namespace=namespace %s ../pushee
- ! [remote rejected] main -> main (deny updating a hidden ref)
-error: failed to push some refs to 'ext::git --namespace=namespace %s ../pushee'
-ok 8 - try to update a hidden ref
-
-expecting success of 5509.9 'try to update a ref that is not hidden': 
-	test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/main &&
-	git -C original push pushee-namespaced main
-
-Everything up-to-date
-ok 9 - try to update a ref that is not hidden
-
-expecting success of 5509.10 'git-receive-pack(1) with transfer.hideRefs does not match unstripped refs during advertisement': 
-	git -C pushee update-ref refs/namespaces/namespace/refs/heads/foo/1 refs/namespaces/namespace/refs/heads/main &&
-	git -C pushee pack-refs --all &&
-	test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/foo &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C original push pushee-namespaced main &&
-	test_grep refs/heads/foo/1 trace
-
-Everything up-to-date
-packet: receive-pack> dc65a2e0f299dcc7efddbbe01641a28ee84329ba refs/heads/foo/1\0report-status report-status-v2 delete-refs side-band-64k quiet atomic ofs-delta object-format=sha1 agent=git/2.47.2
-packet:         push< dc65a2e0f299dcc7efddbbe01641a28ee84329ba refs/heads/foo/1\0report-status report-status-v2 delete-refs side-band-64k quiet atomic ofs-delta object-format=sha1 agent=git/2.47.2
-ok 10 - git-receive-pack(1) with transfer.hideRefs does not match unstripped refs during advertisement
-
-expecting success of 5509.11 'try to update a hidden full ref': 
-	test_config -C pushee transfer.hideRefs "^refs/namespaces/namespace/refs/heads/main" &&
-	test_must_fail git -C original push pushee-namespaced main
-
-To ext::git --namespace=namespace %s ../pushee
- ! [remote rejected] main -> main (deny updating a hidden ref)
-error: failed to push some refs to 'ext::git --namespace=namespace %s ../pushee'
-ok 11 - try to update a hidden full ref
-
-expecting success of 5509.12 'set up ambiguous HEAD': 
-	git init ambiguous &&
-	(
-		cd ambiguous &&
-		git commit --allow-empty -m foo &&
-		git update-ref refs/namespaces/ns/refs/heads/one HEAD &&
-		git update-ref refs/namespaces/ns/refs/heads/two HEAD &&
-		git symbolic-ref refs/namespaces/ns/HEAD \
-			refs/namespaces/ns/refs/heads/two
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/ambiguous/.git/
-[main (root-commit) cbc461b] foo
- Author: A U Thor <author@example.com>
-ok 12 - set up ambiguous HEAD
-
-expecting success of 5509.13 'clone chooses correct HEAD (v0)': 
-	GIT_NAMESPACE=ns git -c protocol.version=0 \
-		clone ambiguous ambiguous-v0 &&
-	echo refs/heads/two >expect &&
-	git -C ambiguous-v0 symbolic-ref HEAD >actual &&
-	test_cmp expect actual
-
-Cloning into 'ambiguous-v0'...
-done.
-ok 13 - clone chooses correct HEAD (v0)
-
-expecting success of 5509.14 'clone chooses correct HEAD (v2)': 
-	GIT_NAMESPACE=ns git -c protocol.version=2 \
-		clone ambiguous ambiguous-v2 &&
-	echo refs/heads/two >expect &&
-	git -C ambiguous-v2 symbolic-ref HEAD >actual &&
-	test_cmp expect actual
-
-Cloning into 'ambiguous-v2'...
-done.
-ok 14 - clone chooses correct HEAD (v2)
-
-expecting success of 5509.15 'denyCurrentBranch and unborn branch with ref namespace': 
-	(
-		cd original &&
-		git init unborn &&
-		git remote add unborn-namespaced "ext::git --namespace=namespace %s unborn" &&
-		test_must_fail git push unborn-namespaced HEAD:main &&
-		git -C unborn config receive.denyCurrentBranch updateInstead &&
-		git push unborn-namespaced HEAD:main
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/original/unborn/.git/
-remote: error: refusing to update checked out branch: refs/heads/main        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To ext::git --namespace=namespace %s unborn
- ! [remote rejected] HEAD -> main (branch is currently checked out)
-error: failed to push some refs to 'ext::git --namespace=namespace %s unborn'
-To ext::git --namespace=namespace %s unborn
- * [new branch]      HEAD -> main
-ok 15 - denyCurrentBranch and unborn branch with ref namespace
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5504-fetch-receive-strict.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5504-fetch-receive-strict/.git/
 expecting success of 5504.1 'setup and inject "corrupt or missing" object': 
@@ -326713,6 +326433,287 @@
 1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5513-fetch-track.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5513-fetch-track/.git/
+expecting success of 5513.1 'setup': 
+	>file &&
+	git add . &&
+	test_tick &&
+	git commit -m Initial &&
+	git branch b-0 &&
+	git branch b1 &&
+	git branch b/one &&
+	test_create_repo other &&
+	(
+		cd other &&
+		git config remote.origin.url .. &&
+		git config remote.origin.fetch "+refs/heads/b/*:refs/remotes/b/*"
+	)
+
+[master (root-commit) 9d34b14] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5513-fetch-track/other/.git/
+ok 1 - setup
+
+expecting success of 5513.2 'fetch': 
+	(
+		cd other && git fetch origin &&
+		test "$(git for-each-ref --format="%(refname)")" = refs/remotes/b/one
+	)
+
+From ..
+ * [new branch]      b/one      -> b/one
+ok 2 - fetch
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5509-fetch-push-namespaces.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/.git/
+expecting success of 5509.1 'setup': 
+	git config --global protocol.ext.allow user &&
+	test_tick &&
+	git init original &&
+	(
+		cd original &&
+		echo 0 >count &&
+		git add count &&
+		test_commit 0 &&
+		echo 1 >count &&
+		git add count &&
+		test_commit 1 &&
+		git remote add pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
+		git remote add pushee-unnamespaced ../pushee
+	) &&
+	commit0=$(cd original && git rev-parse HEAD^) &&
+	commit1=$(cd original && git rev-parse HEAD) &&
+	git init --bare pushee &&
+	git init puller
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/original/.git/
+[main (root-commit) fbdf431] 0
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 0.t
+ create mode 100644 count
+[main dc65a2e] 1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 1.t
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/pushee/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/puller/.git/
+ok 1 - setup
+
+expecting success of 5509.2 'pushing into a repository using a ref namespace': 
+	(
+		cd original &&
+		git push pushee-namespaced main &&
+		git ls-remote pushee-namespaced >actual &&
+		printf "$commit1\trefs/heads/main\n" >expected &&
+		test_cmp expected actual &&
+		git push pushee-namespaced --tags &&
+		git ls-remote pushee-namespaced >actual &&
+		printf "$commit0\trefs/tags/0\n" >>expected &&
+		printf "$commit1\trefs/tags/1\n" >>expected &&
+		test_cmp expected actual &&
+		# Verify that the GIT_NAMESPACE environment variable works as well
+		GIT_NAMESPACE=namespace git ls-remote "ext::git %s ../pushee" >actual &&
+		test_cmp expected actual &&
+		# Verify that --namespace overrides GIT_NAMESPACE
+		GIT_NAMESPACE=garbage git ls-remote pushee-namespaced >actual &&
+		test_cmp expected actual &&
+		# Try a namespace with no content
+		git ls-remote "ext::git --namespace=garbage %s ../pushee" >actual &&
+		test_must_be_empty actual &&
+		git ls-remote pushee-unnamespaced >actual &&
+		sed -e "s|refs/|refs/namespaces/namespace/refs/|" expected >expected.unnamespaced &&
+		test_cmp expected.unnamespaced actual
+	)
+
+To ext::git --namespace=namespace %s ../pushee
+ * [new branch]      main -> main
+To ext::git --namespace=namespace %s ../pushee
+ * [new tag]         0 -> 0
+ * [new tag]         1 -> 1
+ok 2 - pushing into a repository using a ref namespace
+
+expecting success of 5509.3 'pulling from a repository using a ref namespace': 
+	(
+		cd puller &&
+		git remote add -f pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
+		git for-each-ref refs/ >actual &&
+		printf "$commit1 commit\trefs/remotes/pushee-namespaced/main\n" >expected &&
+		printf "$commit0 commit\trefs/tags/0\n" >>expected &&
+		printf "$commit1 commit\trefs/tags/1\n" >>expected &&
+		test_cmp expected actual
+	)
+
+Updating pushee-namespaced
+From ext::git --namespace=namespace %s ../pushee
+ * [new branch]      main       -> pushee-namespaced/main
+ * [new tag]         1          -> 1
+ * [new tag]         0          -> 0
+Bad commandok 3 - pulling from a repository using a ref namespace
+
+expecting success of 5509.4 'mirroring a repository using a ref namespace': 
+	git clone --mirror pushee mirror &&
+	(
+		cd mirror &&
+		git for-each-ref refs/ >actual &&
+		printf "$commit1 commit\trefs/namespaces/namespace/refs/heads/main\n" >expected &&
+		printf "$commit0 commit\trefs/namespaces/namespace/refs/tags/0\n" >>expected &&
+		printf "$commit1 commit\trefs/namespaces/namespace/refs/tags/1\n" >>expected &&
+		test_cmp expected actual
+	)
+
+Cloning into bare repository 'mirror'...
+done.
+ok 4 - mirroring a repository using a ref namespace
+
+expecting success of 5509.5 'hide namespaced refs with transfer.hideRefs': 
+	GIT_NAMESPACE=namespace \
+		git -C pushee -c transfer.hideRefs=refs/tags \
+		ls-remote "ext::git %s ." >actual &&
+	printf "$commit1\trefs/heads/main\n" >expected &&
+	test_cmp expected actual
+
+ok 5 - hide namespaced refs with transfer.hideRefs
+
+expecting success of 5509.6 'check that transfer.hideRefs does not match unstripped refs': 
+	git -C pushee pack-refs --all &&
+	GIT_NAMESPACE=namespace \
+		git -C pushee -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
+		ls-remote "ext::git %s ." >actual &&
+	printf "$commit1\trefs/heads/main\n" >expected &&
+	printf "$commit0\trefs/tags/0\n" >>expected &&
+	printf "$commit1\trefs/tags/1\n" >>expected &&
+	test_cmp expected actual
+
+ok 6 - check that transfer.hideRefs does not match unstripped refs
+
+expecting success of 5509.7 'hide full refs with transfer.hideRefs': 
+	GIT_NAMESPACE=namespace \
+		git -C pushee -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
+		ls-remote "ext::git %s ." >actual &&
+	printf "$commit1\trefs/heads/main\n" >expected &&
+	test_cmp expected actual
+
+ok 7 - hide full refs with transfer.hideRefs
+
+expecting success of 5509.8 'try to update a hidden ref': 
+	test_config -C pushee transfer.hideRefs refs/heads/main &&
+	test_must_fail git -C original push pushee-namespaced main
+
+To ext::git --namespace=namespace %s ../pushee
+ ! [remote rejected] main -> main (deny updating a hidden ref)
+error: failed to push some refs to 'ext::git --namespace=namespace %s ../pushee'
+ok 8 - try to update a hidden ref
+
+expecting success of 5509.9 'try to update a ref that is not hidden': 
+	test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/main &&
+	git -C original push pushee-namespaced main
+
+Everything up-to-date
+ok 9 - try to update a ref that is not hidden
+
+expecting success of 5509.10 'git-receive-pack(1) with transfer.hideRefs does not match unstripped refs during advertisement': 
+	git -C pushee update-ref refs/namespaces/namespace/refs/heads/foo/1 refs/namespaces/namespace/refs/heads/main &&
+	git -C pushee pack-refs --all &&
+	test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/foo &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C original push pushee-namespaced main &&
+	test_grep refs/heads/foo/1 trace
+
+Everything up-to-date
+packet: receive-pack> dc65a2e0f299dcc7efddbbe01641a28ee84329ba refs/heads/foo/1\0report-status report-status-v2 delete-refs side-band-64k quiet atomic ofs-delta object-format=sha1 agent=git/2.47.2
+packet:         push< dc65a2e0f299dcc7efddbbe01641a28ee84329ba refs/heads/foo/1\0report-status report-status-v2 delete-refs side-band-64k quiet atomic ofs-delta object-format=sha1 agent=git/2.47.2
+ok 10 - git-receive-pack(1) with transfer.hideRefs does not match unstripped refs during advertisement
+
+expecting success of 5509.11 'try to update a hidden full ref': 
+	test_config -C pushee transfer.hideRefs "^refs/namespaces/namespace/refs/heads/main" &&
+	test_must_fail git -C original push pushee-namespaced main
+
+To ext::git --namespace=namespace %s ../pushee
+ ! [remote rejected] main -> main (deny updating a hidden ref)
+error: failed to push some refs to 'ext::git --namespace=namespace %s ../pushee'
+ok 11 - try to update a hidden full ref
+
+expecting success of 5509.12 'set up ambiguous HEAD': 
+	git init ambiguous &&
+	(
+		cd ambiguous &&
+		git commit --allow-empty -m foo &&
+		git update-ref refs/namespaces/ns/refs/heads/one HEAD &&
+		git update-ref refs/namespaces/ns/refs/heads/two HEAD &&
+		git symbolic-ref refs/namespaces/ns/HEAD \
+			refs/namespaces/ns/refs/heads/two
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/ambiguous/.git/
+[main (root-commit) cbc461b] foo
+ Author: A U Thor <author@example.com>
+ok 12 - set up ambiguous HEAD
+
+expecting success of 5509.13 'clone chooses correct HEAD (v0)': 
+	GIT_NAMESPACE=ns git -c protocol.version=0 \
+		clone ambiguous ambiguous-v0 &&
+	echo refs/heads/two >expect &&
+	git -C ambiguous-v0 symbolic-ref HEAD >actual &&
+	test_cmp expect actual
+
+Cloning into 'ambiguous-v0'...
+done.
+ok 13 - clone chooses correct HEAD (v0)
+
+expecting success of 5509.14 'clone chooses correct HEAD (v2)': 
+	GIT_NAMESPACE=ns git -c protocol.version=2 \
+		clone ambiguous ambiguous-v2 &&
+	echo refs/heads/two >expect &&
+	git -C ambiguous-v2 symbolic-ref HEAD >actual &&
+	test_cmp expect actual
+
+Cloning into 'ambiguous-v2'...
+done.
+ok 14 - clone chooses correct HEAD (v2)
+
+expecting success of 5509.15 'denyCurrentBranch and unborn branch with ref namespace': 
+	(
+		cd original &&
+		git init unborn &&
+		git remote add unborn-namespaced "ext::git --namespace=namespace %s unborn" &&
+		test_must_fail git push unborn-namespaced HEAD:main &&
+		git -C unborn config receive.denyCurrentBranch updateInstead &&
+		git push unborn-namespaced HEAD:main
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5509-fetch-push-namespaces/original/unborn/.git/
+remote: error: refusing to update checked out branch: refs/heads/main        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To ext::git --namespace=namespace %s unborn
+ ! [remote rejected] HEAD -> main (branch is currently checked out)
+error: failed to push some refs to 'ext::git --namespace=namespace %s unborn'
+To ext::git --namespace=namespace %s unborn
+ * [new branch]      HEAD -> main
+ok 15 - denyCurrentBranch and unborn branch with ref namespace
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5511-refspec.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5511-refspec/.git/
 expecting success of 5511.1 'push  (invalid)': test_must_fail git ls-remote frotz
@@ -327053,8 +327054,8 @@
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.1
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.10
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.2
---- exp_err	2026-03-04 07:59:51.747352315 +0000
-+++ actual_err	2026-03-04 07:59:51.863352315 +0000
+--- exp_err	2025-01-30 02:13:00.376552740 +0000
++++ actual_err	2025-01-30 02:13:00.520553604 +0000
 @@ -1 +0,0 @@
 -From /build/reproducible-path/git-2.47.2/t/trash directory.t5512-ls-remote/.git
 ok 17 - suppress "From <url>" with -q
@@ -327645,484 +327646,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5517-push-mirror.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/.git/
-expecting success of 5517.1 'push mirror creates new branches': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git push --mirror up
-	) &&
-	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
-	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
-	test "$main_main" = "$mirror_main"
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      main -> main
-ok 1 - push mirror creates new branches
-
-expecting success of 5517.2 'push mirror updates existing branches': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git push --mirror up &&
-		echo two >foo && git add foo && git commit -m two &&
-		git push --mirror up
-	) &&
-	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
-	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
-	test "$main_main" = "$mirror_main"
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      main -> main
-[main 85d7b0e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-remote: warning: updating the current branch        
-To ../mirror
-   8b096fc..85d7b0e  main -> main
- * [new reference]   up/main -> up/main
-ok 2 - push mirror updates existing branches
-
-expecting success of 5517.3 'push mirror force updates existing branches': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git push --mirror up &&
-		echo two >foo && git add foo && git commit -m two &&
-		git push --mirror up &&
-		git reset --hard HEAD^ &&
-		git push --mirror up
-	) &&
-	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
-	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
-	test "$main_main" = "$mirror_main"
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      main -> main
-[main 85d7b0e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-remote: warning: updating the current branch        
-To ../mirror
-   8b096fc..85d7b0e  main -> main
- * [new reference]   up/main -> up/main
-HEAD is now at 8b096fc one
-remote: warning: updating the current branch        
-To ../mirror
- + 85d7b0e...8b096fc main -> main (forced update)
-   8b096fc..85d7b0e  up/main -> up/main
-ok 3 - push mirror force updates existing branches
-
-expecting success of 5517.4 'push mirror removes branches': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git branch remove main &&
-		git push --mirror up &&
-		git branch -D remove &&
-		git push --mirror up
-	) &&
-	(
-		cd mirror &&
-		invert git show-ref -s --verify refs/heads/remove
-	)
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      main -> main
- * [new branch]      remove -> remove
-Deleted branch remove (was 8b096fc).
-To ../mirror
- - [deleted]         remove
- * [new reference]   up/main -> up/main
- * [new reference]   up/remove -> up/remove
-fatal: 'refs/heads/remove' - not a valid ref
-ok 4 - push mirror removes branches
-
-expecting success of 5517.5 'push mirror adds, updates and removes branches together': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git branch remove main &&
-		git push --mirror up &&
-		git branch -D remove &&
-		git branch add main &&
-		echo two >foo && git add foo && git commit -m two &&
-		git push --mirror up
-	) &&
-	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
-	main_add=$(cd main && git show-ref -s --verify refs/heads/add) &&
-	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
-	mirror_add=$(cd mirror && git show-ref -s --verify refs/heads/add) &&
-	test "$main_main" = "$mirror_main" &&
-	test "$main_add" = "$mirror_add" &&
-	(
-		cd mirror &&
-		invert git show-ref -s --verify refs/heads/remove
-	)
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      main -> main
- * [new branch]      remove -> remove
-Deleted branch remove (was 8b096fc).
-[main 85d7b0e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-remote: warning: updating the current branch        
-To ../mirror
-   8b096fc..85d7b0e  main -> main
- - [deleted]         remove
- * [new branch]      add -> add
- * [new reference]   up/main -> up/main
- * [new reference]   up/remove -> up/remove
-fatal: 'refs/heads/remove' - not a valid ref
-ok 5 - push mirror adds, updates and removes branches together
-
-expecting success of 5517.6 'push mirror creates new tags': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git tag -f tmain main &&
-		git push --mirror up
-	) &&
-	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
-	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
-	test "$main_main" = "$mirror_main"
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      main -> main
- * [new tag]         tmain -> tmain
-ok 6 - push mirror creates new tags
-
-expecting success of 5517.7 'push mirror updates existing tags': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git tag -f tmain main &&
-		git push --mirror up &&
-		echo two >foo && git add foo && git commit -m two &&
-		git tag -f tmain main &&
-		git push --mirror up
-	) &&
-	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
-	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
-	test "$main_main" = "$mirror_main"
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      main -> main
- * [new tag]         tmain -> tmain
-[main 85d7b0e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Updated tag 'tmain' (was 8b096fc)
-remote: warning: updating the current branch        
-To ../mirror
-   8b096fc..85d7b0e  main -> main
- + 8b096fc...85d7b0e tmain -> tmain (forced update)
- * [new reference]   up/main -> up/main
-ok 7 - push mirror updates existing tags
-
-expecting success of 5517.8 'push mirror force updates existing tags': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git tag -f tmain main &&
-		git push --mirror up &&
-		echo two >foo && git add foo && git commit -m two &&
-		git tag -f tmain main &&
-		git push --mirror up &&
-		git reset --hard HEAD^ &&
-		git tag -f tmain main &&
-		git push --mirror up
-	) &&
-	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
-	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
-	test "$main_main" = "$mirror_main"
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      main -> main
- * [new tag]         tmain -> tmain
-[main 85d7b0e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Updated tag 'tmain' (was 8b096fc)
-remote: warning: updating the current branch        
-To ../mirror
-   8b096fc..85d7b0e  main -> main
- + 8b096fc...85d7b0e tmain -> tmain (forced update)
- * [new reference]   up/main -> up/main
-HEAD is now at 8b096fc one
-Updated tag 'tmain' (was 85d7b0e)
-remote: warning: updating the current branch        
-To ../mirror
- + 85d7b0e...8b096fc main -> main (forced update)
-   8b096fc..85d7b0e  up/main -> up/main
- + 85d7b0e...8b096fc tmain -> tmain (forced update)
-ok 8 - push mirror force updates existing tags
-
-expecting success of 5517.9 'push mirror removes tags': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git tag -f tremove main &&
-		git push --mirror up &&
-		git tag -d tremove &&
-		git push --mirror up
-	) &&
-	(
-		cd mirror &&
-		invert git show-ref -s --verify refs/tags/tremove
-	)
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      main -> main
- * [new tag]         tremove -> tremove
-Deleted tag 'tremove' (was 8b096fc)
-To ../mirror
- - [deleted]         tremove
- * [new reference]   up/main -> up/main
-fatal: 'refs/tags/tremove' - not a valid ref
-ok 9 - push mirror removes tags
-
-expecting success of 5517.10 'push mirror adds, updates and removes tags together': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git tag -f tmain main &&
-		git tag -f tremove main &&
-		git push --mirror up &&
-		git tag -d tremove &&
-		git tag tadd main &&
-		echo two >foo && git add foo && git commit -m two &&
-		git tag -f tmain main &&
-		git push --mirror up
-	) &&
-	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
-	main_add=$(cd main && git show-ref -s --verify refs/tags/tadd) &&
-	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
-	mirror_add=$(cd mirror && git show-ref -s --verify refs/tags/tadd) &&
-	test "$main_main" = "$mirror_main" &&
-	test "$main_add" = "$mirror_add" &&
-	(
-		cd mirror &&
-		invert git show-ref -s --verify refs/tags/tremove
-	)
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      main -> main
- * [new tag]         tmain -> tmain
- * [new tag]         tremove -> tremove
-Deleted tag 'tremove' (was 8b096fc)
-[main 85d7b0e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Updated tag 'tmain' (was 8b096fc)
-remote: warning: updating the current branch        
-To ../mirror
-   8b096fc..85d7b0e  main -> main
- + 8b096fc...85d7b0e tmain -> tmain (forced update)
- - [deleted]         tremove
- * [new reference]   up/main -> up/main
- * [new tag]         tadd -> tadd
-fatal: 'refs/tags/tremove' - not a valid ref
-ok 10 - push mirror adds, updates and removes tags together
-
-expecting success of 5517.11 'remote.foo.mirror adds and removes branches': 
-
-	mk_repo_pair --mirror &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git branch keep main &&
-		git branch remove main &&
-		git push up &&
-		git branch -D remove &&
-		git push up
-	) &&
-	(
-		cd mirror &&
-		git show-ref -s --verify refs/heads/keep &&
-		invert git show-ref -s --verify refs/heads/remove
-	)
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-warning: --mirror is dangerous and deprecated; please
-	 use --mirror=fetch or --mirror=push instead
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-branch 'keep' set up to track 'up/main'.
-branch 'remove' set up to track 'up/main'.
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      keep -> keep
- * [new branch]      main -> main
- * [new branch]      remove -> remove
-Deleted branch remove (was 8b096fc).
-To ../mirror
- - [deleted]         remove
-8b096fc4c6715e368acaf2c14a0ce99f4b412a2b
-fatal: 'refs/heads/remove' - not a valid ref
-ok 11 - remote.foo.mirror adds and removes branches
-
-expecting success of 5517.12 'remote.foo.mirror=no has no effect': 
-
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git config --add remote.up.mirror no &&
-		git branch keep main &&
-		git push --mirror up &&
-		git branch -D keep &&
-		git push up :
-	) &&
-	(
-		cd mirror &&
-		git show-ref -s --verify refs/heads/keep
-	)
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      keep -> keep
- * [new branch]      main -> main
-Deleted branch keep (was 8b096fc).
-Everything up-to-date
-8b096fc4c6715e368acaf2c14a0ce99f4b412a2b
-ok 12 - remote.foo.mirror=no has no effect
-
-expecting success of 5517.13 'push to mirrored repository with refspec fails': 
-	mk_repo_pair &&
-	(
-		cd main &&
-		echo one >foo && git add foo && git commit -m one &&
-		git config --add remote.up.mirror true &&
-		test_must_fail git push up main
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
-[main (root-commit) 8b096fc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: --mirror can't be combined with refspecs
-ok 13 - push to mirrored repository with refspec fails
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5514-fetch-multiple.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5514-fetch-multiple/.git/
 expecting success of 5514.1 'setup': 
@@ -328668,6 +328191,484 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5517-push-mirror.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/.git/
+expecting success of 5517.1 'push mirror creates new branches': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git push --mirror up
+	) &&
+	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
+	test "$main_main" = "$mirror_main"
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      main -> main
+ok 1 - push mirror creates new branches
+
+expecting success of 5517.2 'push mirror updates existing branches': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git push --mirror up &&
+		echo two >foo && git add foo && git commit -m two &&
+		git push --mirror up
+	) &&
+	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
+	test "$main_main" = "$mirror_main"
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      main -> main
+[main 85d7b0e] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+remote: warning: updating the current branch        
+To ../mirror
+   8b096fc..85d7b0e  main -> main
+ * [new reference]   up/main -> up/main
+ok 2 - push mirror updates existing branches
+
+expecting success of 5517.3 'push mirror force updates existing branches': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git push --mirror up &&
+		echo two >foo && git add foo && git commit -m two &&
+		git push --mirror up &&
+		git reset --hard HEAD^ &&
+		git push --mirror up
+	) &&
+	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
+	test "$main_main" = "$mirror_main"
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      main -> main
+[main 85d7b0e] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+remote: warning: updating the current branch        
+To ../mirror
+   8b096fc..85d7b0e  main -> main
+ * [new reference]   up/main -> up/main
+HEAD is now at 8b096fc one
+remote: warning: updating the current branch        
+To ../mirror
+ + 85d7b0e...8b096fc main -> main (forced update)
+   8b096fc..85d7b0e  up/main -> up/main
+ok 3 - push mirror force updates existing branches
+
+expecting success of 5517.4 'push mirror removes branches': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git branch remove main &&
+		git push --mirror up &&
+		git branch -D remove &&
+		git push --mirror up
+	) &&
+	(
+		cd mirror &&
+		invert git show-ref -s --verify refs/heads/remove
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      main -> main
+ * [new branch]      remove -> remove
+Deleted branch remove (was 8b096fc).
+To ../mirror
+ - [deleted]         remove
+ * [new reference]   up/main -> up/main
+ * [new reference]   up/remove -> up/remove
+fatal: 'refs/heads/remove' - not a valid ref
+ok 4 - push mirror removes branches
+
+expecting success of 5517.5 'push mirror adds, updates and removes branches together': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git branch remove main &&
+		git push --mirror up &&
+		git branch -D remove &&
+		git branch add main &&
+		echo two >foo && git add foo && git commit -m two &&
+		git push --mirror up
+	) &&
+	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+	main_add=$(cd main && git show-ref -s --verify refs/heads/add) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
+	mirror_add=$(cd mirror && git show-ref -s --verify refs/heads/add) &&
+	test "$main_main" = "$mirror_main" &&
+	test "$main_add" = "$mirror_add" &&
+	(
+		cd mirror &&
+		invert git show-ref -s --verify refs/heads/remove
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      main -> main
+ * [new branch]      remove -> remove
+Deleted branch remove (was 8b096fc).
+[main 85d7b0e] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+remote: warning: updating the current branch        
+To ../mirror
+   8b096fc..85d7b0e  main -> main
+ - [deleted]         remove
+ * [new branch]      add -> add
+ * [new reference]   up/main -> up/main
+ * [new reference]   up/remove -> up/remove
+fatal: 'refs/heads/remove' - not a valid ref
+ok 5 - push mirror adds, updates and removes branches together
+
+expecting success of 5517.6 'push mirror creates new tags': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git tag -f tmain main &&
+		git push --mirror up
+	) &&
+	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
+	test "$main_main" = "$mirror_main"
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      main -> main
+ * [new tag]         tmain -> tmain
+ok 6 - push mirror creates new tags
+
+expecting success of 5517.7 'push mirror updates existing tags': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git tag -f tmain main &&
+		git push --mirror up &&
+		echo two >foo && git add foo && git commit -m two &&
+		git tag -f tmain main &&
+		git push --mirror up
+	) &&
+	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
+	test "$main_main" = "$mirror_main"
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      main -> main
+ * [new tag]         tmain -> tmain
+[main 85d7b0e] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Updated tag 'tmain' (was 8b096fc)
+remote: warning: updating the current branch        
+To ../mirror
+   8b096fc..85d7b0e  main -> main
+ + 8b096fc...85d7b0e tmain -> tmain (forced update)
+ * [new reference]   up/main -> up/main
+ok 7 - push mirror updates existing tags
+
+expecting success of 5517.8 'push mirror force updates existing tags': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git tag -f tmain main &&
+		git push --mirror up &&
+		echo two >foo && git add foo && git commit -m two &&
+		git tag -f tmain main &&
+		git push --mirror up &&
+		git reset --hard HEAD^ &&
+		git tag -f tmain main &&
+		git push --mirror up
+	) &&
+	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
+	test "$main_main" = "$mirror_main"
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      main -> main
+ * [new tag]         tmain -> tmain
+[main 85d7b0e] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Updated tag 'tmain' (was 8b096fc)
+remote: warning: updating the current branch        
+To ../mirror
+   8b096fc..85d7b0e  main -> main
+ + 8b096fc...85d7b0e tmain -> tmain (forced update)
+ * [new reference]   up/main -> up/main
+HEAD is now at 8b096fc one
+Updated tag 'tmain' (was 85d7b0e)
+remote: warning: updating the current branch        
+To ../mirror
+ + 85d7b0e...8b096fc main -> main (forced update)
+   8b096fc..85d7b0e  up/main -> up/main
+ + 85d7b0e...8b096fc tmain -> tmain (forced update)
+ok 8 - push mirror force updates existing tags
+
+expecting success of 5517.9 'push mirror removes tags': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git tag -f tremove main &&
+		git push --mirror up &&
+		git tag -d tremove &&
+		git push --mirror up
+	) &&
+	(
+		cd mirror &&
+		invert git show-ref -s --verify refs/tags/tremove
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      main -> main
+ * [new tag]         tremove -> tremove
+Deleted tag 'tremove' (was 8b096fc)
+To ../mirror
+ - [deleted]         tremove
+ * [new reference]   up/main -> up/main
+fatal: 'refs/tags/tremove' - not a valid ref
+ok 9 - push mirror removes tags
+
+expecting success of 5517.10 'push mirror adds, updates and removes tags together': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git tag -f tmain main &&
+		git tag -f tremove main &&
+		git push --mirror up &&
+		git tag -d tremove &&
+		git tag tadd main &&
+		echo two >foo && git add foo && git commit -m two &&
+		git tag -f tmain main &&
+		git push --mirror up
+	) &&
+	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+	main_add=$(cd main && git show-ref -s --verify refs/tags/tadd) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
+	mirror_add=$(cd mirror && git show-ref -s --verify refs/tags/tadd) &&
+	test "$main_main" = "$mirror_main" &&
+	test "$main_add" = "$mirror_add" &&
+	(
+		cd mirror &&
+		invert git show-ref -s --verify refs/tags/tremove
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      main -> main
+ * [new tag]         tmain -> tmain
+ * [new tag]         tremove -> tremove
+Deleted tag 'tremove' (was 8b096fc)
+[main 85d7b0e] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Updated tag 'tmain' (was 8b096fc)
+remote: warning: updating the current branch        
+To ../mirror
+   8b096fc..85d7b0e  main -> main
+ + 8b096fc...85d7b0e tmain -> tmain (forced update)
+ - [deleted]         tremove
+ * [new reference]   up/main -> up/main
+ * [new tag]         tadd -> tadd
+fatal: 'refs/tags/tremove' - not a valid ref
+ok 10 - push mirror adds, updates and removes tags together
+
+expecting success of 5517.11 'remote.foo.mirror adds and removes branches': 
+
+	mk_repo_pair --mirror &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git branch keep main &&
+		git branch remove main &&
+		git push up &&
+		git branch -D remove &&
+		git push up
+	) &&
+	(
+		cd mirror &&
+		git show-ref -s --verify refs/heads/keep &&
+		invert git show-ref -s --verify refs/heads/remove
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+warning: --mirror is dangerous and deprecated; please
+	 use --mirror=fetch or --mirror=push instead
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+branch 'keep' set up to track 'up/main'.
+branch 'remove' set up to track 'up/main'.
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      keep -> keep
+ * [new branch]      main -> main
+ * [new branch]      remove -> remove
+Deleted branch remove (was 8b096fc).
+To ../mirror
+ - [deleted]         remove
+8b096fc4c6715e368acaf2c14a0ce99f4b412a2b
+fatal: 'refs/heads/remove' - not a valid ref
+ok 11 - remote.foo.mirror adds and removes branches
+
+expecting success of 5517.12 'remote.foo.mirror=no has no effect': 
+
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git config --add remote.up.mirror no &&
+		git branch keep main &&
+		git push --mirror up &&
+		git branch -D keep &&
+		git push up :
+	) &&
+	(
+		cd mirror &&
+		git show-ref -s --verify refs/heads/keep
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      keep -> keep
+ * [new branch]      main -> main
+Deleted branch keep (was 8b096fc).
+Everything up-to-date
+8b096fc4c6715e368acaf2c14a0ce99f4b412a2b
+ok 12 - remote.foo.mirror=no has no effect
+
+expecting success of 5517.13 'push to mirrored repository with refspec fails': 
+	mk_repo_pair &&
+	(
+		cd main &&
+		echo one >foo && git add foo && git commit -m one &&
+		git config --add remote.up.mirror true &&
+		test_must_fail git push up main
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5517-push-mirror/main/.git/
+[main (root-commit) 8b096fc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+fatal: --mirror can't be combined with refspecs
+ok 13 - push to mirrored repository with refspec fails
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5327-multi-pack-bitmaps-rev.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5327-multi-pack-bitmaps-rev/.git/
 expecting success of 5327.1 'setup bitmap config': 
@@ -328953,7 +328954,7 @@
 Found bitmap for '4b27f21bf7560051516fe49b50eb4063d0ea6f90'. 640 bits / 891eb351 checksum
 Verifying bitmap entries:   0% (1/343)
Verifying bitmap entries:   1% (4/343)
Verifying bitmap entries:   2% (7/343)
Verifying bitmap entries:   3% (11/343)
Verifying bitmap entries:   4% (14/343)
Verifying bitmap entries:   5% (18/343)
Verifying bitmap entries:   6% (21/343)
Verifying bitmap entries:   7% (25/343)
Verifying bitmap entries:   8% (28/343)
Verifying bitmap entries:   9% (31/343)
Verifying bitmap entries:  10% (35/343)
Verifying bitmap entries:  11% (38/343)
Verifying bitmap entries:  12% (42/343)
Verifying bitmap entries:  13% (45/343)
Verifying bitmap entries:  14% (49/343)
Verifying bitmap entries:  15% (52/343)
Verifying bitmap entries:  16% (55/343)
Verifying bitmap entries:  17% (59/343)
Verifying bitmap entries:  18% (62/343)
Verifying bitmap entries:  19% (66/343)
Verifying bitmap entries:  20% (69/343)
Verifying bitmap entries:  21% (73/343)
Verifying bitmap entries:  22% (76/343)
Verifying bitmap entries:  23% (79/343)
Verifying bitmap entries:  24% (83/343)
Verifying bitmap entries:  25% (86/343)
Verifying bitmap entries:  26% (90/343)
Verifying bitmap entries:  27% (93/343)
Verifying bitmap entries:  28% (97/343)
Verifying bitmap entries:  29% (100/343)
Verifying bitmap entries:  30% (103/343)
Verifying bitmap entries:  31% (107/343)
Verifying bitmap entries:  32% (110/343)
Verifying bitmap entries:  33% (114/343)
Verifying bitmap entries:  34% (117/343)
Verifying bitmap entries:  35% (121/343)
Verifying bitmap entries:  36% (124/343)
Verifying bitmap entries:  37% (127/343)
Verifying bitmap entries:  38% (131/343)
Verifying bitmap entries:  39% (134/343)
Verifying bitmap entries:  40% (138/343)
Verifying bitmap entries:  41% (141/343)
Verifying bitmap entries:  42% (145/343)
Verifying bitmap entries:  43% (148/343)
Verifying bitmap entries:  44% (151/343)
Verifying bitmap entries:  45% (155/343)
Verifying bitmap entries:  46% (158/343)
Verifying bitmap entries:  47% (162/343)
Verifying bitmap entries:  48% (165/343)
Verifying bitmap entries:  49% (169/343)
Verifying bitmap entries:  50% (172/343)
Verifying bitmap entries:  51% (175/343)
Verifying bitmap entries:  52% (179/343)
Verifying bitmap entries:  53% (182/343)
Verifying bitmap entries:  54% (186/343)
Verifying bitmap entries:  55% (189/343)
Verifying bitmap entries:  56% (193/343)
Verifying bitmap entries:  57% (196/343)
Verifying bitmap entries:  58% (199/343)
Verifying bitmap entries:  59% (203/343)
Verifying bitmap entries:  60% (206/343)
Verifying bitmap entries:  61% (210/343)
Verifying bitmap entries:  62% (213/343)
Verifying bitmap entries:  63% (217/343)
Verifying bitmap entries:  64% (220/343)
Verifying bitmap entries:  65% (223/343)
Verifying bitmap entries:  66% (227/343)
Verifying bitmap entries:  67% (230/343)
Verifying bitmap entries:  68% (234/343)
Verifying bitmap entries:  69% (237/343)
Verifying bitmap entries:  70% (241/343)
Verifying bitmap entries:  71% (244/343)
Verifying bitmap entries:  72% (247/343)
Verifying bitmap entries:  73% (251/343)
Verifying bitmap entries:  74% (254/343)
Verifying bitmap entries:  75% (258/343)
Verifying bitmap entries:  76% (261/343)
Verifying bitmap entries:  77% (265/343)
Verifying bitmap entries:  78% (268/343)
Verifying bitmap entries:  79% (271/343)
Verifying bitmap entries:  80% (275/343)
Verifying bitmap entries:  81% (278/343)
Verifying bitmap entries:  82% (282/343)
Verifying bitmap entries:  83% (285/343)
Verifying bitmap entries:  84% (289/343)
Verifying bitmap entries:  85% (292/343)
Verifying bitmap entries:  86% (295/343)
Verifying bitmap entries:  87% (299/343)
Verifying bitmap entries:  88% (302/343)
Verifying bitmap entries:  89% (306/343)
Verifying bitmap entries:  90% (309/343)
Verifying bitmap entries:  91% (313/343)
Verifying bitmap entries:  92% (316/343)
Verifying bitmap entries:  93% (319/343)
Verifying bitmap entries:  94% (323/343)
Verifying bitmap entries:  95% (326/343)
Verifying bitmap entries:  96% (330/343)
Verifying bitmap entries:  97% (333/343)
Verifying bitmap entries:  98% (337/343)
Verifying bitmap entries:  99% (340/343)
Verifying bitmap entries: 100% (343/343)
Verifying bitmap entries: 100% (343/343), done.
 OK!
-{"event":"data","sid":"20260304T075923.282790Z-H8d819085-P00096111","thread":"main","time":"2026-03-04T07:59:23.283989Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001399,"t_rel":0.001399,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021225.122437Z-H5c947e1c-P001ca961","thread":"main","time":"2025-01-30T02:12:25.125869Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.003627,"t_rel":0.003627,"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': 
@@ -329448,18 +329449,18 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 0f0d6be4 checksum
+Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / b399ece2 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
-{"event":"data","sid":"20260304T075923.282790Z-H8d819085-P00096111","thread":"main","time":"2026-03-04T07:59:23.283989Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001399,"t_rel":0.001399,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260304T075930.515948Z-H8d819085-P00097ad1","thread":"main","time":"2026-03-04T07:59:30.517135Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001394,"t_rel":0.001394,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021225.122437Z-H5c947e1c-P001ca961","thread":"main","time":"2025-01-30T02:12:25.125869Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.003627,"t_rel":0.003627,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021233.601501Z-H5c947e1c-P001cc07a","thread":"main","time":"2025-01-30T02:12:33.602598Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001277,"t_rel":0.001277,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
 ok 49 - reverse index exists (rev)
 
 expecting success of 5327.50 'rev-list --test-bitmap verifies bitmaps': 
 		git rev-list --test-bitmap HEAD
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 0f0d6be4 checksum
+Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / b399ece2 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
 ok 50 - rev-list --test-bitmap verifies bitmaps
@@ -330104,9 +330105,9 @@
 Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / e99a0c7c checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
-{"event":"data","sid":"20260304T075923.282790Z-H8d819085-P00096111","thread":"main","time":"2026-03-04T07:59:23.283989Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001399,"t_rel":0.001399,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260304T075930.515948Z-H8d819085-P00097ad1","thread":"main","time":"2026-03-04T07:59:30.517135Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001394,"t_rel":0.001394,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260304T075937.070726Z-H8d819085-P000993f4","thread":"main","time":"2026-03-04T07:59:37.071917Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001370,"t_rel":0.001370,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021225.122437Z-H5c947e1c-P001ca961","thread":"main","time":"2025-01-30T02:12:25.125869Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.003627,"t_rel":0.003627,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021233.601501Z-H5c947e1c-P001cc07a","thread":"main","time":"2025-01-30T02:12:33.602598Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001277,"t_rel":0.001277,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021241.930032Z-H5c947e1c-P001cd876","thread":"main","time":"2025-01-30T02:12:41.931201Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001365,"t_rel":0.001365,"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': 
@@ -330755,7 +330756,7 @@
 Found bitmap for 'db2803b34efd93d3448bc6cf028a889473ba3735'. 640 bits / 891eb351 checksum
 Verifying bitmap entries:   0% (1/343)
Verifying bitmap entries:   1% (4/343)
Verifying bitmap entries:   2% (7/343)
Verifying bitmap entries:   3% (11/343)
Verifying bitmap entries:   4% (14/343)
Verifying bitmap entries:   5% (18/343)
Verifying bitmap entries:   6% (21/343)
Verifying bitmap entries:   7% (25/343)
Verifying bitmap entries:   8% (28/343)
Verifying bitmap entries:   9% (31/343)
Verifying bitmap entries:  10% (35/343)
Verifying bitmap entries:  11% (38/343)
Verifying bitmap entries:  12% (42/343)
Verifying bitmap entries:  13% (45/343)
Verifying bitmap entries:  14% (49/343)
Verifying bitmap entries:  15% (52/343)
Verifying bitmap entries:  16% (55/343)
Verifying bitmap entries:  17% (59/343)
Verifying bitmap entries:  18% (62/343)
Verifying bitmap entries:  19% (66/343)
Verifying bitmap entries:  20% (69/343)
Verifying bitmap entries:  21% (73/343)
Verifying bitmap entries:  22% (76/343)
Verifying bitmap entries:  23% (79/343)
Verifying bitmap entries:  24% (83/343)
Verifying bitmap entries:  25% (86/343)
Verifying bitmap entries:  26% (90/343)
Verifying bitmap entries:  27% (93/343)
Verifying bitmap entries:  28% (97/343)
Verifying bitmap entries:  29% (100/343)
Verifying bitmap entries:  30% (103/343)
Verifying bitmap entries:  31% (107/343)
Verifying bitmap entries:  32% (110/343)
Verifying bitmap entries:  33% (114/343)
Verifying bitmap entries:  34% (117/343)
Verifying bitmap entries:  35% (121/343)
Verifying bitmap entries:  36% (124/343)
Verifying bitmap entries:  37% (127/343)
Verifying bitmap entries:  38% (131/343)
Verifying bitmap entries:  39% (134/343)
Verifying bitmap entries:  40% (138/343)
Verifying bitmap entries:  41% (141/343)
Verifying bitmap entries:  42% (145/343)
Verifying bitmap entries:  43% (148/343)
Verifying bitmap entries:  44% (151/343)
Verifying bitmap entries:  45% (155/343)
Verifying bitmap entries:  46% (158/343)
Verifying bitmap entries:  47% (162/343)
Verifying bitmap entries:  48% (165/343)
Verifying bitmap entries:  49% (169/343)
Verifying bitmap entries:  50% (172/343)
Verifying bitmap entries:  51% (175/343)
Verifying bitmap entries:  52% (179/343)
Verifying bitmap entries:  53% (182/343)
Verifying bitmap entries:  54% (186/343)
Verifying bitmap entries:  55% (189/343)
Verifying bitmap entries:  56% (193/343)
Verifying bitmap entries:  57% (196/343)
Verifying bitmap entries:  58% (199/343)
Verifying bitmap entries:  59% (203/343)
Verifying bitmap entries:  60% (206/343)
Verifying bitmap entries:  61% (210/343)
Verifying bitmap entries:  62% (213/343)
Verifying bitmap entries:  63% (217/343)
Verifying bitmap entries:  64% (220/343)
Verifying bitmap entries:  65% (223/343)
Verifying bitmap entries:  66% (227/343)
Verifying bitmap entries:  67% (230/343)
Verifying bitmap entries:  68% (234/343)
Verifying bitmap entries:  69% (237/343)
Verifying bitmap entries:  70% (241/343)
Verifying bitmap entries:  71% (244/343)
Verifying bitmap entries:  72% (247/343)
Verifying bitmap entries:  73% (251/343)
Verifying bitmap entries:  74% (254/343)
Verifying bitmap entries:  75% (258/343)
Verifying bitmap entries:  76% (261/343)
Verifying bitmap entries:  77% (265/343)
Verifying bitmap entries:  78% (268/343)
Verifying bitmap entries:  79% (271/343)
Verifying bitmap entries:  80% (275/343)
Verifying bitmap entries:  81% (278/343)
Verifying bitmap entries:  82% (282/343)
Verifying bitmap entries:  83% (285/343)
Verifying bitmap entries:  84% (289/343)
Verifying bitmap entries:  85% (292/343)
Verifying bitmap entries:  86% (295/343)
Verifying bitmap entries:  87% (299/343)
Verifying bitmap entries:  88% (302/343)
Verifying bitmap entries:  89% (306/343)
Verifying bitmap entries:  90% (309/343)
Verifying bitmap entries:  91% (313/343)
Verifying bitmap entries:  92% (316/343)
Verifying bitmap entries:  93% (319/343)
Verifying bitmap entries:  94% (323/343)
Verifying bitmap entries:  95% (326/343)
Verifying bitmap entries:  96% (330/343)
Verifying bitmap entries:  97% (333/343)
Verifying bitmap entries:  98% (337/343)
Verifying bitmap entries:  99% (340/343)
Verifying bitmap entries: 100% (343/343)
Verifying bitmap entries: 100% (343/343), done.
 OK!
-{"event":"data","sid":"20260304T075943.034629Z-H8d819085-P0009ad5a","thread":"main","time":"2026-03-04T07:59:43.035698Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001255,"t_rel":0.001255,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021249.241967Z-H5c947e1c-P001ceed6","thread":"main","time":"2025-01-30T02:12:49.243006Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001235,"t_rel":0.001235,"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': 
@@ -331250,18 +331251,18 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 0fae706b checksum
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / b16764fa checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
-{"event":"data","sid":"20260304T075943.034629Z-H8d819085-P0009ad5a","thread":"main","time":"2026-03-04T07:59:43.035698Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001255,"t_rel":0.001255,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260304T075949.970778Z-H8d819085-P0009caae","thread":"main","time":"2026-03-04T07:59:49.971952Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001356,"t_rel":0.001356,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021249.241967Z-H5c947e1c-P001ceed6","thread":"main","time":"2025-01-30T02:12:49.243006Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001235,"t_rel":0.001235,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021257.650654Z-H5c947e1c-P001d085f","thread":"main","time":"2025-01-30T02:12:57.658764Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.008297,"t_rel":0.008297,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
 ok 206 - reverse index exists (rev)
 
 expecting success of 5327.207 'rev-list --test-bitmap verifies bitmaps': 
 		git rev-list --test-bitmap HEAD
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 0fae706b checksum
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / b16764fa checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
 ok 207 - rev-list --test-bitmap verifies bitmaps
@@ -331903,19 +331904,19 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 13802fc1 checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
-{"event":"data","sid":"20260304T075943.034629Z-H8d819085-P0009ad5a","thread":"main","time":"2026-03-04T07:59:43.035698Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001255,"t_rel":0.001255,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260304T075949.970778Z-H8d819085-P0009caae","thread":"main","time":"2026-03-04T07:59:49.971952Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001356,"t_rel":0.001356,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260304T075956.821201Z-H8d819085-P0009e69d","thread":"main","time":"2026-03-04T07:59:56.822429Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001410,"t_rel":0.001410,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021249.241967Z-H5c947e1c-P001ceed6","thread":"main","time":"2025-01-30T02:12:49.243006Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001235,"t_rel":0.001235,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021257.650654Z-H5c947e1c-P001d085f","thread":"main","time":"2025-01-30T02:12:57.658764Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.008297,"t_rel":0.008297,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250130T021306.220368Z-H5c947e1c-P001d2245","thread":"main","time":"2025-01-30T02:13:06.221572Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001399,"t_rel":0.001399,"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)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 13802fc1 checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
 ok 273 - rev-list --test-bitmap verifies bitmaps
@@ -332931,8 +332932,8 @@
 	test_cmp expect output
 
 error: src refspec refs/tags/lastbackup does not match any
---- expect	2026-03-04 07:59:50.963352315 +0000
-+++ output	2026-03-04 07:59:51.031352315 +0000
+--- expect	2025-01-30 02:12:57.948538179 +0000
++++ output	2025-01-30 02:12:58.060538851 +0000
 @@ -4,7 +4,7 @@
    HEAD branch: main
    Remote branches:
@@ -333640,8 +333641,8 @@
 warning: The global configuration remote.pushDefault in:
 	file:2
 now names the non-existent remote 'origin'
-{"event":"region_enter","sid":"20260304T075957.927010Z-H8d819085-P0009eb6c","thread":"main","time":"2026-03-04T07:59:57.928040Z","file":"progress.c","line":272,"repo":1,"nesting":1,"category":"progress","label":"Renaming remote references"}
-{"event":"region_leave","sid":"20260304T075957.927010Z-H8d819085-P0009eb6c","thread":"main","time":"2026-03-04T07:59:57.929155Z","file":"progress.c","line":350,"repo":1,"t_rel":0.001117,"nesting":1,"category":"progress","label":"Renaming remote references"}
+{"event":"region_enter","sid":"20250130T021305.730019Z-H5c947e1c-P001d20ff","thread":"main","time":"2025-01-30T02:13:05.731085Z","file":"progress.c","line":272,"repo":1,"nesting":1,"category":"progress","label":"Renaming remote references"}
+{"event":"region_leave","sid":"20250130T021305.730019Z-H5c947e1c-P001d20ff","thread":"main","time":"2025-01-30T02:13:05.740430Z","file":"progress.c","line":350,"repo":1,"t_rel":0.009346,"nesting":1,"category":"progress","label":"Renaming remote references"}
 	pushRemote = upstream
 ok 58 - rename a remote
 
@@ -334474,6 +334475,114 @@
 1..113
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5527-fetch-odd-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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 >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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5523-push-upstream.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5523-push-upstream/.git/
 expecting success of 5523.1 'setup bare parent': 
@@ -335151,114 +335260,6 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5527-fetch-odd-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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 >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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5529-push-errors.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5529-push-errors/.git/
 expecting success of 5529.1 'setup commits': 
@@ -336161,7 +336162,7 @@
 Found bitmap for '4b27f21bf7560051516fe49b50eb4063d0ea6f90'. 640 bits / 891eb351 checksum
 Verifying bitmap entries:   0% (1/343)
Verifying bitmap entries:   1% (4/343)
Verifying bitmap entries:   2% (7/343)
Verifying bitmap entries:   3% (11/343)
Verifying bitmap entries:   4% (14/343)
Verifying bitmap entries:   5% (18/343)
Verifying bitmap entries:   6% (21/343)
Verifying bitmap entries:   7% (25/343)
Verifying bitmap entries:   8% (28/343)
Verifying bitmap entries:   9% (31/343)
Verifying bitmap entries:  10% (35/343)
Verifying bitmap entries:  11% (38/343)
Verifying bitmap entries:  12% (42/343)
Verifying bitmap entries:  13% (45/343)
Verifying bitmap entries:  14% (49/343)
Verifying bitmap entries:  15% (52/343)
Verifying bitmap entries:  16% (55/343)
Verifying bitmap entries:  17% (59/343)
Verifying bitmap entries:  18% (62/343)
Verifying bitmap entries:  19% (66/343)
Verifying bitmap entries:  20% (69/343)
Verifying bitmap entries:  21% (73/343)
Verifying bitmap entries:  22% (76/343)
Verifying bitmap entries:  23% (79/343)
Verifying bitmap entries:  24% (83/343)
Verifying bitmap entries:  25% (86/343)
Verifying bitmap entries:  26% (90/343)
Verifying bitmap entries:  27% (93/343)
Verifying bitmap entries:  28% (97/343)
Verifying bitmap entries:  29% (100/343)
Verifying bitmap entries:  30% (103/343)
Verifying bitmap entries:  31% (107/343)
Verifying bitmap entries:  32% (110/343)
Verifying bitmap entries:  33% (114/343)
Verifying bitmap entries:  34% (117/343)
Verifying bitmap entries:  35% (121/343)
Verifying bitmap entries:  36% (124/343)
Verifying bitmap entries:  37% (127/343)
Verifying bitmap entries:  38% (131/343)
Verifying bitmap entries:  39% (134/343)
Verifying bitmap entries:  40% (138/343)
Verifying bitmap entries:  41% (141/343)
Verifying bitmap entries:  42% (145/343)
Verifying bitmap entries:  43% (148/343)
Verifying bitmap entries:  44% (151/343)
Verifying bitmap entries:  45% (155/343)
Verifying bitmap entries:  46% (158/343)
Verifying bitmap entries:  47% (162/343)
Verifying bitmap entries:  48% (165/343)
Verifying bitmap entries:  49% (169/343)
Verifying bitmap entries:  50% (172/343)
Verifying bitmap entries:  51% (175/343)
Verifying bitmap entries:  52% (179/343)
Verifying bitmap entries:  53% (182/343)
Verifying bitmap entries:  54% (186/343)
Verifying bitmap entries:  55% (189/343)
Verifying bitmap entries:  56% (193/343)
Verifying bitmap entries:  57% (196/343)
Verifying bitmap entries:  58% (199/343)
Verifying bitmap entries:  59% (203/343)
Verifying bitmap entries:  60% (206/343)
Verifying bitmap entries:  61% (210/343)
Verifying bitmap entries:  62% (213/343)
Verifying bitmap entries:  63% (217/343)
Verifying bitmap entries:  64% (220/343)
Verifying bitmap entries:  65% (223/343)
Verifying bitmap entries:  66% (227/343)
Verifying bitmap entries:  67% (230/343)
Verifying bitmap entries:  68% (234/343)
Verifying bitmap entries:  69% (237/343)
Verifying bitmap entries:  70% (241/343)
Verifying bitmap entries:  71% (244/343)
Verifying bitmap entries:  72% (247/343)
Verifying bitmap entries:  73% (251/343)
Verifying bitmap entries:  74% (254/343)
Verifying bitmap entries:  75% (258/343)
Verifying bitmap entries:  76% (261/343)
Verifying bitmap entries:  77% (265/343)
Verifying bitmap entries:  78% (268/343)
Verifying bitmap entries:  79% (271/343)
Verifying bitmap entries:  80% (275/343)
Verifying bitmap entries:  81% (278/343)
Verifying bitmap entries:  82% (282/343)
Verifying bitmap entries:  83% (285/343)
Verifying bitmap entries:  84% (289/343)
Verifying bitmap entries:  85% (292/343)
Verifying bitmap entries:  86% (295/343)
Verifying bitmap entries:  87% (299/343)
Verifying bitmap entries:  88% (302/343)
Verifying bitmap entries:  89% (306/343)
Verifying bitmap entries:  90% (309/343)
Verifying bitmap entries:  91% (313/343)
Verifying bitmap entries:  92% (316/343)
Verifying bitmap entries:  93% (319/343)
Verifying bitmap entries:  94% (323/343)
Verifying bitmap entries:  95% (326/343)
Verifying bitmap entries:  96% (330/343)
Verifying bitmap entries:  97% (333/343)
Verifying bitmap entries:  98% (337/343)
Verifying bitmap entries:  99% (340/343)
Verifying bitmap entries: 100% (343/343)
Verifying bitmap entries: 100% (343/343), done.
 OK!
-{"event":"data","sid":"20260304T075923.446547Z-H8d819085-P000961a9","thread":"main","time":"2026-03-04T07:59:23.447622Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001255,"t_rel":0.001255,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021224.941996Z-H5c947e1c-P001ca8ac","thread":"main","time":"2025-01-30T02:12:24.943189Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001388,"t_rel":0.001388,"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': 
@@ -336659,8 +336660,8 @@
 Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / b399ece2 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
-{"event":"data","sid":"20260304T075923.446547Z-H8d819085-P000961a9","thread":"main","time":"2026-03-04T07:59:23.447622Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001255,"t_rel":0.001255,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260304T075930.774686Z-H8d819085-P00097bcf","thread":"main","time":"2026-03-04T07:59:30.775840Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001343,"t_rel":0.001343,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021224.941996Z-H5c947e1c-P001ca8ac","thread":"main","time":"2025-01-30T02:12:24.943189Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001388,"t_rel":0.001388,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021233.412277Z-H5c947e1c-P001cc000","thread":"main","time":"2025-01-30T02:12:33.413421Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001326,"t_rel":0.001326,"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': 
@@ -337679,19 +337680,19 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / e99a0c7c checksum
+Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / 24365dde checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
-{"event":"data","sid":"20260304T075923.446547Z-H8d819085-P000961a9","thread":"main","time":"2026-03-04T07:59:23.447622Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001255,"t_rel":0.001255,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260304T075930.774686Z-H8d819085-P00097bcf","thread":"main","time":"2026-03-04T07:59:30.775840Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001343,"t_rel":0.001343,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260304T075939.338779Z-H8d819085-P00099d73","thread":"main","time":"2026-03-04T07:59:39.339993Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001402,"t_rel":0.001402,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021224.941996Z-H5c947e1c-P001ca8ac","thread":"main","time":"2025-01-30T02:12:24.943189Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001388,"t_rel":0.001388,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021233.412277Z-H5c947e1c-P001cc000","thread":"main","time":"2025-01-30T02:12:33.413421Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001326,"t_rel":0.001326,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021244.156855Z-H5c947e1c-P001cdf2d","thread":"main","time":"2025-01-30T02:12:44.157995Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001325,"t_rel":0.001325,"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': 
 		git rev-list --test-bitmap HEAD~
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / e99a0c7c checksum
+Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / 24365dde checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
 ok 126 - rev-list --test-bitmap verifies bitmaps
@@ -338148,8 +338149,8 @@
 pack_report: pack_mapped              =      26910 /      26910
 ---------------------------------------------------------------------
 
---- before	2026-03-04 07:59:44.111352315 +0000
-+++ after	2026-03-04 07:59:44.283352315 +0000
+--- before	2025-01-30 02:12:49.536487731 +0000
++++ after	2025-01-30 02:12:49.700488715 +0000
 @@ -1 +1 @@
 -fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
 +ddf14642c6faca04471beee86e605bcbfd21396e
@@ -338274,8 +338275,8 @@
 pack_report: pack_mapped              =      26910 /      26910
 ---------------------------------------------------------------------
 
---- before	2026-03-04 07:59:45.319352315 +0000
-+++ after	2026-03-04 07:59:45.471352315 +0000
+--- before	2025-01-30 02:12:50.836495527 +0000
++++ after	2025-01-30 02:12:51.032496703 +0000
 @@ -1 +1 @@
 -fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
 +ddf14642c6faca04471beee86e605bcbfd21396e
@@ -338662,7 +338663,7 @@
 Found bitmap for 'db2803b34efd93d3448bc6cf028a889473ba3735'. 640 bits / 891eb351 checksum
 Verifying bitmap entries:   0% (1/343)
Verifying bitmap entries:   1% (4/343)
Verifying bitmap entries:   2% (7/343)
Verifying bitmap entries:   3% (11/343)
Verifying bitmap entries:   4% (14/343)
Verifying bitmap entries:   5% (18/343)
Verifying bitmap entries:   6% (21/343)
Verifying bitmap entries:   7% (25/343)
Verifying bitmap entries:   8% (28/343)
Verifying bitmap entries:   9% (31/343)
Verifying bitmap entries:  10% (35/343)
Verifying bitmap entries:  11% (38/343)
Verifying bitmap entries:  12% (42/343)
Verifying bitmap entries:  13% (45/343)
Verifying bitmap entries:  14% (49/343)
Verifying bitmap entries:  15% (52/343)
Verifying bitmap entries:  16% (55/343)
Verifying bitmap entries:  17% (59/343)
Verifying bitmap entries:  18% (62/343)
Verifying bitmap entries:  19% (66/343)
Verifying bitmap entries:  20% (69/343)
Verifying bitmap entries:  21% (73/343)
Verifying bitmap entries:  22% (76/343)
Verifying bitmap entries:  23% (79/343)
Verifying bitmap entries:  24% (83/343)
Verifying bitmap entries:  25% (86/343)
Verifying bitmap entries:  26% (90/343)
Verifying bitmap entries:  27% (93/343)
Verifying bitmap entries:  28% (97/343)
Verifying bitmap entries:  29% (100/343)
Verifying bitmap entries:  30% (103/343)
Verifying bitmap entries:  31% (107/343)
Verifying bitmap entries:  32% (110/343)
Verifying bitmap entries:  33% (114/343)
Verifying bitmap entries:  34% (117/343)
Verifying bitmap entries:  35% (121/343)
Verifying bitmap entries:  36% (124/343)
Verifying bitmap entries:  37% (127/343)
Verifying bitmap entries:  38% (131/343)
Verifying bitmap entries:  39% (134/343)
Verifying bitmap entries:  40% (138/343)
Verifying bitmap entries:  41% (141/343)
Verifying bitmap entries:  42% (145/343)
Verifying bitmap entries:  43% (148/343)
Verifying bitmap entries:  44% (151/343)
Verifying bitmap entries:  45% (155/343)
Verifying bitmap entries:  46% (158/343)
Verifying bitmap entries:  47% (162/343)
Verifying bitmap entries:  48% (165/343)
Verifying bitmap entries:  49% (169/343)
Verifying bitmap entries:  50% (172/343)
Verifying bitmap entries:  51% (175/343)
Verifying bitmap entries:  52% (179/343)
Verifying bitmap entries:  53% (182/343)
Verifying bitmap entries:  54% (186/343)
Verifying bitmap entries:  55% (189/343)
Verifying bitmap entries:  56% (193/343)
Verifying bitmap entries:  57% (196/343)
Verifying bitmap entries:  58% (199/343)
Verifying bitmap entries:  59% (203/343)
Verifying bitmap entries:  60% (206/343)
Verifying bitmap entries:  61% (210/343)
Verifying bitmap entries:  62% (213/343)
Verifying bitmap entries:  63% (217/343)
Verifying bitmap entries:  64% (220/343)
Verifying bitmap entries:  65% (223/343)
Verifying bitmap entries:  66% (227/343)
Verifying bitmap entries:  67% (230/343)
Verifying bitmap entries:  68% (234/343)
Verifying bitmap entries:  69% (237/343)
Verifying bitmap entries:  70% (241/343)
Verifying bitmap entries:  71% (244/343)
Verifying bitmap entries:  72% (247/343)
Verifying bitmap entries:  73% (251/343)
Verifying bitmap entries:  74% (254/343)
Verifying bitmap entries:  75% (258/343)
Verifying bitmap entries:  76% (261/343)
Verifying bitmap entries:  77% (265/343)
Verifying bitmap entries:  78% (268/343)
Verifying bitmap entries:  79% (271/343)
Verifying bitmap entries:  80% (275/343)
Verifying bitmap entries:  81% (278/343)
Verifying bitmap entries:  82% (282/343)
Verifying bitmap entries:  83% (285/343)
Verifying bitmap entries:  84% (289/343)
Verifying bitmap entries:  85% (292/343)
Verifying bitmap entries:  86% (295/343)
Verifying bitmap entries:  87% (299/343)
Verifying bitmap entries:  88% (302/343)
Verifying bitmap entries:  89% (306/343)
Verifying bitmap entries:  90% (309/343)
Verifying bitmap entries:  91% (313/343)
Verifying bitmap entries:  92% (316/343)
Verifying bitmap entries:  93% (319/343)
Verifying bitmap entries:  94% (323/343)
Verifying bitmap entries:  95% (326/343)
Verifying bitmap entries:  96% (330/343)
Verifying bitmap entries:  97% (333/343)
Verifying bitmap entries:  98% (337/343)
Verifying bitmap entries:  99% (340/343)
Verifying bitmap entries: 100% (343/343)
Verifying bitmap entries: 100% (343/343), done.
 OK!
-{"event":"data","sid":"20260304T075948.746683Z-H8d819085-P0009c523","thread":"main","time":"2026-03-04T07:59:48.747787Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001294,"t_rel":0.001294,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021254.938199Z-H5c947e1c-P001d007a","thread":"main","time":"2025-01-30T02:12:54.939231Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001229,"t_rel":0.001229,"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': 
@@ -339157,18 +339158,18 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / b16764fa checksum
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / da6c1e68 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
-{"event":"data","sid":"20260304T075948.746683Z-H8d819085-P0009c523","thread":"main","time":"2026-03-04T07:59:48.747787Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001294,"t_rel":0.001294,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260304T075955.944514Z-H8d819085-P0009e2e8","thread":"main","time":"2026-03-04T07:59:55.945811Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001492,"t_rel":0.001492,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021254.938199Z-H5c947e1c-P001d007a","thread":"main","time":"2025-01-30T02:12:54.939231Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001229,"t_rel":0.001229,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021303.101420Z-H5c947e1c-P001d191f","thread":"main","time":"2025-01-30T02:13:03.102533Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001308,"t_rel":0.001308,"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)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / b16764fa checksum
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / da6c1e68 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
 ok 224 - rev-list --test-bitmap verifies bitmaps
@@ -340180,19 +340181,19 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / e99a0c7c checksum
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
-{"event":"data","sid":"20260304T075948.746683Z-H8d819085-P0009c523","thread":"main","time":"2026-03-04T07:59:48.747787Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001294,"t_rel":0.001294,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260304T075955.944514Z-H8d819085-P0009e2e8","thread":"main","time":"2026-03-04T07:59:55.945811Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001492,"t_rel":0.001492,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260304T080004.274959Z-H8d819085-P000a0616","thread":"main","time":"2026-03-04T08:00:04.276136Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001362,"t_rel":0.001362,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021254.938199Z-H5c947e1c-P001d007a","thread":"main","time":"2025-01-30T02:12:54.939231Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001229,"t_rel":0.001229,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021303.101420Z-H5c947e1c-P001d191f","thread":"main","time":"2025-01-30T02:13:03.102533Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001308,"t_rel":0.001308,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250130T021313.818159Z-H5c947e1c-P001d3952","thread":"main","time":"2025-01-30T02:13:13.827381Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.009405,"t_rel":0.009405,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
 ok 299 - reverse index exists (midx)
 
 expecting success of 5326.300 'rev-list --test-bitmap verifies bitmaps': 
 		git rev-list --test-bitmap HEAD~
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / e99a0c7c checksum
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
 ok 300 - rev-list --test-bitmap verifies bitmaps
@@ -340649,8 +340650,8 @@
 pack_report: pack_mapped              =      26907 /      26907
 ---------------------------------------------------------------------
 
---- before	2026-03-04 08:00:08.723352315 +0000
-+++ after	2026-03-04 08:00:08.831352315 +0000
+--- before	2025-01-30 02:13:19.572667862 +0000
++++ after	2025-01-30 02:13:19.772669061 +0000
 @@ -1 +1 @@
 -a09427aadc45553b705d3a726a24ceeaa43874f0
 +e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
@@ -340775,8 +340776,8 @@
 pack_report: pack_mapped              =      26907 /      26907
 ---------------------------------------------------------------------
 
---- before	2026-03-04 08:00:09.795352315 +0000
-+++ after	2026-03-04 08:00:09.939352315 +0000
+--- before	2025-01-30 02:13:21.096677002 +0000
++++ after	2025-01-30 02:13:21.288678153 +0000
 @@ -1 +1 @@
 -a09427aadc45553b705d3a726a24ceeaa43874f0
 +e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
@@ -340899,8 +340900,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"region_enter","sid":"20260304T080011.062566Z-H8d819085-P000a2412","thread":"main","time":"2026-03-04T08:00:11.064876Z","file":"pack-bitmap-write.c","line":951,"repo":1,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-{"event":"region_leave","sid":"20260304T080011.062566Z-H8d819085-P000a2412","thread":"main","time":"2026-03-04T08:00:11.064881Z","file":"pack-bitmap-write.c","line":978,"repo":1,"t_rel":0.000006,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_enter","sid":"20250130T021322.918101Z-H5c947e1c-P001d534c","thread":"main","time":"2025-01-30T02:13:22.932361Z","file":"pack-bitmap-write.c","line":951,"repo":1,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_leave","sid":"20250130T021322.918101Z-H5c947e1c-P001d534c","thread":"main","time":"2025-01-30T02:13:22.932366Z","file":"pack-bitmap-write.c","line":978,"repo":1,"t_rel":0.000005,"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': 
@@ -341138,7 +341139,7 @@
 pack_report: pack_used_ctr            =         16
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      91159 /      91159
+pack_report: pack_mapped              =      85343 /      85343
 ---------------------------------------------------------------------
 
 Nothing new to pack.
@@ -341146,23 +341147,23 @@
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
 5+0 records in
 5+0 records out
-5 bytes copied, 0.00710744 s, 0.7 kB/s
+5 bytes copied, 0.00176461 s, 2.8 kB/s
 dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/pack-4595473e30c87f3d64ec0c76633d5bb559c6b980.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/pack-25e47c371296ea4c8e4c670a17f84a1015182dfe.bitmap' has invalid checksum
 5+0 records in
 5+0 records out
-5 bytes copied, 3.856e-05 s, 130 kB/s
+5 bytes copied, 3.62e-05 s, 138 kB/s
 dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/multi-pack-index-59858ddc285b8436ebdeb9718ae414300e5b44d4.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/multi-pack-index-aed46f12d106dd41357ea51a3097818eed72d6b9.bitmap' has invalid checksum
 5+0 records in
 5+0 records out
-5 bytes copied, 3.96e-05 s, 126 kB/s
+5 bytes copied, 0.00669752 s, 0.7 kB/s
 dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/multi-pack-index-59858ddc285b8436ebdeb9718ae414300e5b44d4.bitmap' has invalid checksum
-error: bitmap file '.git/objects/pack/pack-4595473e30c87f3d64ec0c76633d5bb559c6b980.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/multi-pack-index-aed46f12d106dd41357ea51a3097818eed72d6b9.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/pack-25e47c371296ea4c8e4c670a17f84a1015182dfe.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': 
@@ -341411,615 +341412,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5528-push-default.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5528-push-default/.git/
-expecting success of 5528.1 'setup bare remotes': 
-	git init --bare repo1 &&
-	git remote add parent1 repo1 &&
-	git init --bare repo2 &&
-	git remote add parent2 repo2 &&
-	test_commit one &&
-	git push parent1 HEAD &&
-	git push parent2 HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5528-push-default/repo1/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5528-push-default/repo2/
-[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 -> main
-To repo2
- * [new branch]      HEAD -> main
-ok 1 - setup bare remotes
-
-expecting success of 5528.2 '"upstream" pushes to configured upstream': 
-	git checkout main &&
-	test_config branch.main.remote parent1 &&
-	test_config branch.main.merge refs/heads/foo &&
-	test_commit two &&
-	test_push_success upstream foo
-
-Already on 'main'
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-To repo1
- * [new branch]      main -> foo
-ok 2 - "upstream" pushes to configured upstream
-
-expecting success of 5528.3 '"upstream" does not push on unconfigured remote': 
-	git checkout main &&
-	test_unconfig branch.main.remote &&
-	test_commit three &&
-	test_push_failure upstream
-
-Already on 'main'
-[main 7c7cd71] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-ok 3 - "upstream" does not push on unconfigured remote
-
-expecting success of 5528.4 '"upstream" does not push on unconfigured branch': 
-	git checkout main &&
-	test_config branch.main.remote parent1 &&
-	test_unconfig branch.main.merge &&
-	test_commit four &&
-	test_push_failure upstream
-
-Already on 'main'
-[main fd8d77e] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-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 parent1 main
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-ok 4 - "upstream" does not push on unconfigured branch
-
-expecting success of 5528.5 '"upstream" does not push when remotes do not match': 
-	git checkout main &&
-	test_config branch.main.remote parent1 &&
-	test_config branch.main.merge refs/heads/foo &&
-	test_config push.default upstream &&
-	test_commit five &&
-	test_must_fail git push parent2
-
-Already on 'main'
-[main a383792] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-fatal: You are pushing to remote 'parent2', which is not the upstream of
-your current branch 'main', without telling me what to push
-to update which remote branch.
-ok 5 - "upstream" does not push when remotes do not match
-
-expecting success of 5528.6 '"current" does not push when multiple remotes and none origin': 
-	git checkout main &&
-	test_config push.default current &&
-	test_commit current-multi &&
-	test_must_fail git push
-
-Already on 'main'
-[main 4ca23d4] current-multi
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 current-multi.t
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-ok 6 - "current" does not push when multiple remotes and none origin
-
-expecting success of 5528.7 '"current" pushes when remote explicitly specified': 
-	git checkout main &&
-	test_config push.default current &&
-	test_commit current-specified &&
-	git push parent1
-
-Already on 'main'
-[main 400b0d2] current-specified
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 current-specified.t
-To repo1
-   d79ce16..400b0d2  main -> main
-ok 7 - "current" pushes when remote explicitly specified
-
-expecting success of 5528.8 '"current" pushes to origin when no remote specified among multiple': 
-	git checkout main &&
-	test_config remote.origin.url repo1 &&
-	test_config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
-	test_commit current-origin &&
-	test_push_success current main
-
-Already on 'main'
-[main 7eb4f8b] current-origin
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 current-origin.t
-To repo1
-   400b0d2..7eb4f8b  main -> main
-ok 8 - "current" pushes to origin when no remote specified among multiple
-
-expecting success of 5528.9 '"current" pushes to single remote even when not specified': 
-	git checkout main &&
-	test_when_finished git remote add parent1 repo1 &&
-	git remote remove parent1 &&
-	test_commit current-implied &&
-	test_push_success current main repo2
-
-Already on 'main'
-[main ac06b97] current-implied
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 current-implied.t
-To repo2
-   d79ce16..ac06b97  main -> main
-ok 9 - "current" pushes to single remote even when not specified
-
-expecting success of 5528.10 'push from/to new branch with non-defaulted remote fails with upstream, matching, current and simple ': 
-	git checkout -b new-branch &&
-	test_push_failure simple &&
-	test_push_failure matching &&
-	test_push_failure upstream &&
-	test_push_failure current
-
-Switched to a new branch 'new-branch'
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-ok 10 - push from/to new branch with non-defaulted remote fails with upstream, matching, current and simple 
-
-expecting success of 5528.11 'push from/to new branch fails with upstream and simple ': 
-	git checkout -b new-branch-1 &&
-	test_config branch.new-branch-1.remote parent1 &&
-	test_push_failure simple &&
-	test_push_failure upstream
-
-Switched to a new branch 'new-branch-1'
-fatal: The current branch new-branch-1 has no upstream branch.
-To push the current branch and set the remote as upstream, use
-
-    git push --set-upstream parent1 new-branch-1
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-fatal: The current branch new-branch-1 has no upstream branch.
-To push the current branch and set the remote as upstream, use
-
-    git push --set-upstream parent1 new-branch-1
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-ok 11 - push from/to new branch fails with upstream and simple 
-
-checking known breakage of 5528.12 'push from/to new branch fails with matching ': 
-	git checkout -b new-branch-2 &&
-	test_config branch.new-branch-2.remote parent1 &&
-	test_push_failure matching
-
-Switched to a new branch 'new-branch-2'
-To repo1
-   7eb4f8b..ac06b97  main -> main
-test_must_fail: command succeeded: git -c push.default=matching push
-not ok 12 - push from/to new branch fails with matching  # TODO known breakage
-
-expecting success of 5528.13 'push from/to branch with tracking fails with nothing ': 
-	git checkout -b tracked-branch &&
-	test_config branch.tracked-branch.remote parent1 &&
-	test_config branch.tracked-branch.merge refs/heads/tracked-branch &&
-	test_push_failure nothing
-
-Switched to a new branch 'tracked-branch'
-fatal: You didn't specify any refspecs to push, and push.default is "nothing".
-ok 13 - push from/to branch with tracking fails with nothing 
-
-expecting success of 5528.14 'push from/to new branch succeeds with upstream if push.autoSetupRemote': 
-	git checkout -b new-branch-a &&
-	test_config push.autoSetupRemote true &&
-	test_config branch.new-branch-a.remote parent1 &&
-	test_push_success upstream new-branch-a
-
-Switched to a new branch 'new-branch-a'
-To repo1
- * [new branch]      new-branch-a -> new-branch-a
-branch 'new-branch-a' set up to track 'parent1/new-branch-a'.
-ok 14 - push from/to new branch succeeds with upstream if push.autoSetupRemote
-
-expecting success of 5528.15 'push from/to new branch succeeds with simple if push.autoSetupRemote': 
-	git checkout -b new-branch-c &&
-	test_config push.autoSetupRemote true &&
-	test_config branch.new-branch-c.remote parent1 &&
-	test_push_success simple new-branch-c
-
-Switched to a new branch 'new-branch-c'
-To repo1
- * [new branch]      new-branch-c -> new-branch-c
-branch 'new-branch-c' set up to track 'parent1/new-branch-c'.
-ok 15 - push from/to new branch succeeds with simple if push.autoSetupRemote
-
-expecting success of 5528.16 '"matching" fails if none match': 
-	git init --bare empty &&
-	test_must_fail git push empty : 2>actual &&
-	test_grep "Perhaps you should specify a branch" actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5528-push-default/empty/
-Perhaps you should specify a branch.
-ok 16 - "matching" fails if none match
-
-expecting success of 5528.17 'push ambiguously named branch with upstream, matching and simple': 
-	git checkout -b ambiguous &&
-	test_config branch.ambiguous.remote parent1 &&
-	test_config branch.ambiguous.merge refs/heads/ambiguous &&
-	git tag ambiguous &&
-	test_push_success simple ambiguous &&
-	test_push_success matching ambiguous &&
-	test_push_success upstream ambiguous
-
-Switched to a new branch 'ambiguous'
-To repo1
- * [new branch]      ambiguous -> ambiguous
-Everything up-to-date
-Everything up-to-date
-ok 17 - push ambiguously named branch with upstream, matching and simple
-
-expecting success of 5528.18 'push from/to new branch with current creates remote branch': 
-	test_config branch.new-branch.remote repo1 &&
-	git checkout new-branch &&
-	test_push_success current new-branch
-
-Switched to branch 'new-branch'
-To repo1
- * [new branch]      new-branch -> new-branch
-ok 18 - push from/to new branch with current creates remote branch
-
-expecting success of 5528.19 'push to existing branch, with no upstream configured': 
-	test_config branch.main.remote repo1 &&
-	git checkout main &&
-	test_push_failure simple &&
-	test_push_failure upstream
-
-Switched to branch 'main'
-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 repo1 main
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-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 repo1 main
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-ok 19 - push to existing branch, with no upstream configured
-
-expecting success of 5528.20 'push to existing branch, upstream configured with same name': 
-	test_config branch.main.remote repo1 &&
-	test_config branch.main.merge refs/heads/main &&
-	git checkout main &&
-	test_commit six &&
-	test_push_success upstream main &&
-	test_commit seven &&
-	test_push_success simple main
-
-Already on 'main'
-[main 09c26db] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-To repo1
-   ac06b97..09c26db  main -> main
-[main 5990f7c] seven
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 seven.t
-To repo1
-   09c26db..5990f7c  main -> main
-ok 20 - push to existing branch, upstream configured with same name
-
-expecting success of 5528.21 'push to existing branch, upstream configured with different name': 
-	test_config branch.main.remote repo1 &&
-	test_config branch.main.merge refs/heads/other-name &&
-	git checkout main &&
-	test_commit eight &&
-	test_push_success upstream other-name &&
-	test_commit nine &&
-	test_push_failure simple &&
-	git --git-dir=repo1 log -1 --format="%h %s" "other-name" >expect-other-name &&
-	test_push_success current main &&
-	git --git-dir=repo1 log -1 --format="%h %s" "other-name" >actual-other-name &&
-	test_cmp expect-other-name actual-other-name
-
-Already on 'main'
-[main ce5228b] eight
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 eight.t
-To repo1
- * [new branch]      main -> other-name
-[main a4fa18b] nine
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nine.t
-fatal: The upstream branch of your current branch does not match
-the name of your current branch.  To push to the upstream branch
-on the remote, use
-
-    git push repo1 HEAD:other-name
-
-To push to the branch of the same name on the remote, use
-
-    git push repo1 HEAD
-
-To avoid automatically configuring an upstream branch when its name
-won't match the local branch, see option 'simple' of branch.autoSetupMerge
-in 'git help config'.
-
-To repo1
-   5990f7c..a4fa18b  main -> main
-ok 21 - push to existing branch, upstream configured with different name
-
-expecting success of 5528.22 'push.default = current success in central workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-current &&
-		test_push_success current main 
-	
-[main 9a2e3d7] commit-for-current
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-current.t
-To repo1
-   a4fa18b..9a2e3d7  main -> main
-ok 22 - push.default = current success in central workflows
-
-expecting success of 5528.23 'push.default = upstream success in central workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-upstream &&
-		test_push_success upstream foo 
-	
-[main 62006a2] commit-for-upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-upstream.t
-To repo1
-   139b20d..62006a2  main -> foo
-ok 23 - push.default = upstream success in central workflows
-
-expecting success of 5528.24 'push.default = simple failure in central workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-simple &&
-		test_push_failure simple main 
-	
-[main 1552b1b] commit-for-simple
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-simple.t
-fatal: The upstream branch of your current branch does not match
-the name of your current branch.  To push to the upstream branch
-on the remote, use
-
-    git push parent1 HEAD:foo
-
-To push to the branch of the same name on the remote, use
-
-    git push parent1 HEAD
-
-To avoid automatically configuring an upstream branch when its name
-won't match the local branch, see option 'simple' of branch.autoSetupMerge
-in 'git help config'.
-
-ok 24 - push.default = simple failure in central workflows
-
-expecting success of 5528.25 'push.default = matching success in central workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-matching &&
-		test_push_success matching main 
-	
-[main 75f04d7] commit-for-matching
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-matching.t
-To repo1
-   9a2e3d7..75f04d7  main -> main
-ok 25 - push.default = matching success in central workflows
-
-expecting success of 5528.26 'push.default = current success in triangular workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-current-triangular &&
-		test_push_success current main repo2
-	
-[main 533b416] commit-for-current-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-current-triangular.t
-To repo2
-   ac06b97..533b416  main -> main
-ok 26 - push.default = current success in triangular workflows
-
-expecting success of 5528.27 'push.default = upstream failure in triangular workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-upstream-triangular &&
-		test_push_failure upstream foo repo2
-	
-[main c0923f2] commit-for-upstream-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-upstream-triangular.t
-fatal: You are pushing to remote 'parent2', which is not the upstream of
-your current branch 'main', without telling me what to push
-to update which remote branch.
-ok 27 - push.default = upstream failure in triangular workflows
-
-expecting success of 5528.28 'push.default = simple success in triangular workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-simple-triangular &&
-		test_push_success simple main repo2
-	
-[main 1e888ee] commit-for-simple-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-simple-triangular.t
-To repo2
-   533b416..1e888ee  main -> main
-ok 28 - push.default = simple success in triangular workflows
-
-expecting success of 5528.29 'push.default = matching success in triangular workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-matching-triangular &&
-		test_push_success matching main repo2
-	
-[main d27b2db] commit-for-matching-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-matching-triangular.t
-To repo2
-   1e888ee..d27b2db  main -> main
-ok 29 - push.default = matching success in triangular workflows
-
-expecting success of 5528.30 'default behavior allows "simple" push': 
-	test_config branch.main.remote parent1 &&
-	test_config branch.main.merge refs/heads/main &&
-	test_config remote.pushdefault parent1 &&
-	test_commit default-main-main &&
-	test_push_success "" main
-
-[main d645001] default-main-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default-main-main.t
-To repo1
-   75f04d7..d645001  main -> main
-ok 30 - default behavior allows "simple" push
-
-expecting success of 5528.31 'default behavior rejects non-simple push': 
-	test_config branch.main.remote parent1 &&
-	test_config branch.main.merge refs/heads/foo &&
-	test_config remote.pushdefault parent1 &&
-	test_commit default-main-foo &&
-	test_push_failure ""
-
-[main 4b5e552] default-main-foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default-main-foo.t
-fatal: The upstream branch of your current branch does not match
-the name of your current branch.  To push to the upstream branch
-on the remote, use
-
-    git push parent1 HEAD:foo
-
-To push to the branch of the same name on the remote, use
-
-    git push parent1 HEAD
-
-To choose either option permanently, see push.default in 'git help config'.
-
-To avoid automatically configuring an upstream branch when its name
-won't match the local branch, see option 'simple' of branch.autoSetupMerge
-in 'git help config'.
-
-ok 31 - default behavior rejects non-simple push
-
-expecting success of 5528.32 'default triangular behavior acts like "current"': 
-	test_config branch.main.remote parent1 &&
-	test_config branch.main.merge refs/heads/foo &&
-	test_config remote.pushdefault parent2 &&
-	test_commit default-triangular &&
-	test_push_success "" main repo2
-
-[main daf1bc1] default-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default-triangular.t
-To repo2
-   d27b2db..daf1bc1  main -> main
-ok 32 - default triangular behavior acts like "current"
-
-# still have 1 known breakage(s)
-# passed all remaining 31 test(s)
-1..32
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5411-proc-receive-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5411-proc-receive-hook/.git/
 expecting success of 5411.1 'setup upstream and workbench': 
@@ -345394,156 +344786,780 @@
 1..178
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5539-fetch-http-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5539-fetch-http-shallow/.git/
-checking prerequisite: NOT_ROOT
+*** t5528-push-default.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5528-push-default/.git/
+expecting success of 5528.1 'setup bare remotes': 
+	git init --bare repo1 &&
+	git remote add parent1 repo1 &&
+	git init --bare repo2 &&
+	git remote add parent2 repo2 &&
+	test_commit one &&
+	git push parent1 HEAD &&
+	git push parent2 HEAD
 
-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.47.2/t/trash directory.t5528-push-default/repo1/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5528-push-default/repo2/
+[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 -> main
+To repo2
+ * [new branch]      HEAD -> main
+ok 1 - setup bare remotes
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5520-pull.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/.git/
-expecting success of 5520.1 'setup': 
-	echo file >file &&
-	git add file &&
-	git commit -a -m original
+expecting success of 5528.2 '"upstream" pushes to configured upstream': 
+	git checkout main &&
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/foo &&
+	test_commit two &&
+	test_push_success upstream foo
 
-[main (root-commit) 2cbe290] original
+Already on 'main'
+[main 139b20d] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 5520.2 'pulling into void': 
-	git init cloned &&
-	(
-		cd cloned &&
-		git pull ..
-	) &&
-	test_path_is_file file &&
-	test_path_is_file cloned/file &&
-	test_cmp file cloned/file
+ create mode 100644 two.t
+To repo1
+ * [new branch]      main -> foo
+ok 2 - "upstream" pushes to configured upstream
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned/.git/
-From ..
- * branch            HEAD       -> FETCH_HEAD
-ok 2 - pulling into void
+expecting success of 5528.3 '"upstream" does not push on unconfigured remote': 
+	git checkout main &&
+	test_unconfig branch.main.remote &&
+	test_commit three &&
+	test_push_failure upstream
 
-expecting success of 5520.3 'pulling into void using main:main': 
-	git init cloned-uho &&
-	(
-		cd cloned-uho &&
-		git pull .. main:main
-	) &&
-	test_path_is_file file &&
-	test_path_is_file cloned-uho/file &&
-	test_cmp file cloned-uho/file
+Already on 'main'
+[main 7c7cd71] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned-uho/.git/
-From ..
- * [new branch]      main       -> main
-ok 3 - pulling into void using main:main
+    git remote add <name> <url>
 
-expecting success of 5520.4 'pulling into void does not overwrite untracked files': 
-	git init cloned-untracked &&
-	(
-		cd cloned-untracked &&
-		echo untracked >file &&
-		test_must_fail git pull .. main &&
-		echo untracked >expect &&
-		test_cmp expect file
-	)
+and then push using the remote name
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned-untracked/.git/
-From ..
- * branch            main       -> FETCH_HEAD
-error: The following untracked working tree files would be overwritten by merge:
-	file
-Please move or remove them before you merge.
-Aborting
-ok 4 - pulling into void does not overwrite untracked files
+    git push <name>
 
-expecting success of 5520.5 'pulling into void does not overwrite staged files': 
-	git init cloned-staged-colliding &&
-	(
-		cd cloned-staged-colliding &&
-		echo "alternate content" >file &&
-		git add file &&
-		test_must_fail git pull .. main &&
-		echo "alternate content" >expect &&
-		test_cmp expect file &&
-		git cat-file blob :file >file.index &&
-		test_cmp expect file.index
-	)
+ok 3 - "upstream" does not push on unconfigured remote
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned-staged-colliding/.git/
-From ..
- * branch            main       -> FETCH_HEAD
-error: Your local changes to the following files would be overwritten by merge:
-	file
-Please commit your changes or stash them before you merge.
-Aborting
-ok 5 - pulling into void does not overwrite staged files
+expecting success of 5528.4 '"upstream" does not push on unconfigured branch': 
+	git checkout main &&
+	test_config branch.main.remote parent1 &&
+	test_unconfig branch.main.merge &&
+	test_commit four &&
+	test_push_failure upstream
 
-expecting success of 5520.6 'pulling into void does not remove new staged files': 
-	git init cloned-staged-new &&
-	(
-		cd cloned-staged-new &&
-		echo "new tracked file" >newfile &&
-		git add newfile &&
-		git pull .. main &&
-		echo "new tracked file" >expect &&
-		test_cmp expect newfile &&
-		git cat-file blob :newfile >newfile.index &&
-		test_cmp expect newfile.index
-	)
+Already on 'main'
+[main fd8d77e] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+fatal: The current branch main has no upstream branch.
+To push the current branch and set the remote as upstream, use
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned-staged-new/.git/
-From ..
- * branch            main       -> FETCH_HEAD
-ok 6 - pulling into void does not remove new staged files
+    git push --set-upstream parent1 main
 
-expecting success of 5520.7 'pulling into void must not create an octopus': 
-	git init cloned-octopus &&
-	(
-		cd cloned-octopus &&
-		test_must_fail git pull .. main main &&
-		test_path_is_missing file
-	)
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned-octopus/.git/
-From ..
- * branch            main       -> FETCH_HEAD
- * branch            main       -> FETCH_HEAD
-fatal: Cannot merge multiple branches into empty head.
-ok 7 - pulling into void must not create an octopus
+ok 4 - "upstream" does not push on unconfigured branch
 
-expecting success of 5520.8 'test . as a remote': 
-	git branch copy main &&
-	git config branch.copy.remote . &&
-	git config branch.copy.merge refs/heads/main &&
-	echo updated >file &&
-	git commit -a -m updated &&
-	git checkout copy &&
-	echo file >expect &&
-	test_cmp expect file &&
-	git pull &&
-	echo updated >expect &&
-	test_cmp expect file &&
-	git reflog -1 >reflog.actual &&
-	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
-	echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
-	test_cmp reflog.expected reflog.fuzzy
+expecting success of 5528.5 '"upstream" does not push when remotes do not match': 
+	git checkout main &&
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/foo &&
+	test_config push.default upstream &&
+	test_commit five &&
+	test_must_fail git push parent2
 
-[main 732015b] updated
+Already on 'main'
+[main a383792] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+fatal: You are pushing to remote 'parent2', which is not the upstream of
+your current branch 'main', without telling me what to push
+to update which remote branch.
+ok 5 - "upstream" does not push when remotes do not match
+
+expecting success of 5528.6 '"current" does not push when multiple remotes and none origin': 
+	git checkout main &&
+	test_config push.default current &&
+	test_commit current-multi &&
+	test_must_fail git push
+
+Already on 'main'
+[main 4ca23d4] current-multi
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 current-multi.t
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
+
+    git remote add <name> <url>
+
+and then push using the remote name
+
+    git push <name>
+
+ok 6 - "current" does not push when multiple remotes and none origin
+
+expecting success of 5528.7 '"current" pushes when remote explicitly specified': 
+	git checkout main &&
+	test_config push.default current &&
+	test_commit current-specified &&
+	git push parent1
+
+Already on 'main'
+[main 400b0d2] current-specified
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 current-specified.t
+To repo1
+   d79ce16..400b0d2  main -> main
+ok 7 - "current" pushes when remote explicitly specified
+
+expecting success of 5528.8 '"current" pushes to origin when no remote specified among multiple': 
+	git checkout main &&
+	test_config remote.origin.url repo1 &&
+	test_config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
+	test_commit current-origin &&
+	test_push_success current main
+
+Already on 'main'
+[main 7eb4f8b] current-origin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 current-origin.t
+To repo1
+   400b0d2..7eb4f8b  main -> main
+ok 8 - "current" pushes to origin when no remote specified among multiple
+
+expecting success of 5528.9 '"current" pushes to single remote even when not specified': 
+	git checkout main &&
+	test_when_finished git remote add parent1 repo1 &&
+	git remote remove parent1 &&
+	test_commit current-implied &&
+	test_push_success current main repo2
+
+Already on 'main'
+[main ac06b97] current-implied
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 current-implied.t
+To repo2
+   d79ce16..ac06b97  main -> main
+ok 9 - "current" pushes to single remote even when not specified
+
+expecting success of 5528.10 'push from/to new branch with non-defaulted remote fails with upstream, matching, current and simple ': 
+	git checkout -b new-branch &&
+	test_push_failure simple &&
+	test_push_failure matching &&
+	test_push_failure upstream &&
+	test_push_failure current
+
+Switched to a new branch 'new-branch'
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
+
+    git remote add <name> <url>
+
+and then push using the remote name
+
+    git push <name>
+
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
+
+    git remote add <name> <url>
+
+and then push using the remote name
+
+    git push <name>
+
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
+
+    git remote add <name> <url>
+
+and then push using the remote name
+
+    git push <name>
+
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
+
+    git remote add <name> <url>
+
+and then push using the remote name
+
+    git push <name>
+
+ok 10 - push from/to new branch with non-defaulted remote fails with upstream, matching, current and simple 
+
+expecting success of 5528.11 'push from/to new branch fails with upstream and simple ': 
+	git checkout -b new-branch-1 &&
+	test_config branch.new-branch-1.remote parent1 &&
+	test_push_failure simple &&
+	test_push_failure upstream
+
+Switched to a new branch 'new-branch-1'
+fatal: The current branch new-branch-1 has no upstream branch.
+To push the current branch and set the remote as upstream, use
+
+    git push --set-upstream parent1 new-branch-1
+
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
+
+fatal: The current branch new-branch-1 has no upstream branch.
+To push the current branch and set the remote as upstream, use
+
+    git push --set-upstream parent1 new-branch-1
+
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
+
+ok 11 - push from/to new branch fails with upstream and simple 
+
+checking known breakage of 5528.12 'push from/to new branch fails with matching ': 
+	git checkout -b new-branch-2 &&
+	test_config branch.new-branch-2.remote parent1 &&
+	test_push_failure matching
+
+Switched to a new branch 'new-branch-2'
+To repo1
+   7eb4f8b..ac06b97  main -> main
+test_must_fail: command succeeded: git -c push.default=matching push
+not ok 12 - push from/to new branch fails with matching  # TODO known breakage
+
+expecting success of 5528.13 'push from/to branch with tracking fails with nothing ': 
+	git checkout -b tracked-branch &&
+	test_config branch.tracked-branch.remote parent1 &&
+	test_config branch.tracked-branch.merge refs/heads/tracked-branch &&
+	test_push_failure nothing
+
+Switched to a new branch 'tracked-branch'
+fatal: You didn't specify any refspecs to push, and push.default is "nothing".
+ok 13 - push from/to branch with tracking fails with nothing 
+
+expecting success of 5528.14 'push from/to new branch succeeds with upstream if push.autoSetupRemote': 
+	git checkout -b new-branch-a &&
+	test_config push.autoSetupRemote true &&
+	test_config branch.new-branch-a.remote parent1 &&
+	test_push_success upstream new-branch-a
+
+Switched to a new branch 'new-branch-a'
+To repo1
+ * [new branch]      new-branch-a -> new-branch-a
+branch 'new-branch-a' set up to track 'parent1/new-branch-a'.
+ok 14 - push from/to new branch succeeds with upstream if push.autoSetupRemote
+
+expecting success of 5528.15 'push from/to new branch succeeds with simple if push.autoSetupRemote': 
+	git checkout -b new-branch-c &&
+	test_config push.autoSetupRemote true &&
+	test_config branch.new-branch-c.remote parent1 &&
+	test_push_success simple new-branch-c
+
+Switched to a new branch 'new-branch-c'
+To repo1
+ * [new branch]      new-branch-c -> new-branch-c
+branch 'new-branch-c' set up to track 'parent1/new-branch-c'.
+ok 15 - push from/to new branch succeeds with simple if push.autoSetupRemote
+
+expecting success of 5528.16 '"matching" fails if none match': 
+	git init --bare empty &&
+	test_must_fail git push empty : 2>actual &&
+	test_grep "Perhaps you should specify a branch" actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5528-push-default/empty/
+Perhaps you should specify a branch.
+ok 16 - "matching" fails if none match
+
+expecting success of 5528.17 'push ambiguously named branch with upstream, matching and simple': 
+	git checkout -b ambiguous &&
+	test_config branch.ambiguous.remote parent1 &&
+	test_config branch.ambiguous.merge refs/heads/ambiguous &&
+	git tag ambiguous &&
+	test_push_success simple ambiguous &&
+	test_push_success matching ambiguous &&
+	test_push_success upstream ambiguous
+
+Switched to a new branch 'ambiguous'
+To repo1
+ * [new branch]      ambiguous -> ambiguous
+Everything up-to-date
+Everything up-to-date
+ok 17 - push ambiguously named branch with upstream, matching and simple
+
+expecting success of 5528.18 'push from/to new branch with current creates remote branch': 
+	test_config branch.new-branch.remote repo1 &&
+	git checkout new-branch &&
+	test_push_success current new-branch
+
+Switched to branch 'new-branch'
+To repo1
+ * [new branch]      new-branch -> new-branch
+ok 18 - push from/to new branch with current creates remote branch
+
+expecting success of 5528.19 'push to existing branch, with no upstream configured': 
+	test_config branch.main.remote repo1 &&
+	git checkout main &&
+	test_push_failure simple &&
+	test_push_failure upstream
+
+Switched to branch 'main'
+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 repo1 main
+
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
+
+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 repo1 main
+
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
+
+ok 19 - push to existing branch, with no upstream configured
+
+expecting success of 5528.20 'push to existing branch, upstream configured with same name': 
+	test_config branch.main.remote repo1 &&
+	test_config branch.main.merge refs/heads/main &&
+	git checkout main &&
+	test_commit six &&
+	test_push_success upstream main &&
+	test_commit seven &&
+	test_push_success simple main
+
+Already on 'main'
+[main 09c26db] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+To repo1
+   ac06b97..09c26db  main -> main
+[main 5990f7c] seven
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 seven.t
+To repo1
+   09c26db..5990f7c  main -> main
+ok 20 - push to existing branch, upstream configured with same name
+
+expecting success of 5528.21 'push to existing branch, upstream configured with different name': 
+	test_config branch.main.remote repo1 &&
+	test_config branch.main.merge refs/heads/other-name &&
+	git checkout main &&
+	test_commit eight &&
+	test_push_success upstream other-name &&
+	test_commit nine &&
+	test_push_failure simple &&
+	git --git-dir=repo1 log -1 --format="%h %s" "other-name" >expect-other-name &&
+	test_push_success current main &&
+	git --git-dir=repo1 log -1 --format="%h %s" "other-name" >actual-other-name &&
+	test_cmp expect-other-name actual-other-name
+
+Already on 'main'
+[main ce5228b] eight
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 eight.t
+To repo1
+ * [new branch]      main -> other-name
+[main a4fa18b] nine
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 nine.t
+fatal: The upstream branch of your current branch does not match
+the name of your current branch.  To push to the upstream branch
+on the remote, use
+
+    git push repo1 HEAD:other-name
+
+To push to the branch of the same name on the remote, use
+
+    git push repo1 HEAD
+
+To avoid automatically configuring an upstream branch when its name
+won't match the local branch, see option 'simple' of branch.autoSetupMerge
+in 'git help config'.
+
+To repo1
+   5990f7c..a4fa18b  main -> main
+ok 21 - push to existing branch, upstream configured with different name
+
+expecting success of 5528.22 'push.default = current success in central workflows': 
+		test_config branch.main.remote parent1 &&
+		test_config branch.main.merge refs/heads/foo &&
+		test_config remote.pushdefault parent1 &&
+		test_commit commit-for-current &&
+		test_push_success current main 
+	
+[main 9a2e3d7] commit-for-current
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-current.t
+To repo1
+   a4fa18b..9a2e3d7  main -> main
+ok 22 - push.default = current success in central workflows
+
+expecting success of 5528.23 'push.default = upstream success in central workflows': 
+		test_config branch.main.remote parent1 &&
+		test_config branch.main.merge refs/heads/foo &&
+		test_config remote.pushdefault parent1 &&
+		test_commit commit-for-upstream &&
+		test_push_success upstream foo 
+	
+[main 62006a2] commit-for-upstream
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-upstream.t
+To repo1
+   139b20d..62006a2  main -> foo
+ok 23 - push.default = upstream success in central workflows
+
+expecting success of 5528.24 'push.default = simple failure in central workflows': 
+		test_config branch.main.remote parent1 &&
+		test_config branch.main.merge refs/heads/foo &&
+		test_config remote.pushdefault parent1 &&
+		test_commit commit-for-simple &&
+		test_push_failure simple main 
+	
+[main 1552b1b] commit-for-simple
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-simple.t
+fatal: The upstream branch of your current branch does not match
+the name of your current branch.  To push to the upstream branch
+on the remote, use
+
+    git push parent1 HEAD:foo
+
+To push to the branch of the same name on the remote, use
+
+    git push parent1 HEAD
+
+To avoid automatically configuring an upstream branch when its name
+won't match the local branch, see option 'simple' of branch.autoSetupMerge
+in 'git help config'.
+
+ok 24 - push.default = simple failure in central workflows
+
+expecting success of 5528.25 'push.default = matching success in central workflows': 
+		test_config branch.main.remote parent1 &&
+		test_config branch.main.merge refs/heads/foo &&
+		test_config remote.pushdefault parent1 &&
+		test_commit commit-for-matching &&
+		test_push_success matching main 
+	
+[main 75f04d7] commit-for-matching
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-matching.t
+To repo1
+   9a2e3d7..75f04d7  main -> main
+ok 25 - push.default = matching success in central workflows
+
+expecting success of 5528.26 'push.default = current success in triangular workflows': 
+		test_config branch.main.remote parent1 &&
+		test_config branch.main.merge refs/heads/foo &&
+		test_config remote.pushdefault parent2 &&
+		test_commit commit-for-current-triangular &&
+		test_push_success current main repo2
+	
+[main 533b416] commit-for-current-triangular
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-current-triangular.t
+To repo2
+   ac06b97..533b416  main -> main
+ok 26 - push.default = current success in triangular workflows
+
+expecting success of 5528.27 'push.default = upstream failure in triangular workflows': 
+		test_config branch.main.remote parent1 &&
+		test_config branch.main.merge refs/heads/foo &&
+		test_config remote.pushdefault parent2 &&
+		test_commit commit-for-upstream-triangular &&
+		test_push_failure upstream foo repo2
+	
+[main c0923f2] commit-for-upstream-triangular
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-upstream-triangular.t
+fatal: You are pushing to remote 'parent2', which is not the upstream of
+your current branch 'main', without telling me what to push
+to update which remote branch.
+ok 27 - push.default = upstream failure in triangular workflows
+
+expecting success of 5528.28 'push.default = simple success in triangular workflows': 
+		test_config branch.main.remote parent1 &&
+		test_config branch.main.merge refs/heads/foo &&
+		test_config remote.pushdefault parent2 &&
+		test_commit commit-for-simple-triangular &&
+		test_push_success simple main repo2
+	
+[main 1e888ee] commit-for-simple-triangular
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-simple-triangular.t
+To repo2
+   533b416..1e888ee  main -> main
+ok 28 - push.default = simple success in triangular workflows
+
+expecting success of 5528.29 'push.default = matching success in triangular workflows': 
+		test_config branch.main.remote parent1 &&
+		test_config branch.main.merge refs/heads/foo &&
+		test_config remote.pushdefault parent2 &&
+		test_commit commit-for-matching-triangular &&
+		test_push_success matching main repo2
+	
+[main d27b2db] commit-for-matching-triangular
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-matching-triangular.t
+To repo2
+   1e888ee..d27b2db  main -> main
+ok 29 - push.default = matching success in triangular workflows
+
+expecting success of 5528.30 'default behavior allows "simple" push': 
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/main &&
+	test_config remote.pushdefault parent1 &&
+	test_commit default-main-main &&
+	test_push_success "" main
+
+[main d645001] default-main-main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 default-main-main.t
+To repo1
+   75f04d7..d645001  main -> main
+ok 30 - default behavior allows "simple" push
+
+expecting success of 5528.31 'default behavior rejects non-simple push': 
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/foo &&
+	test_config remote.pushdefault parent1 &&
+	test_commit default-main-foo &&
+	test_push_failure ""
+
+[main 4b5e552] default-main-foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 default-main-foo.t
+fatal: The upstream branch of your current branch does not match
+the name of your current branch.  To push to the upstream branch
+on the remote, use
+
+    git push parent1 HEAD:foo
+
+To push to the branch of the same name on the remote, use
+
+    git push parent1 HEAD
+
+To choose either option permanently, see push.default in 'git help config'.
+
+To avoid automatically configuring an upstream branch when its name
+won't match the local branch, see option 'simple' of branch.autoSetupMerge
+in 'git help config'.
+
+ok 31 - default behavior rejects non-simple push
+
+expecting success of 5528.32 'default triangular behavior acts like "current"': 
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/foo &&
+	test_config remote.pushdefault parent2 &&
+	test_commit default-triangular &&
+	test_push_success "" main repo2
+
+[main daf1bc1] default-triangular
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 default-triangular.t
+To repo2
+   d27b2db..daf1bc1  main -> main
+ok 32 - default triangular behavior acts like "current"
+
+# still have 1 known breakage(s)
+# passed all remaining 31 test(s)
+1..32
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5539-fetch-http-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5539-fetch-http-shallow/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5540-http-push-webdav.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5520-pull.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/.git/
+expecting success of 5520.1 'setup': 
+	echo file >file &&
+	git add file &&
+	git commit -a -m original
+
+[main (root-commit) 2cbe290] original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
+
+expecting success of 5520.2 'pulling into void': 
+	git init cloned &&
+	(
+		cd cloned &&
+		git pull ..
+	) &&
+	test_path_is_file file &&
+	test_path_is_file cloned/file &&
+	test_cmp file cloned/file
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned/.git/
+From ..
+ * branch            HEAD       -> FETCH_HEAD
+ok 2 - pulling into void
+
+expecting success of 5520.3 'pulling into void using main:main': 
+	git init cloned-uho &&
+	(
+		cd cloned-uho &&
+		git pull .. main:main
+	) &&
+	test_path_is_file file &&
+	test_path_is_file cloned-uho/file &&
+	test_cmp file cloned-uho/file
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned-uho/.git/
+From ..
+ * [new branch]      main       -> main
+ok 3 - pulling into void using main:main
+
+expecting success of 5520.4 'pulling into void does not overwrite untracked files': 
+	git init cloned-untracked &&
+	(
+		cd cloned-untracked &&
+		echo untracked >file &&
+		test_must_fail git pull .. main &&
+		echo untracked >expect &&
+		test_cmp expect file
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned-untracked/.git/
+From ..
+ * branch            main       -> FETCH_HEAD
+error: The following untracked working tree files would be overwritten by merge:
+	file
+Please move or remove them before you merge.
+Aborting
+ok 4 - pulling into void does not overwrite untracked files
+
+expecting success of 5520.5 'pulling into void does not overwrite staged files': 
+	git init cloned-staged-colliding &&
+	(
+		cd cloned-staged-colliding &&
+		echo "alternate content" >file &&
+		git add file &&
+		test_must_fail git pull .. main &&
+		echo "alternate content" >expect &&
+		test_cmp expect file &&
+		git cat-file blob :file >file.index &&
+		test_cmp expect file.index
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned-staged-colliding/.git/
+From ..
+ * branch            main       -> FETCH_HEAD
+error: Your local changes to the following files would be overwritten by merge:
+	file
+Please commit your changes or stash them before you merge.
+Aborting
+ok 5 - pulling into void does not overwrite staged files
+
+expecting success of 5520.6 'pulling into void does not remove new staged files': 
+	git init cloned-staged-new &&
+	(
+		cd cloned-staged-new &&
+		echo "new tracked file" >newfile &&
+		git add newfile &&
+		git pull .. main &&
+		echo "new tracked file" >expect &&
+		test_cmp expect newfile &&
+		git cat-file blob :newfile >newfile.index &&
+		test_cmp expect newfile.index
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned-staged-new/.git/
+From ..
+ * branch            main       -> FETCH_HEAD
+ok 6 - pulling into void does not remove new staged files
+
+expecting success of 5520.7 'pulling into void must not create an octopus': 
+	git init cloned-octopus &&
+	(
+		cd cloned-octopus &&
+		test_must_fail git pull .. main main &&
+		test_path_is_missing file
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5520-pull/cloned-octopus/.git/
+From ..
+ * branch            main       -> FETCH_HEAD
+ * branch            main       -> FETCH_HEAD
+fatal: Cannot merge multiple branches into empty head.
+ok 7 - pulling into void must not create an octopus
+
+expecting success of 5520.8 'test . as a remote': 
+	git branch copy main &&
+	git config branch.copy.remote . &&
+	git config branch.copy.merge refs/heads/main &&
+	echo updated >file &&
+	git commit -a -m updated &&
+	git checkout copy &&
+	echo file >expect &&
+	test_cmp expect file &&
+	git pull &&
+	echo updated >expect &&
+	test_cmp expect file &&
+	git reflog -1 >reflog.actual &&
+	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
+	echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
+	test_cmp reflog.expected reflog.fuzzy
+
+[main 732015b] updated
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'copy'
@@ -346788,6 +346804,21 @@
 1..72
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5541-http-push-smart.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5538-push-shallow.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5538-push-shallow/.git/
 expecting success of 5538.1 'setup': 
@@ -346959,36 +346990,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5540-http-push-webdav.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5541-http-push-smart.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5542-push-http-shallow.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5542-push-http-shallow/.git/
 checking prerequisite: NOT_ROOT
@@ -347099,6 +347100,152 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5546-receive-limits.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/.git/
+expecting success of 5546.1 'create known-size (1024 bytes) commit': 
+	test-tool genrandom foo 1024 >one-k &&
+	git add one-k &&
+	test_commit one-k
+
+[master (root-commit) cba7046] one-k
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 one-k
+ create mode 100644 one-k.t
+ok 1 - create known-size (1024 bytes) commit
+
+expecting success of 5546.2 'prepare destination repository': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
+ok 2 - prepare destination repository
+
+expecting success of 5546.3 'set unpacklimit to 1': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
+	
+ok 3 - set unpacklimit to 1
+
+expecting success of 5546.4 'setting receive.maxInputSize to 512 rejects push': 
+		git --git-dir=dest config receive.maxInputSize 512 &&
+		test_must_fail git push dest HEAD
+	
+remote: fatal: pack exceeds maximum allowed size (512 bytes)        
+error: remote unpack failed: index-pack abnormal exit
+To dest
+ ! [remote rejected] HEAD -> master (unpacker error)
+error: failed to push some refs to 'dest'
+ok 4 - setting receive.maxInputSize to 512 rejects push
+
+expecting success of 5546.5 'bumping limit to 4k allows push': 
+		git --git-dir=dest config receive.maxInputSize 4k &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 5 - bumping limit to 4k allows push
+
+expecting success of 5546.6 'prepare destination repository (again)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
+ok 6 - prepare destination repository (again)
+
+expecting success of 5546.7 'lifting the limit allows push': 
+		git --git-dir=dest config receive.maxInputSize 0 &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 7 - lifting the limit allows push
+
+expecting success of 5546.8 'prepare destination repository (once more)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
+ok 8 - prepare destination repository (once more)
+
+expecting success of 5546.9 'receive trumps transfer': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
+		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
+		git push dest HEAD &&
+		validate_store_type
+	
+To dest
+ * [new branch]      HEAD -> master
+count: 0
+ok 9 - receive trumps transfer
+
+expecting success of 5546.10 'prepare destination repository': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
+ok 10 - prepare destination repository
+
+expecting success of 5546.11 'set unpacklimit to 10000': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
+	
+ok 11 - set unpacklimit to 10000
+
+expecting success of 5546.12 'setting receive.maxInputSize to 512 rejects push': 
+		git --git-dir=dest config receive.maxInputSize 512 &&
+		test_must_fail git push dest HEAD
+	
+remote: fatal: pack exceeds maximum allowed size        
+error: remote unpack failed: unpack-objects abnormal exit
+To dest
+ ! [remote rejected] HEAD -> master (unpacker error)
+error: failed to push some refs to 'dest'
+ok 12 - setting receive.maxInputSize to 512 rejects push
+
+expecting success of 5546.13 'bumping limit to 4k allows push': 
+		git --git-dir=dest config receive.maxInputSize 4k &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 13 - bumping limit to 4k allows push
+
+expecting success of 5546.14 'prepare destination repository (again)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
+ok 14 - prepare destination repository (again)
+
+expecting success of 5546.15 'lifting the limit allows push': 
+		git --git-dir=dest config receive.maxInputSize 0 &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 15 - lifting the limit allows push
+
+expecting success of 5546.16 'prepare destination repository (once more)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
+ok 16 - prepare destination repository (once more)
+
+expecting success of 5546.17 'receive trumps transfer': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
+		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
+		git push dest HEAD &&
+		validate_store_type
+	
+To dest
+ * [new branch]      HEAD -> master
+packs: 0
+ok 17 - receive trumps transfer
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5537-fetch-shallow.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5537-fetch-shallow/.git/
 expecting success of 5537.1 'setup': 
@@ -347520,152 +347667,6 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5546-receive-limits.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/.git/
-expecting success of 5546.1 'create known-size (1024 bytes) commit': 
-	test-tool genrandom foo 1024 >one-k &&
-	git add one-k &&
-	test_commit one-k
-
-[master (root-commit) cba7046] one-k
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 one-k
- create mode 100644 one-k.t
-ok 1 - create known-size (1024 bytes) commit
-
-expecting success of 5546.2 'prepare destination repository': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
-ok 2 - prepare destination repository
-
-expecting success of 5546.3 'set unpacklimit to 1': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
-	
-ok 3 - set unpacklimit to 1
-
-expecting success of 5546.4 'setting receive.maxInputSize to 512 rejects push': 
-		git --git-dir=dest config receive.maxInputSize 512 &&
-		test_must_fail git push dest HEAD
-	
-remote: fatal: pack exceeds maximum allowed size (512 bytes)        
-error: remote unpack failed: index-pack abnormal exit
-To dest
- ! [remote rejected] HEAD -> master (unpacker error)
-error: failed to push some refs to 'dest'
-ok 4 - setting receive.maxInputSize to 512 rejects push
-
-expecting success of 5546.5 'bumping limit to 4k allows push': 
-		git --git-dir=dest config receive.maxInputSize 4k &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 5 - bumping limit to 4k allows push
-
-expecting success of 5546.6 'prepare destination repository (again)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
-ok 6 - prepare destination repository (again)
-
-expecting success of 5546.7 'lifting the limit allows push': 
-		git --git-dir=dest config receive.maxInputSize 0 &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 7 - lifting the limit allows push
-
-expecting success of 5546.8 'prepare destination repository (once more)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
-ok 8 - prepare destination repository (once more)
-
-expecting success of 5546.9 'receive trumps transfer': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
-		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
-		git push dest HEAD &&
-		validate_store_type
-	
-To dest
- * [new branch]      HEAD -> master
-count: 0
-ok 9 - receive trumps transfer
-
-expecting success of 5546.10 'prepare destination repository': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
-ok 10 - prepare destination repository
-
-expecting success of 5546.11 'set unpacklimit to 10000': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
-	
-ok 11 - set unpacklimit to 10000
-
-expecting success of 5546.12 'setting receive.maxInputSize to 512 rejects push': 
-		git --git-dir=dest config receive.maxInputSize 512 &&
-		test_must_fail git push dest HEAD
-	
-remote: fatal: pack exceeds maximum allowed size        
-error: remote unpack failed: unpack-objects abnormal exit
-To dest
- ! [remote rejected] HEAD -> master (unpacker error)
-error: failed to push some refs to 'dest'
-ok 12 - setting receive.maxInputSize to 512 rejects push
-
-expecting success of 5546.13 'bumping limit to 4k allows push': 
-		git --git-dir=dest config receive.maxInputSize 4k &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 13 - bumping limit to 4k allows push
-
-expecting success of 5546.14 'prepare destination repository (again)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
-ok 14 - prepare destination repository (again)
-
-expecting success of 5546.15 'lifting the limit allows push': 
-		git --git-dir=dest config receive.maxInputSize 0 &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 15 - lifting the limit allows push
-
-expecting success of 5546.16 'prepare destination repository (once more)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5546-receive-limits/dest/
-ok 16 - prepare destination repository (once more)
-
-expecting success of 5546.17 'receive trumps transfer': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
-		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
-		git push dest HEAD &&
-		validate_store_type
-	
-To dest
- * [new branch]      HEAD -> master
-packs: 0
-ok 17 - receive trumps transfer
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5549-fetch-push-http.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5549-fetch-push-http/.git/
 checking prerequisite: NOT_ROOT
@@ -347681,122 +347682,6 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5547-push-quarantine.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5515-fetch-merge-logic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5515-fetch-merge-logic/.git/
 expecting success of 5515.1 'setup': 
@@ -351129,8 +351014,124 @@
 1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5551-http-fetch-smart.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5551-http-fetch-smart/.git/
+*** t5547-push-quarantine.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5550-http-fetch-dumb.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5550-http-fetch-dumb/.git/
 checking prerequisite: NOT_ROOT
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
@@ -351144,8 +351145,8 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5550-http-fetch-dumb.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5550-http-fetch-dumb/.git/
+*** t5551-http-fetch-smart.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5551-http-fetch-smart/.git/
 checking prerequisite: NOT_ROOT
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
@@ -351519,9 +351520,9 @@
 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
 
+fatal: the remote end hung up unexpectedly
 expecting success of 5531.5 'push succeeds after commit was pushed to remote': 
 	(
 		cd work/gar/bage &&
@@ -353354,21 +353355,6 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5561-http-backend.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5561-http-backend/.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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5545-push-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5545-push-options/.git/
 expecting success of 5545.1 'one push option works for a single branch': 
@@ -353747,8 +353733,8 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5563-simple-http-auth.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5563-simple-http-auth/.git/
+*** t5561-http-backend.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5561-http-backend/.git/
 checking prerequisite: NOT_ROOT
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
@@ -353777,6 +353763,202 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5563-simple-http-auth.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5563-simple-http-auth/.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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5562-http-backend-content-length.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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, 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
+
+checking prerequisite: GZIP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&gzip --version
+)
+gzip 1.13
+Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 1993 Jean-loup Gailly.
+This is free software.  You may redistribute copies of it under the terms of
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
+
+Written by Jean-loup Gailly.
+prerequisite GZIP ok
+expecting success of 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
+
+ok 2 - setup, compression related
+
+expecting success of 5562.3 'fetch plain': 
+	test_http_env upload fetch_body &&
+	verify_http_result "200 OK"
+
+ok 3 - fetch plain
+
+expecting success of 5562.4 'fetch plain truncated': 
+	test_http_env upload fetch_body.trunc &&
+	! verify_http_result "200 OK"
+
+fatal: the remote end hung up unexpectedly
+ok 4 - fetch plain truncated
+
+expecting success of 5562.5 'fetch plain empty': 
+	test_http_env upload empty_body &&
+	! verify_http_result "200 OK"
+
+fatal: the remote end hung up unexpectedly
+ok 5 - fetch plain empty
+
+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"
+
+ok 6 - fetch gzipped
+
+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"
+
+fatal: request ended in the middle of the gzip stream
+ok 7 - fetch gzipped truncated
+
+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"
+
+fatal: request ended in the middle of the gzip stream
+ok 8 - fetch gzipped empty
+
+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
+
+Deleted branch newbranch (was d8aa3fa).
+ok 9 - push plain
+
+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
+ok 10 - push plain truncated
+
+expecting success of 5562.11 'push plain empty': 
+	test_http_env receive empty_body &&
+	! verify_http_result "200 OK"
+
+fatal: the remote end hung up unexpectedly
+ok 11 - push plain empty
+
+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
+
+Deleted branch newbranch (was d8aa3fa).
+ok 12 - push gzipped
+
+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"
+
+fatal: request ended in the middle of the gzip stream
+ok 13 - push gzipped truncated
+
+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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5553-set-upstream.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5553-set-upstream/.git/
 expecting success of 5553.1 'setup bare parent fetch': 
@@ -354103,187 +354285,6 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5562-http-backend-content-length.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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, 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
-
-checking prerequisite: GZIP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&gzip --version
-)
-gzip 1.13
-Copyright (C) 2023 Free Software Foundation, Inc.
-Copyright (C) 1993 Jean-loup Gailly.
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
-
-Written by Jean-loup Gailly.
-prerequisite GZIP ok
-expecting success of 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
-
-ok 2 - setup, compression related
-
-expecting success of 5562.3 'fetch plain': 
-	test_http_env upload fetch_body &&
-	verify_http_result "200 OK"
-
-ok 3 - fetch plain
-
-expecting success of 5562.4 'fetch plain truncated': 
-	test_http_env upload fetch_body.trunc &&
-	! verify_http_result "200 OK"
-
-fatal: the remote end hung up unexpectedly
-ok 4 - fetch plain truncated
-
-expecting success of 5562.5 'fetch plain empty': 
-	test_http_env upload empty_body &&
-	! verify_http_result "200 OK"
-
-fatal: the remote end hung up unexpectedly
-ok 5 - fetch plain empty
-
-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"
-
-ok 6 - fetch gzipped
-
-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"
-
-fatal: request ended in the middle of the gzip stream
-ok 7 - fetch gzipped truncated
-
-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"
-
-fatal: request ended in the middle of the gzip stream
-ok 8 - fetch gzipped empty
-
-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
-
-Deleted branch newbranch (was d8aa3fa).
-ok 9 - push plain
-
-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
-ok 10 - push plain truncated
-
-expecting success of 5562.11 'push plain empty': 
-	test_http_env receive empty_body &&
-	! verify_http_result "200 OK"
-
-fatal: the remote end hung up unexpectedly
-ok 11 - push plain empty
-
-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
-
-Deleted branch newbranch (was d8aa3fa).
-ok 12 - push gzipped
-
-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"
-
-fatal: request ended in the middle of the gzip stream
-ok 13 - push gzipped truncated
-
-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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5533-push-cas.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5533-push-cas/.git/
 expecting success of 5533.1 'setup': 
@@ -356109,6 +356110,92 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5573-pull-verify-signatures.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5560-http-backend-noserver.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5560-http-backend-noserver/.git/
 expecting success of 5560.1 'setup repository': 
@@ -356239,36 +356326,36 @@
 	expect_aliased 1 /etc/./passwd &&
 	expect_aliased 1 //domain/data.txt
 
---- exp.err	2026-03-04 08:00:32.343352315 +0000
-+++ act.err	2026-03-04 08:00:32.335352315 +0000
+--- exp.err	2025-01-30 02:13:50.200851545 +0000
++++ act.err	2025-01-30 02:13:50.176851401 +0000
 @@ -1 +0,0 @@
 -fatal: '/repo.git/../HEAD': aliased
---- exp.err	2026-03-04 08:00:32.383352315 +0000
-+++ act.err	2026-03-04 08:00:32.383352315 +0000
+--- exp.err	2025-01-30 02:13:50.256851880 +0000
++++ act.err	2025-01-30 02:13:50.256851880 +0000
 @@ -1 +1 @@
 -fatal: '/../etc/passwd': aliased
 +Request not supported: '/build/reproducible-path/git-2.47.2/t/trash directory.t5560-http-backend-noserver//../etc/passwd'
 \ No newline at end of file
---- exp.err	2026-03-04 08:00:32.447352315 +0000
-+++ act.err	2026-03-04 08:00:32.443352315 +0000
+--- exp.err	2025-01-30 02:13:50.320852264 +0000
++++ act.err	2025-01-30 02:13:50.320852264 +0000
 @@ -1 +1 @@
 -fatal: '../etc/passwd': aliased
 +Request not supported: '/build/reproducible-path/git-2.47.2/t/trash directory.t5560-http-backend-noserver/../etc/passwd'
 \ No newline at end of file
---- exp.err	2026-03-04 08:00:32.499352315 +0000
-+++ act.err	2026-03-04 08:00:32.491352315 +0000
+--- exp.err	2025-01-30 02:13:50.388852672 +0000
++++ act.err	2025-01-30 02:13:50.384852648 +0000
 @@ -1 +1 @@
 -fatal: '/etc//passwd': aliased
 +Request not supported: '/build/reproducible-path/git-2.47.2/t/trash directory.t5560-http-backend-noserver//etc//passwd'
 \ No newline at end of file
---- exp.err	2026-03-04 08:00:32.535352315 +0000
-+++ act.err	2026-03-04 08:00:32.535352315 +0000
+--- exp.err	2025-01-30 02:13:50.452853056 +0000
++++ act.err	2025-01-30 02:13:50.452853056 +0000
 @@ -1 +1 @@
 -fatal: '/etc/./passwd': aliased
 +Request not supported: '/build/reproducible-path/git-2.47.2/t/trash directory.t5560-http-backend-noserver//etc/./passwd'
 \ No newline at end of file
---- exp.err	2026-03-04 08:00:32.579352315 +0000
-+++ act.err	2026-03-04 08:00:32.571352315 +0000
+--- exp.err	2025-01-30 02:13:50.504853368 +0000
++++ act.err	2025-01-30 02:13:50.504853368 +0000
 @@ -1 +1 @@
 -fatal: '//domain/data.txt': aliased
 +Request not supported: '/build/reproducible-path/git-2.47.2/t/trash directory.t5560-http-backend-noserver///domain/data.txt'
@@ -356279,95 +356366,24 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5573-pull-verify-signatures.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5573-pull-verify-signatures/.git/
-checking prerequisite: GPG
+*** t5580-unc-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5580-unc-paths/.git/
+1..0 # SKIP skipping Windows-only path tests
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5581-http-curl-verbose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5581-http-curl-verbose/.git/
+checking prerequisite: NOT_ROOT
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
 (
-	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
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
 )
-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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5580-unc-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5580-unc-paths/.git/
-1..0 # SKIP skipping Windows-only path tests
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5571-pre-push-hook.sh ***
@@ -357542,21 +357558,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5581-http-curl-verbose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5570-git-daemon.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/.git/
 checking prerequisite: PIPE
@@ -357571,7 +357572,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[686430] Ready to rumble
+[1939670] Ready to rumble
 expecting success of 5570.1 'setup repository': 
 	git config push.default matching &&
 	echo content >file &&
@@ -357603,11 +357604,11 @@
 	check_verbose_connect &&
 	test_cmp file clone/file
 
-[686864] Connection from 127.0.0.1:39500
-[686864] Extended attribute "host": 127.0.0.1:5570
-[686864] Extended attribute "protocol": version=2
-[686864] Request upload-pack for '/repo.git'
-[686430] [686864] Disconnected
+[1939973] Connection from 127.0.0.1:53806
+[1939973] Extended attribute "host": 127.0.0.1:5570
+[1939973] Extended attribute "protocol": version=2
+[1939973] Request upload-pack for '/repo.git'
+[1939670] [1939973] 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.
@@ -357627,11 +357628,11 @@
  1 file changed, 1 insertion(+)
 To /build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git
    f39a923..5647d5f  main -> main
-[687293] Connection from 127.0.0.1:39506
-[687293] Extended attribute "host": 127.0.0.1:5570
-[687293] Extended attribute "protocol": version=2
-[687293] Request upload-pack for '/repo.git'
-[686430] [687293] Disconnected
+[1940338] Connection from 127.0.0.1:53816
+[1940338] Extended attribute "host": 127.0.0.1:5570
+[1940338] Extended attribute "protocol": version=2
+[1940338] Request upload-pack for '/repo.git'
+[1939670] [1940338] Disconnected
 Updating f39a923..5647d5f
 Fast-forward
  file | 1 +
@@ -357646,11 +357647,11 @@
 	(cd clone && git fetch -v) 2>stderr &&
 	check_verbose_connect
 
-[687620] Connection from 127.0.0.1:39520
-[687620] Extended attribute "host": 127.0.0.1:5570
-[687620] Extended attribute "protocol": version=2
-[687620] Request upload-pack for '/repo.git'
-[686430] [687620] Disconnected
+[1940633] Connection from 127.0.0.1:53820
+[1940633] Extended attribute "host": 127.0.0.1:5570
+[1940633] Extended attribute "protocol": version=2
+[1940633] Request upload-pack for '/repo.git'
+[1939670] [1940633] 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.
@@ -357661,11 +357662,11 @@
 	(cd clone && git fetch 2>../stderr) &&
 	test_must_be_empty stderr
 
-[687791] Connection from 127.0.0.1:39536
-[687791] Extended attribute "host": 127.0.0.1:5570
-[687791] Extended attribute "protocol": version=2
-[687791] Request upload-pack for '/repo.git'
-[686430] [687791] Disconnected
+[1940796] Connection from 127.0.0.1:53832
+[1940796] Extended attribute "host": 127.0.0.1:5570
+[1940796] Extended attribute "protocol": version=2
+[1940796] Request upload-pack for '/repo.git'
+[1939670] [1940796] Disconnected
 ok 6 - no-op fetch without "-v" is quiet
 
 expecting success of 5570.7 'remote detects correct HEAD': 
@@ -357680,12 +357681,12 @@
 
 To /build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git
  * [new branch]      main -> other
-[688113] Connection from 127.0.0.1:39538
-[688113] Extended attribute "host": 127.0.0.1:5570
-[688113] Extended attribute "protocol": version=2
-[688113] Request upload-pack for '/repo.git'
+[1941054] Connection from 127.0.0.1:53844
+[1941054] Extended attribute "host": 127.0.0.1:5570
+[1941054] Extended attribute "protocol": version=2
+[1941054] Request upload-pack for '/repo.git'
 origin/HEAD set to main
-[686430] [688113] Disconnected
+[1939670] [1941054] Disconnected
 ok 7 - remote detects correct HEAD
 
 expecting success of 5570.8 'prepare pack objects': 
@@ -357712,22 +357713,22 @@
 
 1+0 records in
 1+0 records out
-256 bytes copied, 0.00769612 s, 33.3 kB/s
+256 bytes copied, 0.00689264 s, 37.1 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo_bad1.git/
-[688449] Connection from 127.0.0.1:39554
-[688449] Extended attribute "host": 127.0.0.1:5570
-[688449] Extended attribute "protocol": version=2
-[688449] Request upload-pack for '/repo_bad1.git'
-[688449] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[688449] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[688449] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[688449] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[688449] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[688449] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[688449] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[688449] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[688449] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[686430] [688449] Disconnected (with error)
+[1941328] Connection from 127.0.0.1:53850
+[1941328] Extended attribute "host": 127.0.0.1:5570
+[1941328] Extended attribute "protocol": version=2
+[1941328] Request upload-pack for '/repo_bad1.git'
+[1941328] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[1941328] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[1941328] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[1941328] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[1941328] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[1941328] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[1941328] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[1941328] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[1941328] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[1939670] [1941328] 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 9 - fetch notices corrupt pack
@@ -357749,22 +357750,22 @@
 
 1+0 records in
 1+0 records out
-256 bytes copied, 3.876e-05 s, 6.6 MB/s
+256 bytes copied, 0.00702776 s, 36.4 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo_bad2.git/
-[688722] Connection from 127.0.0.1:39556
-[688722] Extended attribute "host": 127.0.0.1:5570
-[688722] Extended attribute "protocol": version=2
-[688722] Request upload-pack for '/repo_bad2.git'
-[688722] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[688722] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[688722] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[688722] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[688722] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[688722] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[688722] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[688722] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[688722] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[686430] [688722] Disconnected (with error)
+[1941552] Connection from 127.0.0.1:53862
+[1941552] Extended attribute "host": 127.0.0.1:5570
+[1941552] Extended attribute "protocol": version=2
+[1941552] Request upload-pack for '/repo_bad2.git'
+[1941552] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[1941552] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[1941552] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[1941552] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[1941552] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[1941552] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[1941552] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[1941552] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[1941552] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[1939670] [1941552] Disconnected (with error)
 fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
 ok 10 - fetch notices corrupt idx
 
@@ -357776,91 +357777,89 @@
 ok 11 - client refuses to ask for repo with newline
 
 expecting success of 5570.12 'clone non-existent': test_remote_error    'access denied or repository not exported' clone nowhere.git
-[688898] Connection from 127.0.0.1:39568
-[688898] Extended attribute "host": 127.0.0.1:5570
-[688898] Extended attribute "protocol": version=2
-[688898] Request upload-pack for '/nowhere.git'
-[688898] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[686430] [688898] Disconnected (with error)
+[1941673] Connection from 127.0.0.1:53864
+[1941673] Extended attribute "host": 127.0.0.1:5570
+[1941673] Extended attribute "protocol": version=2
+[1941673] Request upload-pack for '/nowhere.git'
+[1941673] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[1939670] [1941673] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /nowhere.git
 ok 12 - clone non-existent
 
 expecting success of 5570.13 'push disabled': test_remote_error    'access denied or repository not exported' push  repo.git main
-[688987] Connection from 127.0.0.1:39576
-[688987] Extended attribute "host": 127.0.0.1:5570
-[688987] Request receive-pack for '/repo.git'
-[688987] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git'
-[686430] [688987] Disconnected (with error)
+[1941753] Connection from 127.0.0.1:53866
+[1941753] Extended attribute "host": 127.0.0.1:5570
+[1941753] Request receive-pack for '/repo.git'
+[1941753] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git'
+[1939670] [1941753] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 13 - push disabled
 
 expecting success of 5570.14 'read access denied': test_remote_error -x 'access denied or repository not exported' fetch repo.git
-[689099] Connection from 127.0.0.1:39588
-[689099] Extended attribute "host": 127.0.0.1:5570
-[689099] Extended attribute "protocol": version=2
-[689099] Request upload-pack for '/repo.git'
-[689099] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[686430] [689099] Disconnected (with error)
+[1941823] Connection from 127.0.0.1:53882
+[1941823] Extended attribute "host": 127.0.0.1:5570
+[1941823] Extended attribute "protocol": version=2
+[1941823] Request upload-pack for '/repo.git'
+[1941823] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[1939670] [1941823] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 14 - read access denied
 
 expecting success of 5570.15 'not exported': test_remote_error -n 'access denied or repository not exported' fetch repo.git
-[689197] Connection from 127.0.0.1:39592
-[689197] Extended attribute "host": 127.0.0.1:5570
-[689197] Extended attribute "protocol": version=2
-[689197] Request upload-pack for '/repo.git'
-[689197] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[686430] [689197] Disconnected (with error)
+[1941900] Connection from 127.0.0.1:53890
+[1941900] Extended attribute "host": 127.0.0.1:5570
+[1941900] Extended attribute "protocol": version=2
+[1941900] Request upload-pack for '/repo.git'
+[1941900] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[1939670] [1941900] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 15 - not exported
 
 Stopping git daemon ...
-Terminated
 Starting git daemon ...
-[689343] Ready to rumble
+[1942011] Ready to rumble
 expecting success of 5570.16 'clone non-existent': test_remote_error    'no such repository'      clone nowhere.git
-[689410] Connection from 127.0.0.1:39606
-[689410] Extended attribute "host": 127.0.0.1:5570
-[689410] Extended attribute "protocol": version=2
-[689410] Request upload-pack for '/nowhere.git'
-[689410] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[689343] [689410] Disconnected (with error)
+[1942059] Connection from 127.0.0.1:53906
+[1942059] Extended attribute "host": 127.0.0.1:5570
+[1942059] Extended attribute "protocol": version=2
+[1942059] Request upload-pack for '/nowhere.git'
+[1942059] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[1942011] [1942059] Disconnected (with error)
 fatal: remote error: no such repository: /nowhere.git
 ok 16 - clone non-existent
 
 expecting success of 5570.17 'push disabled': test_remote_error    'service not enabled'     push  repo.git main
-[689480] Connection from 127.0.0.1:39616
-[689480] Extended attribute "host": 127.0.0.1:5570
-[689480] Request receive-pack for '/repo.git'
-[689480] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git'
-[689343] [689480] Disconnected (with error)
+[1942134] Connection from 127.0.0.1:53918
+[1942134] Extended attribute "host": 127.0.0.1:5570
+[1942134] Request receive-pack for '/repo.git'
+[1942134] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git'
+[1942011] [1942134] Disconnected (with error)
 fatal: remote error: service not enabled: /repo.git
 ok 17 - push disabled
 
 expecting success of 5570.18 'read access denied': test_remote_error -x 'no such repository'      fetch repo.git
-[689564] Connection from 127.0.0.1:39628
-[689564] Extended attribute "host": 127.0.0.1:5570
-[689564] Extended attribute "protocol": version=2
-[689564] Request upload-pack for '/repo.git'
-[689564] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[689343] [689564] Disconnected (with error)
+[1942212] Connection from 127.0.0.1:53924
+[1942212] Extended attribute "host": 127.0.0.1:5570
+[1942212] Extended attribute "protocol": version=2
+[1942212] Request upload-pack for '/repo.git'
+[1942212] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[1942011] [1942212] Disconnected (with error)
 fatal: remote error: no such repository: /repo.git
 ok 18 - read access denied
 
 expecting success of 5570.19 'not exported': test_remote_error -n 'repository not exported' fetch repo.git
-[689662] Connection from 127.0.0.1:39644
-[689662] Extended attribute "host": 127.0.0.1:5570
-[689662] Extended attribute "protocol": version=2
-[689662] Request upload-pack for '/repo.git'
-[689662] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[689343] [689662] Disconnected (with error)
+[1942287] Connection from 127.0.0.1:53930
+[1942287] Extended attribute "host": 127.0.0.1:5570
+[1942287] Extended attribute "protocol": version=2
+[1942287] Request upload-pack for '/repo.git'
+[1942287] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[1942011] [1942287] Disconnected (with error)
 fatal: remote error: repository not exported: /repo.git
 ok 19 - not exported
 
 Stopping git daemon ...
-Terminated
 Starting git daemon ...
-[689778] Ready to rumble
+[1942395] Ready to rumble
 expecting success of 5570.20 'access repo via interpolated hostname': 
 	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/localhost/interp.git" &&
 	git init --bare "$repo" &&
@@ -357874,24 +357873,24 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git/
 To /build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git
  * [new branch]      HEAD -> main
-[690046] Connection from 127.0.0.1:39652
-[690046] Extended attribute "host": localhost
-[690046] Extended attribute "protocol": version=2
-[690046] Request upload-pack for '/interp.git'
-[690046] Interpolated dir '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[1942574] Connection from 127.0.0.1:53936
+[1942574] Extended attribute "host": localhost
+[1942574] Extended attribute "protocol": version=2
+[1942574] Request upload-pack for '/interp.git'
+[1942574] Interpolated dir '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
-[689778] [690046] Disconnected
-[690130] Connection from 127.0.0.1:39656
-[690130] Extended attribute "host": LOCALHOST
-[690130] Extended attribute "protocol": version=2
-[690130] Request upload-pack for '/interp.git'
-[690130] Interpolated dir '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[1942395] [1942574] Disconnected
+[1942614] Connection from 127.0.0.1:53942
+[1942614] Extended attribute "host": LOCALHOST
+[1942614] Extended attribute "protocol": version=2
+[1942614] Request upload-pack for '/interp.git'
+[1942614] Interpolated dir '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
 ok 20 - access repo via interpolated hostname
 
-[689778] [690130] Disconnected
+[1942395] [1942614] Disconnected
 expecting success of 5570.21 'hostname cannot break out of directory': 
 	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/../escape.git" &&
 	git init --bare "$repo" &&
@@ -357904,13 +357903,13 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/escape.git/
 To /build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/../escape.git
  * [new branch]      HEAD -> main
-[690443] Connection from 127.0.0.1:39670
-[690443] Extended attribute "host": ..
-[690443] Extended attribute "protocol": version=2
-[690443] Request upload-pack for '/escape.git'
-[690443] Interpolated dir '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo//escape.git'
-[690443] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
-[689778] [690443] Disconnected (with error)
+[1942820] Connection from 127.0.0.1:53956
+[1942820] Extended attribute "host": ..
+[1942820] Extended attribute "protocol": version=2
+[1942820] Request upload-pack for '/escape.git'
+[1942820] Interpolated dir '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo//escape.git'
+[1942820] '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
+[1942395] [1942820] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /escape.git
 ok 21 - hostname cannot break out of directory
 
@@ -357937,15 +357936,14 @@
 	git -C "$repo" rev-parse main >expect &&
 	test_cmp expect actual
 
-[690729] Connection from 127.0.0.1:39676
-[690729] Extended attribute "host": localhost
-[690729] Request upload-pack for '/interp.git'
-[690729] Interpolated dir '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-[689778] [690729] Disconnected
+[1943012] Connection from 127.0.0.1:38918
+[1943012] Extended attribute "host": localhost
+[1943012] Request upload-pack for '/interp.git'
+[1943012] Interpolated dir '/build/reproducible-path/git-2.47.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[1942395] [1943012] Disconnected
 ok 22 - hostname interpolation works after LF-stripping
 
 Stopping git daemon ...
-Terminated
 # passed all 22 test(s)
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
@@ -358274,6 +358272,892 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5582-fetch-negative-refspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5582-fetch-negative-refspec/.git/
+expecting success of 5582.1 'setup': 
+	echo >file original &&
+	git add file &&
+	git commit -a -m original
+
+[main (root-commit) 7fb3fb8] original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
+
+expecting success of 5582.2 'clone and setup child repos': 
+	git clone . one &&
+	(
+		cd one &&
+		echo >file updated by one &&
+		git commit -a -m "updated by one" &&
+		git switch -c alternate &&
+		echo >file updated again by one &&
+		git commit -a -m "updated by one again" &&
+		git switch main
+	) &&
+	git clone . two &&
+	(
+		cd two &&
+		git config branch.main.remote one &&
+		git config remote.one.url ../one/.git/ &&
+		git config remote.one.fetch +refs/heads/*:refs/remotes/one/* &&
+		git config --add remote.one.fetch ^refs/heads/alternate
+	) &&
+	git clone . three
+
+Cloning into 'one'...
+done.
+[main ffc8fdd] updated by one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'alternate'
+[alternate 8a3fcb7] updated by one again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Your branch is ahead of 'origin/main' by 1 commit.
+  (use "git push" to publish your local commits)
+Cloning into 'two'...
+done.
+Cloning into 'three'...
+done.
+ok 2 - clone and setup child repos
+
+expecting success of 5582.3 'fetch one': 
+	echo >file updated by origin &&
+	git commit -a -m "updated by origin" &&
+	(
+		cd two &&
+		test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
+		git fetch one &&
+		test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
+		git rev-parse --verify refs/remotes/one/main &&
+		mine=$(git rev-parse refs/remotes/one/main) &&
+		his=$(cd ../one && git rev-parse refs/heads/main) &&
+		test "z$mine" = "z$his"
+	)
+
+[main 76a8623] updated by origin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+From ../one/
+ * [new branch]      main       -> one/main
+fatal: Needed a single revision
+ffc8fdde31e0177ad02216ab27bb483fc88169f2
+ok 3 - fetch one
+
+expecting success of 5582.4 'fetch with negative refspec on commandline': 
+	echo >file updated by origin again &&
+	git commit -a -m "updated by origin again" &&
+	(
+		cd three &&
+		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
+		echo $alternate_in_one >expect &&
+		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/main &&
+		cut -f -1 .git/FETCH_HEAD >actual &&
+		test_cmp expect actual
+	)
+
+[main c0ae31c] updated by origin again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From ../one/
+ * [new branch]      alternate  -> one/alternate
+ok 4 - fetch with negative refspec on commandline
+
+expecting success of 5582.5 'fetch with negative sha1 refspec fails': 
+	echo >file updated by origin yet again &&
+	git commit -a -m "updated by origin yet again" &&
+	(
+		cd three &&
+		main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
+		test_must_fail git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^$main_in_one
+	)
+
+[main e30c41c] updated by origin yet again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: invalid refspec '^ffc8fdde31e0177ad02216ab27bb483fc88169f2'
+ok 5 - fetch with negative sha1 refspec fails
+
+expecting success of 5582.6 'fetch with negative pattern refspec': 
+	echo >file updated by origin once more &&
+	git commit -a -m "updated by origin once more" &&
+	(
+		cd three &&
+		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
+		echo $alternate_in_one >expect &&
+		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/m* &&
+		cut -f -1 .git/FETCH_HEAD >actual &&
+		test_cmp expect actual
+	)
+
+[main c5395f8] updated by origin once more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - fetch with negative pattern refspec
+
+expecting success of 5582.7 'fetch with negative pattern refspec does not expand prefix': 
+	echo >file updated by origin another time &&
+	git commit -a -m "updated by origin another time" &&
+	(
+		cd three &&
+		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
+		main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
+		echo $alternate_in_one >expect &&
+		echo $main_in_one >>expect &&
+		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^main &&
+		cut -f -1 .git/FETCH_HEAD >actual &&
+		test_cmp expect actual
+	)
+
+[main b3d452f] updated by origin another time
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From ../one/
+ * [new branch]      main       -> one/main
+ok 7 - fetch with negative pattern refspec does not expand prefix
+
+expecting success of 5582.8 'fetch with negative refspec avoids duplicate conflict': 
+	(
+		cd one &&
+		git branch dups/a &&
+		git branch dups/b &&
+		git branch dups/c &&
+		git branch other/a &&
+		git rev-parse --verify refs/heads/other/a >../expect &&
+		git rev-parse --verify refs/heads/dups/b >>../expect &&
+		git rev-parse --verify refs/heads/dups/c >>../expect
+	) &&
+	(
+		cd three &&
+		git fetch ../one/.git ^refs/heads/dups/a refs/heads/dups/*:refs/dups/* refs/heads/other/a:refs/dups/a &&
+		git rev-parse --verify refs/dups/a >../actual &&
+		git rev-parse --verify refs/dups/b >>../actual &&
+		git rev-parse --verify refs/dups/c >>../actual
+	) &&
+	test_cmp expect actual
+
+From ../one/
+ * [new branch]      dups/b     -> refs/dups/b
+ * [new branch]      dups/c     -> refs/dups/c
+ * [new branch]      other/a    -> refs/dups/a
+ok 8 - fetch with negative refspec avoids duplicate conflict
+
+expecting success of 5582.9 'push --prune with negative refspec': 
+	(
+		cd two &&
+		git branch prune/a &&
+		git branch prune/b &&
+		git branch prune/c &&
+		git push ../three refs/heads/prune/* &&
+		git branch -d prune/a &&
+		git branch -d prune/b &&
+		git push --prune ../three refs/heads/prune/* ^refs/heads/prune/b
+	) &&
+	(
+		cd three &&
+		test_write_lines b c >expect &&
+		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/prune/ >actual &&
+		test_cmp expect actual
+	)
+
+To ../three
+ * [new branch]      prune/a -> prune/a
+ * [new branch]      prune/b -> prune/b
+ * [new branch]      prune/c -> prune/c
+Deleted branch prune/a (was 7fb3fb8).
+Deleted branch prune/b (was 7fb3fb8).
+To ../three
+ - [deleted]         prune/a
+ok 9 - push --prune with negative refspec
+
+expecting success of 5582.10 'push --prune with negative refspec apply to the destination': 
+	(
+		cd two &&
+		git branch ours/a &&
+		git branch ours/b &&
+		git branch ours/c &&
+		git push ../three refs/heads/ours/*:refs/heads/theirs/* &&
+		git branch -d ours/a &&
+		git branch -d ours/b &&
+		git push --prune ../three refs/heads/ours/*:refs/heads/theirs/* ^refs/heads/theirs/b
+	) &&
+	(
+		cd three &&
+		test_write_lines b c >expect &&
+		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/theirs/ >actual &&
+		test_cmp expect actual
+	)
+
+To ../three
+ * [new branch]      ours/a -> theirs/a
+ * [new branch]      ours/b -> theirs/b
+ * [new branch]      ours/c -> theirs/c
+Deleted branch ours/a (was 7fb3fb8).
+Deleted branch ours/b (was 7fb3fb8).
+To ../three
+ - [deleted]         theirs/a
+ok 10 - push --prune with negative refspec apply to the destination
+
+expecting success of 5582.11 'fetch --prune with negative refspec': 
+	(
+		cd two &&
+		git branch fetch/a &&
+		git branch fetch/b &&
+		git branch fetch/c
+	) &&
+	(
+		cd three &&
+		git fetch ../two/.git refs/heads/fetch/*:refs/heads/copied/*
+	) &&
+	(
+		cd two &&
+		git branch -d fetch/a &&
+		git branch -d fetch/b
+	) &&
+	(
+		cd three &&
+		test_write_lines b c >expect &&
+		git fetch -v ../two/.git --prune refs/heads/fetch/*:refs/heads/copied/* ^refs/heads/fetch/b &&
+		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/copied/ >actual &&
+		test_cmp expect actual
+	)
+
+From ../two/
+ * [new branch]      fetch/a    -> copied/a
+ * [new branch]      fetch/b    -> copied/b
+ * [new branch]      fetch/c    -> copied/c
+Deleted branch fetch/a (was 7fb3fb8).
+Deleted branch fetch/b (was 7fb3fb8).
+From ../two/
+ - [deleted]         (none)     -> copied/a
+ = [up to date]      fetch/c    -> copied/c
+ok 11 - fetch --prune with negative refspec
+
+expecting success of 5582.12 'push with matching : and negative refspec': 
+	# Manually handle cleanup, since test_config is not
+	# prepared to take arbitrary options like --add
+	test_when_finished "test_unconfig -C two remote.one.push" &&
+
+	# For convenience, we use "master" to refer to the name of
+	# the branch created by default in the following.
+	#
+	# Repositories two and one have branches other than "master"
+	# but they have no overlap---"master" is the only one that
+	# is shared between them.  And the master branch at two is
+	# behind the master branch at one by one commit.
+	git -C two config --add remote.one.push : &&
+
+	# A matching push tries to update master, fails due to non-ff
+	test_must_fail git -C two push one &&
+
+	# "master" may actually not be "master"---find it out.
+	current=$(git symbolic-ref HEAD) &&
+
+	# If master is in negative refspec, then the command will not attempt
+	# to push and succeed.
+	git -C two config --add remote.one.push "^$current" &&
+
+	# With "master" excluded, this push is a no-op.  Nothing gets
+	# pushed and it succeeds.
+	git -C two push -v one
+
+To ../one/.git/
+ ! [rejected]        main -> main (non-fast-forward)
+error: failed to push some refs to '../one/.git/'
+hint: Updates were rejected because the tip of your current branch is behind
+hint: its remote counterpart. If you want to integrate the remote changes,
+hint: use 'git pull' before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+Pushing to ../one/.git/
+Everything up-to-date
+ok 12 - push with matching : and negative refspec
+
+expecting success of 5582.13 'push with matching +: and negative refspec': 
+	test_when_finished "test_unconfig -C two remote.one.push" &&
+
+	# The same set-up as above, whose side-effect was a no-op.
+	git -C two config --add remote.one.push +: &&
+
+	# The push refuses to update the "master" branch that is checked
+	# out in the "one" repository, even when it is forced with +:
+	test_must_fail git -C two push one &&
+
+	# "master" may actually not be "master"---find it out.
+	current=$(git symbolic-ref HEAD) &&
+
+	# If master is in negative refspec, then the command will not attempt
+	# to push and succeed
+	git -C two config --add remote.one.push "^$current" &&
+
+	# With "master" excluded, this push is a no-op.  Nothing gets
+	# pushed and it succeeds.
+	git -C two push -v one
+
+remote: error: refusing to update checked out branch: refs/heads/main        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To ../one/.git/
+ ! [remote rejected] main -> main (branch is currently checked out)
+error: failed to push some refs to '../one/.git/'
+Pushing to ../one/.git/
+Everything up-to-date
+ok 13 - push with matching +: and negative refspec
+
+expecting success of 5582.14 '--prefetch correctly modifies refspecs': 
+	git -C one config --unset-all remote.origin.fetch &&
+	git -C one config --add remote.origin.fetch ^refs/heads/bogus/ignore &&
+	git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
+	git -C one config --add remote.origin.fetch "refs/heads/bogus/*:bogus/*" &&
+
+	git tag -a -m never never-fetch-tag HEAD &&
+
+	git branch bogus/fetched HEAD~1 &&
+	git branch bogus/ignore HEAD &&
+
+	git -C one fetch --prefetch --no-tags &&
+	test_must_fail git -C one rev-parse never-fetch-tag &&
+	git -C one rev-parse refs/prefetch/bogus/fetched &&
+	test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore &&
+
+	# correctly handle when refspec set becomes empty
+	# after removing the refs/tags/* refspec.
+	git -C one config --unset-all remote.origin.fetch &&
+	git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
+
+	git -C one fetch --prefetch --no-tags &&
+	test_must_fail git -C one rev-parse never-fetch-tag &&
+
+	# The refspec for refs that are not fully qualified
+	# are filtered multiple times.
+	git -C one rev-parse refs/prefetch/bogus/fetched &&
+	test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore
+
+From /build/reproducible-path/git-2.47.2/t/trash directory.t5582-fetch-negative-refspec/.
+ * branch            main          -> FETCH_HEAD
+ * [new branch]      bogus/fetched -> refs/prefetch/bogus/fetched
+fatal: ambiguous argument 'never-fetch-tag': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+never-fetch-tag
+c5395f864a4757fc219a4848a19568f14918687f
+fatal: ambiguous argument 'refs/prefetch/bogus/ignore': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/prefetch/bogus/ignore
+From /build/reproducible-path/git-2.47.2/t/trash directory.t5582-fetch-negative-refspec/.
+ * branch            main       -> FETCH_HEAD
+fatal: ambiguous argument 'never-fetch-tag': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+never-fetch-tag
+c5395f864a4757fc219a4848a19568f14918687f
+fatal: ambiguous argument 'refs/prefetch/bogus/ignore': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/prefetch/bogus/ignore
+ok 14 - --prefetch correctly modifies refspecs
+
+expecting success of 5582.15 '--prefetch succeeds when refspec becomes empty': 
+	git checkout bogus/fetched &&
+	test_commit extra &&
+
+	git -C one config --unset-all remote.origin.fetch &&
+	git -C one config --unset branch.main.remote &&
+	git -C one config remote.origin.fetch "+refs/tags/extra" &&
+	git -C one config remote.origin.skipfetchall true &&
+	git -C one config remote.origin.tagopt "--no-tags" &&
+
+	git -C one fetch --prefetch
+
+Switched to branch 'bogus/fetched'
+[bogus/fetched 8d8169a] extra
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 extra.t
+ok 15 - --prefetch succeeds when refspec becomes empty
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5574-fetch-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output/.git/
+expecting success of 5574.1 'fetch with invalid output format configuration': 
+	test_when_finished "rm -rf clone" &&
+	git clone . clone &&
+
+	test_must_fail git -C clone -c fetch.output fetch origin 2>actual.err &&
+	cat >expect <<-EOF &&
+	error: missing value for ${SQ}fetch.output${SQ}
+	fatal: unable to parse ${SQ}fetch.output${SQ} from command-line config
+	EOF
+	test_cmp expect actual.err &&
+
+	test_must_fail git -C clone -c fetch.output= fetch origin 2>actual.err &&
+	cat >expect <<-EOF &&
+	fatal: invalid value for ${SQ}fetch.output${SQ}: ${SQ}${SQ}
+	EOF
+	test_cmp expect actual.err &&
+
+	test_must_fail git -C clone -c fetch.output=garbage fetch origin 2>actual.err &&
+	cat >expect <<-EOF &&
+	fatal: invalid value for ${SQ}fetch.output${SQ}: ${SQ}garbage${SQ}
+	EOF
+	test_cmp expect actual.err
+
+Cloning into 'clone'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 1 - fetch with invalid output format configuration
+
+expecting success of 5574.2 'fetch aligned output': 
+	git clone . full-output &&
+	test_commit looooooooooooong-tag &&
+	(
+		cd full-output &&
+		git -c fetch.output=full fetch origin >actual 2>&1 &&
+		grep -e "->" actual | cut -c 22- >../actual
+	) &&
+	cat >expect <<-\EOF &&
+	main                 -> origin/main
+	looooooooooooong-tag -> looooooooooooong-tag
+	EOF
+	test_cmp expect actual
+
+Cloning into 'full-output'...
+warning: You appear to have cloned an empty repository.
+done.
+[main (root-commit) c62a462] looooooooooooong-tag
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 looooooooooooong-tag.t
+ok 2 - fetch aligned output
+
+expecting success of 5574.3 'fetch compact output': 
+	git clone . compact &&
+	test_commit extraaa &&
+	(
+		cd compact &&
+		git -c fetch.output=compact fetch origin >actual 2>&1 &&
+		grep -e "->" actual | cut -c 22- >../actual
+	) &&
+	cat >expect <<-\EOF &&
+	main       -> origin/*
+	extraaa    -> *
+	EOF
+	test_cmp expect actual
+
+Cloning into 'compact'...
+done.
+[main 7229363] extraaa
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 extraaa.t
+ok 3 - fetch compact output
+
+expecting success of 5574.4 'setup for fetch porcelain output': 
+	# Set up a bunch of references that we can use to demonstrate different
+	# kinds of flag symbols in the output format.
+	test_commit commit-for-porcelain-output &&
+	MAIN_OLD=$(git rev-parse HEAD) &&
+	git branch "fast-forward" &&
+	git branch "deleted-branch" &&
+	git checkout -b force-updated &&
+	test_commit --no-tag force-update-old &&
+	FORCE_UPDATED_OLD=$(git rev-parse HEAD) &&
+	git checkout main &&
+
+	# Backup to preseed.git
+	git clone --mirror . preseed.git &&
+
+	# Continue changing our local references.
+	git branch new-branch &&
+	git branch -d deleted-branch &&
+	git checkout fast-forward &&
+	test_commit --no-tag fast-forward-new &&
+	FAST_FORWARD_NEW=$(git rev-parse HEAD) &&
+	git checkout force-updated &&
+	git reset --hard HEAD~ &&
+	test_commit --no-tag force-update-new &&
+	FORCE_UPDATED_NEW=$(git rev-parse HEAD)
+
+[main 4755660] commit-for-porcelain-output
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-porcelain-output.t
+Switched to a new branch 'force-updated'
+[force-updated 9969fa4] force-update-old
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 force-update-old.t
+Switched to branch 'main'
+Cloning into bare repository 'preseed.git'...
+done.
+Deleted branch deleted-branch (was 4755660).
+Switched to branch 'fast-forward'
+[fast-forward 6181e78] fast-forward-new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fast-forward-new.t
+Switched to branch 'force-updated'
+HEAD is now at 4755660 commit-for-porcelain-output
+[force-updated 7157201] force-update-new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 force-update-new.t
+ok 4 - setup for fetch porcelain output
+
+expecting success of 5574.5 'fetch porcelain output ': 
+		test_when_finished "rm -rf porcelain" &&
+
+		# Clone and pre-seed the repositories. We fetch references into two
+		# namespaces so that we can test that rejected and force-updated
+		# references are reported properly.
+		refspecs="refs/heads/*:refs/unforced/* +refs/heads/*:refs/forced/*" &&
+		git clone preseed.git porcelain &&
+		git -C porcelain fetch origin $opt $refspecs &&
+
+		cat >expect <<-EOF &&
+		- $MAIN_OLD $ZERO_OID refs/forced/deleted-branch
+		- $MAIN_OLD $ZERO_OID refs/unforced/deleted-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/unforced/fast-forward
+		! $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/unforced/force-updated
+		* $ZERO_OID $MAIN_OLD refs/unforced/new-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/forced/fast-forward
+		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/forced/force-updated
+		* $ZERO_OID $MAIN_OLD refs/forced/new-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/remotes/origin/fast-forward
+		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/remotes/origin/force-updated
+		* $ZERO_OID $MAIN_OLD refs/remotes/origin/new-branch
+		EOF
+
+		# Change the URL of the repository to fetch different references.
+		git -C porcelain remote set-url origin .. &&
+
+		# Execute a dry-run fetch first. We do this to assert that the dry-run
+		# and non-dry-run fetches produces the same output. Execution of the
+		# fetch is expected to fail as we have a rejected reference update.
+		test_must_fail git -C porcelain fetch $opt \
+			--porcelain --dry-run --prune origin $refspecs >actual &&
+		test_cmp expect actual &&
+
+		# And now we perform a non-dry-run fetch.
+		test_must_fail git -C porcelain fetch $opt \
+			--porcelain --prune origin $refspecs >actual 2>stderr &&
+		test_cmp expect actual &&
+		test_must_be_empty stderr
+	
+Cloning into 'porcelain'...
+done.
+From /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output/preseed
+ * [new branch]      deleted-branch -> refs/unforced/deleted-branch
+ * [new branch]      fast-forward   -> refs/unforced/fast-forward
+ * [new branch]      force-updated  -> refs/unforced/force-updated
+ * [new branch]      main           -> refs/unforced/main
+ * [new branch]      deleted-branch -> refs/forced/deleted-branch
+ * [new branch]      fast-forward   -> refs/forced/fast-forward
+ * [new branch]      force-updated  -> refs/forced/force-updated
+ * [new branch]      main           -> refs/forced/main
+ok 5 - fetch porcelain output 
+
+expecting success of 5574.6 'fetch porcelain output (atomic)': 
+		test_when_finished "rm -rf porcelain" &&
+
+		# Clone and pre-seed the repositories. We fetch references into two
+		# namespaces so that we can test that rejected and force-updated
+		# references are reported properly.
+		refspecs="refs/heads/*:refs/unforced/* +refs/heads/*:refs/forced/*" &&
+		git clone preseed.git porcelain &&
+		git -C porcelain fetch origin $opt $refspecs &&
+
+		cat >expect <<-EOF &&
+		- $MAIN_OLD $ZERO_OID refs/forced/deleted-branch
+		- $MAIN_OLD $ZERO_OID refs/unforced/deleted-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/unforced/fast-forward
+		! $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/unforced/force-updated
+		* $ZERO_OID $MAIN_OLD refs/unforced/new-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/forced/fast-forward
+		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/forced/force-updated
+		* $ZERO_OID $MAIN_OLD refs/forced/new-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/remotes/origin/fast-forward
+		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/remotes/origin/force-updated
+		* $ZERO_OID $MAIN_OLD refs/remotes/origin/new-branch
+		EOF
+
+		# Change the URL of the repository to fetch different references.
+		git -C porcelain remote set-url origin .. &&
+
+		# Execute a dry-run fetch first. We do this to assert that the dry-run
+		# and non-dry-run fetches produces the same output. Execution of the
+		# fetch is expected to fail as we have a rejected reference update.
+		test_must_fail git -C porcelain fetch $opt \
+			--porcelain --dry-run --prune origin $refspecs >actual &&
+		test_cmp expect actual &&
+
+		# And now we perform a non-dry-run fetch.
+		test_must_fail git -C porcelain fetch $opt \
+			--porcelain --prune origin $refspecs >actual 2>stderr &&
+		test_cmp expect actual &&
+		test_must_be_empty stderr
+	
+Cloning into 'porcelain'...
+done.
+From /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output/preseed
+ * [new branch]      deleted-branch -> refs/unforced/deleted-branch
+ * [new branch]      fast-forward   -> refs/unforced/fast-forward
+ * [new branch]      force-updated  -> refs/unforced/force-updated
+ * [new branch]      main           -> refs/unforced/main
+ * [new branch]      deleted-branch -> refs/forced/deleted-branch
+ * [new branch]      fast-forward   -> refs/forced/fast-forward
+ * [new branch]      force-updated  -> refs/forced/force-updated
+ * [new branch]      main           -> refs/forced/main
+ok 6 - fetch porcelain output (atomic)
+
+expecting success of 5574.7 'fetch porcelain with multiple remotes': 
+	test_when_finished "rm -rf porcelain" &&
+
+	git switch --create multiple-remotes &&
+	git clone . porcelain &&
+	git -C porcelain remote add second-remote "$PWD" &&
+	git -C porcelain fetch second-remote &&
+
+	test_commit --no-tag multi-commit &&
+	old_commit=$(git rev-parse HEAD~) &&
+	new_commit=$(git rev-parse HEAD) &&
+
+	cat >expect <<-EOF &&
+	  $old_commit $new_commit refs/remotes/origin/multiple-remotes
+	  $old_commit $new_commit refs/remotes/second-remote/multiple-remotes
+	EOF
+
+	git -C porcelain fetch --porcelain --all >actual 2>stderr &&
+	test_cmp expect actual &&
+	test_must_be_empty stderr
+
+Switched to a new branch 'multiple-remotes'
+Cloning into 'porcelain'...
+done.
+From /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output
+ * [new branch]      fast-forward     -> second-remote/fast-forward
+ * [new branch]      force-updated    -> second-remote/force-updated
+ * [new branch]      main             -> second-remote/main
+ * [new branch]      multiple-remotes -> second-remote/multiple-remotes
+ * [new branch]      new-branch       -> second-remote/new-branch
+[multiple-remotes 9d09634] multi-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 multi-commit.t
+ok 7 - fetch porcelain with multiple remotes
+
+expecting success of 5574.8 'fetch porcelain refuses to work with submodules': 
+	test_when_finished "rm -rf porcelain" &&
+
+	cat >expect <<-EOF &&
+	fatal: options ${SQ}--porcelain${SQ} and ${SQ}--recurse-submodules${SQ} cannot be used together
+	EOF
+
+	git init porcelain &&
+	test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=yes 2>stderr &&
+	test_cmp expect stderr &&
+
+	test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=on-demand 2>stderr &&
+	test_cmp expect stderr
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output/porcelain/.git/
+ok 8 - fetch porcelain refuses to work with submodules
+
+expecting success of 5574.9 'fetch porcelain overrides fetch.output config': 
+	test_when_finished "rm -rf porcelain" &&
+
+	git switch --create config-override &&
+	git clone . porcelain &&
+	test_commit new-commit &&
+	old_commit=$(git rev-parse HEAD~) &&
+	new_commit=$(git rev-parse HEAD) &&
+
+	cat >expect <<-EOF &&
+	  $old_commit $new_commit refs/remotes/origin/config-override
+	* $ZERO_OID $new_commit refs/tags/new-commit
+	EOF
+
+	git -C porcelain -c fetch.output=compact fetch --porcelain >stdout 2>stderr &&
+	test_must_be_empty stderr &&
+	test_cmp expect stdout
+
+Switched to a new branch 'config-override'
+Cloning into 'porcelain'...
+done.
+[config-override ead9d61] new-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-commit.t
+ok 9 - fetch porcelain overrides fetch.output config
+
+expecting success of 5574.10 'fetch --no-porcelain overrides previous --porcelain': 
+	test_when_finished "rm -rf no-porcelain" &&
+
+	git switch --create no-porcelain &&
+	git clone . no-porcelain &&
+	test_commit --no-tag no-porcelain &&
+	old_commit=$(git rev-parse --short HEAD~) &&
+	new_commit=$(git rev-parse --short HEAD) &&
+
+	cat >expect <<-EOF &&
+	From $(test-tool path-utils real_path .)/.
+	   $old_commit..$new_commit  no-porcelain -> origin/no-porcelain
+	EOF
+
+	git -C no-porcelain fetch --porcelain --no-porcelain >stdout 2>stderr &&
+	test_cmp expect stderr &&
+	test_must_be_empty stdout
+
+Switched to a new branch 'no-porcelain'
+Cloning into 'no-porcelain'...
+done.
+[no-porcelain cf8719e] no-porcelain
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 no-porcelain.t
+ok 10 - fetch --no-porcelain overrides previous --porcelain
+
+expecting success of 5574.11 'fetch output with HEAD': 
+	test_when_finished "rm -rf head" &&
+	git clone . head &&
+
+	git -C head fetch --dry-run origin HEAD >actual.out 2>actual.err &&
+	cat >expect <<-EOF &&
+	From $(test-tool path-utils real_path .)/.
+	 * branch            HEAD       -> FETCH_HEAD
+	EOF
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err &&
+
+	git -C head fetch origin HEAD >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err &&
+
+	git -C head fetch --dry-run origin HEAD:foo >actual.out 2>actual.err &&
+	cat >expect <<-EOF &&
+	From $(test-tool path-utils real_path .)/.
+	 * [new ref]         HEAD       -> foo
+	EOF
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err &&
+
+	git -C head fetch origin HEAD:foo >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err
+
+Cloning into 'head'...
+done.
+ok 11 - fetch output with HEAD
+
+expecting success of 5574.12 'fetch porcelain output with HEAD': 
+	test_when_finished "rm -rf head" &&
+	git clone . head &&
+	COMMIT_ID=$(git rev-parse HEAD) &&
+
+	git -C head fetch --porcelain --dry-run origin HEAD >actual &&
+	cat >expect <<-EOF &&
+	* $ZERO_OID $COMMIT_ID FETCH_HEAD
+	EOF
+	test_cmp expect actual &&
+
+	git -C head fetch --porcelain origin HEAD >actual &&
+	test_cmp expect actual &&
+
+	git -C head fetch --porcelain --dry-run origin HEAD:foo >actual &&
+	cat >expect <<-EOF &&
+	* $ZERO_OID $COMMIT_ID refs/heads/foo
+	EOF
+	test_cmp expect actual &&
+
+	git -C head fetch --porcelain origin HEAD:foo >actual &&
+	test_cmp expect actual
+
+Cloning into 'head'...
+done.
+ok 12 - fetch porcelain output with HEAD
+
+expecting success of 5574.13 'fetch output with object ID': 
+	test_when_finished "rm -rf object-id" &&
+	git clone . object-id &&
+	commit=$(git rev-parse HEAD) &&
+
+	git -C object-id fetch --dry-run origin $commit:object-id >actual.out 2>actual.err &&
+	cat >expect <<-EOF &&
+	From $(test-tool path-utils real_path .)/.
+	 * [new ref]         $commit -> object-id
+	EOF
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err &&
+
+	git -C object-id fetch origin $commit:object-id >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err
+
+Cloning into 'object-id'...
+done.
+ok 13 - fetch output with object ID
+
+expecting success of 5574.14 '--no-show-forced-updates': 
+	mkdir forced-updates &&
+	(
+		cd forced-updates &&
+		git init &&
+		test_commit 1 &&
+		test_commit 2
+	) &&
+	git clone forced-updates forced-update-clone &&
+	git clone forced-updates no-forced-update-clone &&
+	git -C forced-updates reset --hard HEAD~1 &&
+	(
+		cd forced-update-clone &&
+		git fetch --show-forced-updates origin 2>output &&
+		test_grep "(forced update)" output
+	) &&
+	(
+		cd no-forced-update-clone &&
+		git fetch --no-show-forced-updates origin 2>output &&
+		test_grep ! "(forced update)" output
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output/forced-updates/.git/
+[main (root-commit) 925a26a] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[main 3d049f7] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+Cloning into 'forced-update-clone'...
+done.
+Cloning into 'no-forced-update-clone'...
+done.
+HEAD is now at 925a26a 1
+ + 3d049f7...925a26a main       -> origin/main  (forced update)
+ok 14 - --no-show-forced-updates
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5500-fetch-pack.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5500-fetch-pack/.git/
 expecting success of 5500.1 'setup': 
@@ -358392,8 +359276,8 @@
 remote: Enumerating objects: 192, done.        
 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)
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)
remote: Total 192 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
-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 | 303.00 KiB/s, 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 | 417.00 KiB/s, done.
 pack	d6698cfcaf6e075007fcb2123d8a138210d6d911
 27f494dfb7e67d2f9cd2282404adf1d97581aa34 refs/heads/B
 notice: HEAD points to an unborn branch (r)
@@ -358469,8 +359353,8 @@
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
 origin/B
-{"event":"data_json","sid":"20260304T075953.298144Z-H8d819085-P0009d81b","thread":"main","time":"2026-03-04T07:59:53.313233Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.015292,"t_rel":0.015292,"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":"20260304T075953.298144Z-H8d819085-P0009d81b","thread":"main","time":"2026-03-04T07:59:53.313233Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.015292,"t_rel":0.015292,"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":"20250130T021301.588840Z-H5c947e1c-P001d147a","thread":"main","time":"2025-01-30T02:13:01.603543Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.014918,"t_rel":0.014918,"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":"20250130T021301.588840Z-H5c947e1c-P001d147a","thread":"main","time":"2025-01-30T02:13:01.603543Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.014918,"t_rel":0.014918,"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': 
@@ -358480,7 +359364,7 @@
 	grep \"fetch-info\".*\"depth\":1 shallow0/trace2_event
 
 Cloning into 'shallow0'...
-{"event":"data_json","sid":"20260304T075953.529894Z-H8d819085-P0009d8d3","thread":"main","time":"2026-03-04T07:59:53.536305Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.006658,"t_rel":0.006658,"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":"20250130T021301.825285Z-H5c947e1c-P001d1535","thread":"main","time":"2025-01-30T02:13:01.828515Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.003437,"t_rel":0.003437,"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': 
@@ -358613,8 +359497,8 @@
 Fast-forward
  test.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-{"event":"data_json","sid":"20260304T075955.127156Z-H8d819085-P0009df60/20260304T075955.138420Z-H8d819085-P0009df6e/20260304T075955.174097Z-H8d819085-P0009df8b","thread":"main","time":"2026-03-04T07:59:55.180779Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.006933,"t_rel":0.006933,"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":"20260304T075955.127156Z-H8d819085-P0009df60/20260304T075955.138420Z-H8d819085-P0009df6e/20260304T075955.174097Z-H8d819085-P0009df8b","thread":"main","time":"2026-03-04T07:59:55.180779Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.006933,"t_rel":0.006933,"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":"20250130T021303.854130Z-H5c947e1c-P001d1b5e/20250130T021303.872614Z-H5c947e1c-P001d1b68/20250130T021303.886038Z-H5c947e1c-P001d1b77","thread":"main","time":"2025-01-30T02:13:03.900302Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.014470,"t_rel":0.014470,"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":"20250130T021303.854130Z-H5c947e1c-P001d1b5e/20250130T021303.872614Z-H5c947e1c-P001d1b68/20250130T021303.886038Z-H5c947e1c-P001d1b77","thread":"main","time":"2025-01-30T02:13:03.900302Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.014470,"t_rel":0.014470,"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': 
@@ -358831,9 +359715,9 @@
 		grep \"fetch-info\".*\"depth\":2147483647 trace2_event
 	)
 
-{"event":"data_json","sid":"20260304T075955.127156Z-H8d819085-P0009df60/20260304T075955.138420Z-H8d819085-P0009df6e/20260304T075955.174097Z-H8d819085-P0009df8b","thread":"main","time":"2026-03-04T07:59:55.180779Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.006933,"t_rel":0.006933,"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":"20260304T075956.370248Z-H8d819085-P0009e4ba/20260304T075956.395451Z-H8d819085-P0009e4d2","thread":"main","time":"2026-03-04T07:59:56.400081Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.004847,"t_rel":0.004847,"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":"20260304T075956.370248Z-H8d819085-P0009e4ba/20260304T075956.395451Z-H8d819085-P0009e4d2","thread":"main","time":"2026-03-04T07:59:56.400081Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.004847,"t_rel":0.004847,"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":"20250130T021303.854130Z-H5c947e1c-P001d1b5e/20250130T021303.872614Z-H5c947e1c-P001d1b68/20250130T021303.886038Z-H5c947e1c-P001d1b77","thread":"main","time":"2025-01-30T02:13:03.900302Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.014470,"t_rel":0.014470,"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":"20250130T021305.230167Z-H5c947e1c-P001d1f94/20250130T021305.250055Z-H5c947e1c-P001d1fa1","thread":"main","time":"2025-01-30T02:13:05.258257Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.008420,"t_rel":0.008420,"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":"20250130T021305.230167Z-H5c947e1c-P001d1f94/20250130T021305.250055Z-H5c947e1c-P001d1fa1","thread":"main","time":"2025-01-30T02:13:05.258257Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.008420,"t_rel":0.008420,"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': 
@@ -359143,7 +360027,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 to_fetch.t
-{"event":"data","sid":"20260304T075959.786643Z-H8d819085-P0009f312","thread":"main","time":"2026-03-04T07:59:59.844574Z","file":"fetch-pack.c","line":1755,"repo":1,"t_abs":0.058143,"t_rel":0.010916,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"6"}
+{"event":"data","sid":"20250130T021309.646152Z-H5c947e1c-P001d2c4a","thread":"main","time":"2025-01-30T02:13:09.694836Z","file":"fetch-pack.c","line":1755,"repo":1,"t_abs":0.048903,"t_rel":0.015643,"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 resetted upon ACK
 
@@ -359432,7 +360316,7 @@
 remote: Counting objects:   0% (1/267)        
remote: Counting objects:   1% (3/267)        
remote: Counting objects:   2% (6/267)        
remote: Counting objects:   3% (9/267)        
remote: Counting objects:   4% (11/267)        
remote: Counting objects:   5% (14/267)        
remote: Counting objects:   6% (17/267)        
remote: Counting objects:   7% (19/267)        
remote: Counting objects:   8% (22/267)        
remote: Counting objects:   9% (25/267)        
remote: Counting objects:  10% (27/267)        
remote: Counting objects:  11% (30/267)        
remote: Counting objects:  12% (33/267)        
remote: Counting objects:  13% (35/267)        
remote: Counting objects:  14% (38/267)        
remote: Counting objects:  15% (41/267)        
remote: Counting objects:  16% (43/267)        
remote: Counting objects:  17% (46/267)        
remote: Counting objects:  18% (49/267)        
remote: Counting objects:  19% (51/267)        
remote: Counting objects:  20% (54/267)        
remote: Counting objects:  21% (57/267)        
remote: Counting objects:  22% (59/267)        
remote: Counting objects:  23% (62/267)        
remote: Counting objects:  24% (65/267)        
remote: Counting objects:  25% (67/267)        
remote: Counting objects:  26% (70/267)        
remote: Counting objects:  27% (73/267)        
remote: Counting objects:  28% (75/267)        
remote: Counting objects:  29% (78/267)        
remote: Counting objects:  30% (81/267)        
remote: Counting objects:  31% (83/267)        
remote: Counting objects:  32% (86/267)        
remote: Counting objects:  33% (89/267)        
remote: Counting objects:  34% (91/267)        
remote: Counting objects:  35% (94/267)        
remote: Counting objects:  36% (97/267)        
remote: Counting objects:  37% (99/267)        
remote: Counting objects:  38% (102/267)        
remote: Counting objects:  39% (105/267)        
remote: Counting objects:  40% (107/267)        
remote: Counting objects:  41% (110/267)        
remote: Counting objects:  42% (113/267)        
remote: Counting objects:  43% (115/267)        
remote: Counting objects:  44% (118/267)        
remote: Counting objects:  45% (121/267)        
remote: Counting objects:  46% (123/267)        
remote: Counting objects:  47% (126/267)        
remote: Counting objects:  48% (129/267)        
remote: Counting objects:  49% (131/267)        
remote: Counting objects:  50% (134/267)        
remote: Counting objects:  51% (137/267)        
remote: Counting objects:  52% (139/267)        
remote: Counting objects:  53% (142/267)        
remote: Counting objects:  54% (145/267)        
remote: Counting objects:  55% (147/267)        
remote: Counting objects:  56% (150/267)        
remote: Counting objects:  57% (153/267)        
remote: Counting objects:  58% (155/267)        
remote: Counting objects:  59% (158/267)        
remote: Counting objects:  60% (161/267)        
remote: Counting objects:  61% (163/267)        
remote: Counting objects:  62% (166/267)        
remote: Counting objects:  63% (169/267)        
remote: Counting objects:  64% (171/267)        
remote: Counting objects:  65% (174/267)        
remote: Counting objects:  66% (177/267)        
remote: Counting objects:  67% (179/267)        
remote: Counting objects:  68% (182/267)        
remote: Counting objects:  69% (185/267)        
remote: Counting objects:  70% (187/267)        
remote: Counting objects:  71% (190/267)        
remote: Counting objects:  72% (193/267)        
remote: Counting objects:  73% (195/267)        
remote: Counting objects:  74% (198/267)        
remote: Counting objects:  75% (201/267)        
remote: Counting objects:  76% (203/267)        
remote: Counting objects:  77% (206/267)        
remote: Counting objects:  78% (209/267)        
remote: Counting objects:  79% (211/267)        
remote: Counting objects:  80% (214/267)        
remote: Counting objects:  81% (217/267)        
remote: Counting objects:  82% (219/267)        
remote: Counting objects:  83% (222/267)        
remote: Counting objects:  84% (225/267)        
remote: Counting objects:  85% (227/267)        
remote: Counting objects:  86% (230/267)        
remote: Counting objects:  87% (233/267)        
remote: Counting objects:  88% (235/267)        
remote: Counting objects:  89% (238/267)        
remote: Counting objects:  90% (241/267)        
remote: Counting objects:  91% (243/267)        
remote: Counting objects:  92% (246/267)        
remote: Counting objects:  93% (249/267)        
remote: Counting objects:  94% (251/267)        
remote: Counting objects:  95% (254/267)        
remote: Counting objects:  96% (257/267)        
remote: Counting objects:  97% (259/267)        
remote: Counting objects:  98% (262/267)        
remote: Counting objects:  99% (265/267)        
remote: Counting objects: 100% (267/267)        
remote: Counting objects: 100% (267/267), done.        
 remote: Compressing objects:   1% (1/96)        
remote: Compressing objects:   2% (2/96)        
remote: Compressing objects:   3% (3/96)        
remote: Compressing objects:   4% (4/96)        
remote: Compressing objects:   5% (5/96)        
remote: Compressing objects:   6% (6/96)        
remote: Compressing objects:   7% (7/96)        
remote: Compressing objects:   8% (8/96)        
remote: Compressing objects:   9% (9/96)        
remote: Compressing objects:  10% (10/96)        
remote: Compressing objects:  11% (11/96)        
remote: Compressing objects:  12% (12/96)        
remote: Compressing objects:  13% (13/96)        
remote: Compressing objects:  14% (14/96)        
remote: Compressing objects:  15% (15/96)        
remote: Compressing objects:  16% (16/96)        
remote: Compressing objects:  17% (17/96)        
remote: Compressing objects:  18% (18/96)        
remote: Compressing objects:  19% (19/96)        
remote: Compressing objects:  20% (20/96)        
remote: Compressing objects:  21% (21/96)        
remote: Compressing objects:  22% (22/96)        
remote: Compressing objects:  23% (23/96)        
remote: Compressing objects:  25% (24/96)        
remote: Compressing objects:  26% (25/96)        
remote: Compressing objects:  27% (26/96)        
remote: Compressing objects:  28% (27/96)        
remote: Compressing objects:  29% (28/96)        
remote: Compressing objects:  30% (29/96)        
remote: Compressing objects:  31% (30/96)        
remote: Compressing objects:  32% (31/96)        
remote: Compressing objects:  33% (32/96)        
remote: Compressing objects:  34% (33/96)        
remote: Compressing objects:  35% (34/96)        
remote: Compressing objects:  36% (35/96)        
remote: Compressing objects:  37% (36/96)        
remote: Compressing objects:  38% (37/96)        
remote: Compressing objects:  39% (38/96)        
remote: Compressing objects:  40% (39/96)        
remote: Compressing objects:  41% (40/96)        
remote: Compressing objects:  42% (41/96)        
remote: Compressing objects:  43% (42/96)        
remote: Compressing objects:  44% (43/96)        
remote: Compressing objects:  45% (44/96)        
remote: Compressing objects:  46% (45/96)        
remote: Compressing objects:  47% (46/96)        
remote: Compressing objects:  48% (47/96)        
remote: Compressing objects:  50% (48/96)        
remote: Compressing objects:  51% (49/96)        
remote: Compressing objects:  52% (50/96)        
remote: Compressing objects:  53% (51/96)        
remote: Compressing objects:  54% (52/96)        
remote: Compressing objects:  55% (53/96)        
remote: Compressing objects:  56% (54/96)        
remote: Compressing objects:  57% (55/96)        
remote: Compressing objects:  58% (56/96)        
remote: Compressing objects:  59% (57/96)        
remote: Compressing objects:  60% (58/96)        
remote: Compressing objects:  61% (59/96)        
remote: Compressing objects:  62% (60/96)        
remote: Compressing objects:  63% (61/96)        
remote: Compressing objects:  64% (62/96)        
remote: Compressing objects:  65% (63/96)        
remote: Compressing objects:  66% (64/96)        
remote: Compressing objects:  67% (65/96)        
remote: Compressing objects:  68% (66/96)        
remote: Compressing objects:  69% (67/96)        
remote: Compressing objects:  70% (68/96)        
remote: Compressing objects:  71% (69/96)        
remote: Compressing objects:  72% (70/96)        
remote: Compressing objects:  73% (71/96)        
remote: Compressing objects:  75% (72/96)        
remote: Compressing objects:  76% (73/96)        
remote: Compressing objects:  77% (74/96)        
remote: Compressing objects:  78% (75/96)        
remote: Compressing objects:  79% (76/96)        
remote: Compressing objects:  80% (77/96)        
remote: Compressing objects:  81% (78/96)        
remote: Compressing objects:  82% (79/96)        
remote: Compressing objects:  83% (80/96)        
remote: Compressing objects:  84% (81/96)        
remote: Compressing objects:  85% (82/96)        
remote: Compressing objects:  86% (83/96)        
remote: Compressing objects:  87% (84/96)        
remote: Compressing objects:  88% (85/96)        
remote: Compressing objects:  89% (86/96)        
remote: Compressing objects:  90% (87/96)        
remote: Compressing objects:  91% (88/96)        
remote: Compressing objects:  92% (89/96)        
remote: Compressing objects:  93% (90/96)        
remote: Compressing objects:  94% (91/96)        
remote: Compressing objects:  95% (92/96)        
remote: Compressing objects:  96% (93/96)        
remote: Compressing objects:  97% (94/96)        
remote: Compressing objects:  98% (95/96)        
remote: Compressing objects: 100% (96/96)        
remote: Compressing objects: 100% (96/96), done.        
 Receiving objects:   0% (1/267)
Receiving objects:   1% (3/267)
Receiving objects:   2% (6/267)
Receiving objects:   3% (9/267)
Receiving objects:   4% (11/267)
Receiving objects:   5% (14/267)
Receiving objects:   6% (17/267)
Receiving objects:   7% (19/267)
Receiving objects:   8% (22/267)
Receiving objects:   9% (25/267)
Receiving objects:  10% (27/267)
Receiving objects:  11% (30/267)
Receiving objects:  12% (33/267)
Receiving objects:  13% (35/267)
Receiving objects:  14% (38/267)
Receiving objects:  15% (41/267)
Receiving objects:  16% (43/267)
Receiving objects:  17% (46/267)
Receiving objects:  18% (49/267)
Receiving objects:  19% (51/267)
Receiving objects:  20% (54/267)
Receiving objects:  21% (57/267)
Receiving objects:  22% (59/267)
Receiving objects:  23% (62/267)
Receiving objects:  24% (65/267)
Receiving objects:  25% (67/267)
Receiving objects:  26% (70/267)
Receiving objects:  27% (73/267)
Receiving objects:  28% (75/267)
Receiving objects:  29% (78/267)
Receiving objects:  30% (81/267)
Receiving objects:  31% (83/267)
Receiving objects:  32% (86/267)
Receiving objects:  33% (89/267)
Receiving objects:  34% (91/267)
Receiving objects:  35% (94/267)
Receiving objects:  36% (97/267)
Receiving objects:  37% (99/267)
Receiving objects:  38% (102/267)
Receiving objects:  39% (105/267)
Receiving objects:  40% (107/267)
Receiving objects:  41% (110/267)
Receiving objects:  42% (113/267)
Receiving objects:  43% (115/267)
Receiving objects:  44% (118/267)
Receiving objects:  45% (121/267)
Receiving objects:  46% (123/267)
Receiving objects:  47% (126/267)
Receiving objects:  48% (129/267)
Receiving objects:  49% (131/267)
Receiving objects:  50% (134/267)
remote: Total 267 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)        
-Receiving objects:  51% (137/267)
Receiving objects:  52% (139/267)
Receiving objects:  53% (142/267)
Receiving objects:  54% (145/267)
Receiving objects:  55% (147/267)
Receiving objects:  56% (150/267)
Receiving objects:  57% (153/267)
Receiving objects:  58% (155/267)
Receiving objects:  59% (158/267)
Receiving objects:  60% (161/267)
Receiving objects:  61% (163/267)
Receiving objects:  62% (166/267)
Receiving objects:  63% (169/267)
Receiving objects:  64% (171/267)
Receiving objects:  65% (174/267)
Receiving objects:  66% (177/267)
Receiving objects:  67% (179/267)
Receiving objects:  68% (182/267)
Receiving objects:  69% (185/267)
Receiving objects:  70% (187/267)
Receiving objects:  71% (190/267)
Receiving objects:  72% (193/267)
Receiving objects:  73% (195/267)
Receiving objects:  74% (198/267)
Receiving objects:  75% (201/267)
Receiving objects:  76% (203/267)
Receiving objects:  77% (206/267)
Receiving objects:  78% (209/267)
Receiving objects:  79% (211/267)
Receiving objects:  80% (214/267)
Receiving objects:  81% (217/267)
Receiving objects:  82% (219/267)
Receiving objects:  83% (222/267)
Receiving objects:  84% (225/267)
Receiving objects:  85% (227/267)
Receiving objects:  86% (230/267)
Receiving objects:  87% (233/267)
Receiving objects:  88% (235/267)
Receiving objects:  89% (238/267)
Receiving objects:  90% (241/267)
Receiving objects:  91% (243/267)
Receiving objects:  92% (246/267)
Receiving objects:  93% (249/267)
Receiving objects:  94% (251/267)
Receiving objects:  95% (254/267)
Receiving objects:  96% (257/267)
Receiving objects:  97% (259/267)
Receiving objects:  98% (262/267)
Receiving objects:  99% (265/267)
Receiving objects: 100% (267/267)
Receiving objects: 100% (267/267), 22.41 KiB | 764.00 KiB/s, done.
+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 | 478.00 KiB/s, done.
 Resolving deltas:   0% (0/3)
Resolving deltas:  33% (1/3)
Resolving deltas:  66% (2/3)
Resolving deltas: 100% (3/3)
Resolving deltas: 100% (3/3), done.
 keep	af36a4e38ad65488701370467da12a1dc50c78d3
 70125409534829fdfcb67d82de93f86282574cb4 HEAD
@@ -361066,7 +361950,7 @@
 	test_cmp expected actual &&
 	grep \"fetch-info\".*\"deepen-since\":true shallow11/trace2_event
 
-{"event":"data_json","sid":"20260304T080032.378398Z-H8d819085-P000a8133/20260304T080032.391772Z-H8d819085-P000a8150","thread":"main","time":"2026-03-04T08:00:32.402336Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.010778,"t_rel":0.010778,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":1,"wants":1,"want-refs":0,"depth":0,"shallows":1,"deepen-since":true,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20250130T021352.170260Z-H5c947e1c-P001da306/20250130T021352.210001Z-H5c947e1c-P001da318","thread":"main","time":"2025-01-30T02:13:52.226193Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.016409,"t_rel":0.016409,"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': 
@@ -361360,7 +362244,7 @@
 remote: Counting objects:  50% (1/2)        
remote: Counting objects: 100% (2/2)        
remote: Counting objects: 100% (2/2), done.        
 remote: Total 2 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
 946f2fc4f06e44010ec7f3ed95172068b132ee22 HEAD
-{"event":"data_json","sid":"20260304T080036.774029Z-H8d819085-P000a93ab/20260304T080036.788808Z-H8d819085-P000a93d7","thread":"main","time":"2026-03-04T08:00:36.797881Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.009298,"t_rel":0.009298,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":1,"want-refs":0,"depth":0,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":"blob:limit"}}
+{"event":"data_json","sid":"20250130T021359.830312Z-H5c947e1c-P001db388/20250130T021359.849892Z-H5c947e1c-P001db395","thread":"main","time":"2025-01-30T02:13:59.868226Z","file":"upload-pack.c","line":1597,"repo":0,"t_abs":0.018526,"t_rel":0.018526,"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 373 - filtering by size
 
 expecting success of 5500.374 'filtering by size has no effect if support for it is not advertised': 
@@ -361425,1157 +362309,6 @@
 1..375
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5582-fetch-negative-refspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5582-fetch-negative-refspec/.git/
-expecting success of 5582.1 'setup': 
-	echo >file original &&
-	git add file &&
-	git commit -a -m original
-
-[main (root-commit) 7fb3fb8] original
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 5582.2 'clone and setup child repos': 
-	git clone . one &&
-	(
-		cd one &&
-		echo >file updated by one &&
-		git commit -a -m "updated by one" &&
-		git switch -c alternate &&
-		echo >file updated again by one &&
-		git commit -a -m "updated by one again" &&
-		git switch main
-	) &&
-	git clone . two &&
-	(
-		cd two &&
-		git config branch.main.remote one &&
-		git config remote.one.url ../one/.git/ &&
-		git config remote.one.fetch +refs/heads/*:refs/remotes/one/* &&
-		git config --add remote.one.fetch ^refs/heads/alternate
-	) &&
-	git clone . three
-
-Cloning into 'one'...
-done.
-[main ffc8fdd] updated by one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'alternate'
-[alternate 8a3fcb7] updated by one again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Your branch is ahead of 'origin/main' by 1 commit.
-  (use "git push" to publish your local commits)
-Cloning into 'two'...
-done.
-Cloning into 'three'...
-done.
-ok 2 - clone and setup child repos
-
-expecting success of 5582.3 'fetch one': 
-	echo >file updated by origin &&
-	git commit -a -m "updated by origin" &&
-	(
-		cd two &&
-		test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
-		git fetch one &&
-		test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
-		git rev-parse --verify refs/remotes/one/main &&
-		mine=$(git rev-parse refs/remotes/one/main) &&
-		his=$(cd ../one && git rev-parse refs/heads/main) &&
-		test "z$mine" = "z$his"
-	)
-
-[main 76a8623] updated by origin
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-From ../one/
- * [new branch]      main       -> one/main
-fatal: Needed a single revision
-ffc8fdde31e0177ad02216ab27bb483fc88169f2
-ok 3 - fetch one
-
-expecting success of 5582.4 'fetch with negative refspec on commandline': 
-	echo >file updated by origin again &&
-	git commit -a -m "updated by origin again" &&
-	(
-		cd three &&
-		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
-		echo $alternate_in_one >expect &&
-		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/main &&
-		cut -f -1 .git/FETCH_HEAD >actual &&
-		test_cmp expect actual
-	)
-
-[main c0ae31c] updated by origin again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From ../one/
- * [new branch]      alternate  -> one/alternate
-ok 4 - fetch with negative refspec on commandline
-
-expecting success of 5582.5 'fetch with negative sha1 refspec fails': 
-	echo >file updated by origin yet again &&
-	git commit -a -m "updated by origin yet again" &&
-	(
-		cd three &&
-		main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
-		test_must_fail git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^$main_in_one
-	)
-
-[main e30c41c] updated by origin yet again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: invalid refspec '^ffc8fdde31e0177ad02216ab27bb483fc88169f2'
-ok 5 - fetch with negative sha1 refspec fails
-
-expecting success of 5582.6 'fetch with negative pattern refspec': 
-	echo >file updated by origin once more &&
-	git commit -a -m "updated by origin once more" &&
-	(
-		cd three &&
-		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
-		echo $alternate_in_one >expect &&
-		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/m* &&
-		cut -f -1 .git/FETCH_HEAD >actual &&
-		test_cmp expect actual
-	)
-
-[main c5395f8] updated by origin once more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - fetch with negative pattern refspec
-
-expecting success of 5582.7 'fetch with negative pattern refspec does not expand prefix': 
-	echo >file updated by origin another time &&
-	git commit -a -m "updated by origin another time" &&
-	(
-		cd three &&
-		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
-		main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
-		echo $alternate_in_one >expect &&
-		echo $main_in_one >>expect &&
-		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^main &&
-		cut -f -1 .git/FETCH_HEAD >actual &&
-		test_cmp expect actual
-	)
-
-[main b3d452f] updated by origin another time
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From ../one/
- * [new branch]      main       -> one/main
-ok 7 - fetch with negative pattern refspec does not expand prefix
-
-expecting success of 5582.8 'fetch with negative refspec avoids duplicate conflict': 
-	(
-		cd one &&
-		git branch dups/a &&
-		git branch dups/b &&
-		git branch dups/c &&
-		git branch other/a &&
-		git rev-parse --verify refs/heads/other/a >../expect &&
-		git rev-parse --verify refs/heads/dups/b >>../expect &&
-		git rev-parse --verify refs/heads/dups/c >>../expect
-	) &&
-	(
-		cd three &&
-		git fetch ../one/.git ^refs/heads/dups/a refs/heads/dups/*:refs/dups/* refs/heads/other/a:refs/dups/a &&
-		git rev-parse --verify refs/dups/a >../actual &&
-		git rev-parse --verify refs/dups/b >>../actual &&
-		git rev-parse --verify refs/dups/c >>../actual
-	) &&
-	test_cmp expect actual
-
-From ../one/
- * [new branch]      dups/b     -> refs/dups/b
- * [new branch]      dups/c     -> refs/dups/c
- * [new branch]      other/a    -> refs/dups/a
-ok 8 - fetch with negative refspec avoids duplicate conflict
-
-expecting success of 5582.9 'push --prune with negative refspec': 
-	(
-		cd two &&
-		git branch prune/a &&
-		git branch prune/b &&
-		git branch prune/c &&
-		git push ../three refs/heads/prune/* &&
-		git branch -d prune/a &&
-		git branch -d prune/b &&
-		git push --prune ../three refs/heads/prune/* ^refs/heads/prune/b
-	) &&
-	(
-		cd three &&
-		test_write_lines b c >expect &&
-		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/prune/ >actual &&
-		test_cmp expect actual
-	)
-
-To ../three
- * [new branch]      prune/a -> prune/a
- * [new branch]      prune/b -> prune/b
- * [new branch]      prune/c -> prune/c
-Deleted branch prune/a (was 7fb3fb8).
-Deleted branch prune/b (was 7fb3fb8).
-To ../three
- - [deleted]         prune/a
-ok 9 - push --prune with negative refspec
-
-expecting success of 5582.10 'push --prune with negative refspec apply to the destination': 
-	(
-		cd two &&
-		git branch ours/a &&
-		git branch ours/b &&
-		git branch ours/c &&
-		git push ../three refs/heads/ours/*:refs/heads/theirs/* &&
-		git branch -d ours/a &&
-		git branch -d ours/b &&
-		git push --prune ../three refs/heads/ours/*:refs/heads/theirs/* ^refs/heads/theirs/b
-	) &&
-	(
-		cd three &&
-		test_write_lines b c >expect &&
-		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/theirs/ >actual &&
-		test_cmp expect actual
-	)
-
-To ../three
- * [new branch]      ours/a -> theirs/a
- * [new branch]      ours/b -> theirs/b
- * [new branch]      ours/c -> theirs/c
-Deleted branch ours/a (was 7fb3fb8).
-Deleted branch ours/b (was 7fb3fb8).
-To ../three
- - [deleted]         theirs/a
-ok 10 - push --prune with negative refspec apply to the destination
-
-expecting success of 5582.11 'fetch --prune with negative refspec': 
-	(
-		cd two &&
-		git branch fetch/a &&
-		git branch fetch/b &&
-		git branch fetch/c
-	) &&
-	(
-		cd three &&
-		git fetch ../two/.git refs/heads/fetch/*:refs/heads/copied/*
-	) &&
-	(
-		cd two &&
-		git branch -d fetch/a &&
-		git branch -d fetch/b
-	) &&
-	(
-		cd three &&
-		test_write_lines b c >expect &&
-		git fetch -v ../two/.git --prune refs/heads/fetch/*:refs/heads/copied/* ^refs/heads/fetch/b &&
-		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/copied/ >actual &&
-		test_cmp expect actual
-	)
-
-From ../two/
- * [new branch]      fetch/a    -> copied/a
- * [new branch]      fetch/b    -> copied/b
- * [new branch]      fetch/c    -> copied/c
-Deleted branch fetch/a (was 7fb3fb8).
-Deleted branch fetch/b (was 7fb3fb8).
-From ../two/
- - [deleted]         (none)     -> copied/a
- = [up to date]      fetch/c    -> copied/c
-ok 11 - fetch --prune with negative refspec
-
-expecting success of 5582.12 'push with matching : and negative refspec': 
-	# Manually handle cleanup, since test_config is not
-	# prepared to take arbitrary options like --add
-	test_when_finished "test_unconfig -C two remote.one.push" &&
-
-	# For convenience, we use "master" to refer to the name of
-	# the branch created by default in the following.
-	#
-	# Repositories two and one have branches other than "master"
-	# but they have no overlap---"master" is the only one that
-	# is shared between them.  And the master branch at two is
-	# behind the master branch at one by one commit.
-	git -C two config --add remote.one.push : &&
-
-	# A matching push tries to update master, fails due to non-ff
-	test_must_fail git -C two push one &&
-
-	# "master" may actually not be "master"---find it out.
-	current=$(git symbolic-ref HEAD) &&
-
-	# If master is in negative refspec, then the command will not attempt
-	# to push and succeed.
-	git -C two config --add remote.one.push "^$current" &&
-
-	# With "master" excluded, this push is a no-op.  Nothing gets
-	# pushed and it succeeds.
-	git -C two push -v one
-
-To ../one/.git/
- ! [rejected]        main -> main (non-fast-forward)
-error: failed to push some refs to '../one/.git/'
-hint: Updates were rejected because the tip of your current branch is behind
-hint: its remote counterpart. If you want to integrate the remote changes,
-hint: use 'git pull' before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-Pushing to ../one/.git/
-Everything up-to-date
-ok 12 - push with matching : and negative refspec
-
-expecting success of 5582.13 'push with matching +: and negative refspec': 
-	test_when_finished "test_unconfig -C two remote.one.push" &&
-
-	# The same set-up as above, whose side-effect was a no-op.
-	git -C two config --add remote.one.push +: &&
-
-	# The push refuses to update the "master" branch that is checked
-	# out in the "one" repository, even when it is forced with +:
-	test_must_fail git -C two push one &&
-
-	# "master" may actually not be "master"---find it out.
-	current=$(git symbolic-ref HEAD) &&
-
-	# If master is in negative refspec, then the command will not attempt
-	# to push and succeed
-	git -C two config --add remote.one.push "^$current" &&
-
-	# With "master" excluded, this push is a no-op.  Nothing gets
-	# pushed and it succeeds.
-	git -C two push -v one
-
-remote: error: refusing to update checked out branch: refs/heads/main        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To ../one/.git/
- ! [remote rejected] main -> main (branch is currently checked out)
-error: failed to push some refs to '../one/.git/'
-Pushing to ../one/.git/
-Everything up-to-date
-ok 13 - push with matching +: and negative refspec
-
-expecting success of 5582.14 '--prefetch correctly modifies refspecs': 
-	git -C one config --unset-all remote.origin.fetch &&
-	git -C one config --add remote.origin.fetch ^refs/heads/bogus/ignore &&
-	git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
-	git -C one config --add remote.origin.fetch "refs/heads/bogus/*:bogus/*" &&
-
-	git tag -a -m never never-fetch-tag HEAD &&
-
-	git branch bogus/fetched HEAD~1 &&
-	git branch bogus/ignore HEAD &&
-
-	git -C one fetch --prefetch --no-tags &&
-	test_must_fail git -C one rev-parse never-fetch-tag &&
-	git -C one rev-parse refs/prefetch/bogus/fetched &&
-	test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore &&
-
-	# correctly handle when refspec set becomes empty
-	# after removing the refs/tags/* refspec.
-	git -C one config --unset-all remote.origin.fetch &&
-	git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
-
-	git -C one fetch --prefetch --no-tags &&
-	test_must_fail git -C one rev-parse never-fetch-tag &&
-
-	# The refspec for refs that are not fully qualified
-	# are filtered multiple times.
-	git -C one rev-parse refs/prefetch/bogus/fetched &&
-	test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore
-
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5582-fetch-negative-refspec/.
- * branch            main          -> FETCH_HEAD
- * [new branch]      bogus/fetched -> refs/prefetch/bogus/fetched
-fatal: ambiguous argument 'never-fetch-tag': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-never-fetch-tag
-c5395f864a4757fc219a4848a19568f14918687f
-fatal: ambiguous argument 'refs/prefetch/bogus/ignore': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/prefetch/bogus/ignore
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5582-fetch-negative-refspec/.
- * branch            main       -> FETCH_HEAD
-fatal: ambiguous argument 'never-fetch-tag': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-never-fetch-tag
-c5395f864a4757fc219a4848a19568f14918687f
-fatal: ambiguous argument 'refs/prefetch/bogus/ignore': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/prefetch/bogus/ignore
-ok 14 - --prefetch correctly modifies refspecs
-
-expecting success of 5582.15 '--prefetch succeeds when refspec becomes empty': 
-	git checkout bogus/fetched &&
-	test_commit extra &&
-
-	git -C one config --unset-all remote.origin.fetch &&
-	git -C one config --unset branch.main.remote &&
-	git -C one config remote.origin.fetch "+refs/tags/extra" &&
-	git -C one config remote.origin.skipfetchall true &&
-	git -C one config remote.origin.tagopt "--no-tags" &&
-
-	git -C one fetch --prefetch
-
-Switched to branch 'bogus/fetched'
-[bogus/fetched 8d8169a] extra
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 extra.t
-ok 15 - --prefetch succeeds when refspec becomes empty
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5574-fetch-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output/.git/
-expecting success of 5574.1 'fetch with invalid output format configuration': 
-	test_when_finished "rm -rf clone" &&
-	git clone . clone &&
-
-	test_must_fail git -C clone -c fetch.output fetch origin 2>actual.err &&
-	cat >expect <<-EOF &&
-	error: missing value for ${SQ}fetch.output${SQ}
-	fatal: unable to parse ${SQ}fetch.output${SQ} from command-line config
-	EOF
-	test_cmp expect actual.err &&
-
-	test_must_fail git -C clone -c fetch.output= fetch origin 2>actual.err &&
-	cat >expect <<-EOF &&
-	fatal: invalid value for ${SQ}fetch.output${SQ}: ${SQ}${SQ}
-	EOF
-	test_cmp expect actual.err &&
-
-	test_must_fail git -C clone -c fetch.output=garbage fetch origin 2>actual.err &&
-	cat >expect <<-EOF &&
-	fatal: invalid value for ${SQ}fetch.output${SQ}: ${SQ}garbage${SQ}
-	EOF
-	test_cmp expect actual.err
-
-Cloning into 'clone'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 1 - fetch with invalid output format configuration
-
-expecting success of 5574.2 'fetch aligned output': 
-	git clone . full-output &&
-	test_commit looooooooooooong-tag &&
-	(
-		cd full-output &&
-		git -c fetch.output=full fetch origin >actual 2>&1 &&
-		grep -e "->" actual | cut -c 22- >../actual
-	) &&
-	cat >expect <<-\EOF &&
-	main                 -> origin/main
-	looooooooooooong-tag -> looooooooooooong-tag
-	EOF
-	test_cmp expect actual
-
-Cloning into 'full-output'...
-warning: You appear to have cloned an empty repository.
-done.
-[main (root-commit) c62a462] looooooooooooong-tag
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 looooooooooooong-tag.t
-ok 2 - fetch aligned output
-
-expecting success of 5574.3 'fetch compact output': 
-	git clone . compact &&
-	test_commit extraaa &&
-	(
-		cd compact &&
-		git -c fetch.output=compact fetch origin >actual 2>&1 &&
-		grep -e "->" actual | cut -c 22- >../actual
-	) &&
-	cat >expect <<-\EOF &&
-	main       -> origin/*
-	extraaa    -> *
-	EOF
-	test_cmp expect actual
-
-Cloning into 'compact'...
-done.
-[main 7229363] extraaa
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 extraaa.t
-ok 3 - fetch compact output
-
-expecting success of 5574.4 'setup for fetch porcelain output': 
-	# Set up a bunch of references that we can use to demonstrate different
-	# kinds of flag symbols in the output format.
-	test_commit commit-for-porcelain-output &&
-	MAIN_OLD=$(git rev-parse HEAD) &&
-	git branch "fast-forward" &&
-	git branch "deleted-branch" &&
-	git checkout -b force-updated &&
-	test_commit --no-tag force-update-old &&
-	FORCE_UPDATED_OLD=$(git rev-parse HEAD) &&
-	git checkout main &&
-
-	# Backup to preseed.git
-	git clone --mirror . preseed.git &&
-
-	# Continue changing our local references.
-	git branch new-branch &&
-	git branch -d deleted-branch &&
-	git checkout fast-forward &&
-	test_commit --no-tag fast-forward-new &&
-	FAST_FORWARD_NEW=$(git rev-parse HEAD) &&
-	git checkout force-updated &&
-	git reset --hard HEAD~ &&
-	test_commit --no-tag force-update-new &&
-	FORCE_UPDATED_NEW=$(git rev-parse HEAD)
-
-[main 4755660] commit-for-porcelain-output
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-porcelain-output.t
-Switched to a new branch 'force-updated'
-[force-updated 9969fa4] force-update-old
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 force-update-old.t
-Switched to branch 'main'
-Cloning into bare repository 'preseed.git'...
-done.
-Deleted branch deleted-branch (was 4755660).
-Switched to branch 'fast-forward'
-[fast-forward 6181e78] fast-forward-new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fast-forward-new.t
-Switched to branch 'force-updated'
-HEAD is now at 4755660 commit-for-porcelain-output
-[force-updated 7157201] force-update-new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 force-update-new.t
-ok 4 - setup for fetch porcelain output
-
-expecting success of 5574.5 'fetch porcelain output ': 
-		test_when_finished "rm -rf porcelain" &&
-
-		# Clone and pre-seed the repositories. We fetch references into two
-		# namespaces so that we can test that rejected and force-updated
-		# references are reported properly.
-		refspecs="refs/heads/*:refs/unforced/* +refs/heads/*:refs/forced/*" &&
-		git clone preseed.git porcelain &&
-		git -C porcelain fetch origin $opt $refspecs &&
-
-		cat >expect <<-EOF &&
-		- $MAIN_OLD $ZERO_OID refs/forced/deleted-branch
-		- $MAIN_OLD $ZERO_OID refs/unforced/deleted-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/unforced/fast-forward
-		! $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/unforced/force-updated
-		* $ZERO_OID $MAIN_OLD refs/unforced/new-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/forced/fast-forward
-		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/forced/force-updated
-		* $ZERO_OID $MAIN_OLD refs/forced/new-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/remotes/origin/fast-forward
-		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/remotes/origin/force-updated
-		* $ZERO_OID $MAIN_OLD refs/remotes/origin/new-branch
-		EOF
-
-		# Change the URL of the repository to fetch different references.
-		git -C porcelain remote set-url origin .. &&
-
-		# Execute a dry-run fetch first. We do this to assert that the dry-run
-		# and non-dry-run fetches produces the same output. Execution of the
-		# fetch is expected to fail as we have a rejected reference update.
-		test_must_fail git -C porcelain fetch $opt \
-			--porcelain --dry-run --prune origin $refspecs >actual &&
-		test_cmp expect actual &&
-
-		# And now we perform a non-dry-run fetch.
-		test_must_fail git -C porcelain fetch $opt \
-			--porcelain --prune origin $refspecs >actual 2>stderr &&
-		test_cmp expect actual &&
-		test_must_be_empty stderr
-	
-Cloning into 'porcelain'...
-done.
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output/preseed
- * [new branch]      deleted-branch -> refs/unforced/deleted-branch
- * [new branch]      fast-forward   -> refs/unforced/fast-forward
- * [new branch]      force-updated  -> refs/unforced/force-updated
- * [new branch]      main           -> refs/unforced/main
- * [new branch]      deleted-branch -> refs/forced/deleted-branch
- * [new branch]      fast-forward   -> refs/forced/fast-forward
- * [new branch]      force-updated  -> refs/forced/force-updated
- * [new branch]      main           -> refs/forced/main
-ok 5 - fetch porcelain output 
-
-expecting success of 5574.6 'fetch porcelain output (atomic)': 
-		test_when_finished "rm -rf porcelain" &&
-
-		# Clone and pre-seed the repositories. We fetch references into two
-		# namespaces so that we can test that rejected and force-updated
-		# references are reported properly.
-		refspecs="refs/heads/*:refs/unforced/* +refs/heads/*:refs/forced/*" &&
-		git clone preseed.git porcelain &&
-		git -C porcelain fetch origin $opt $refspecs &&
-
-		cat >expect <<-EOF &&
-		- $MAIN_OLD $ZERO_OID refs/forced/deleted-branch
-		- $MAIN_OLD $ZERO_OID refs/unforced/deleted-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/unforced/fast-forward
-		! $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/unforced/force-updated
-		* $ZERO_OID $MAIN_OLD refs/unforced/new-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/forced/fast-forward
-		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/forced/force-updated
-		* $ZERO_OID $MAIN_OLD refs/forced/new-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/remotes/origin/fast-forward
-		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/remotes/origin/force-updated
-		* $ZERO_OID $MAIN_OLD refs/remotes/origin/new-branch
-		EOF
-
-		# Change the URL of the repository to fetch different references.
-		git -C porcelain remote set-url origin .. &&
-
-		# Execute a dry-run fetch first. We do this to assert that the dry-run
-		# and non-dry-run fetches produces the same output. Execution of the
-		# fetch is expected to fail as we have a rejected reference update.
-		test_must_fail git -C porcelain fetch $opt \
-			--porcelain --dry-run --prune origin $refspecs >actual &&
-		test_cmp expect actual &&
-
-		# And now we perform a non-dry-run fetch.
-		test_must_fail git -C porcelain fetch $opt \
-			--porcelain --prune origin $refspecs >actual 2>stderr &&
-		test_cmp expect actual &&
-		test_must_be_empty stderr
-	
-Cloning into 'porcelain'...
-done.
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output/preseed
- * [new branch]      deleted-branch -> refs/unforced/deleted-branch
- * [new branch]      fast-forward   -> refs/unforced/fast-forward
- * [new branch]      force-updated  -> refs/unforced/force-updated
- * [new branch]      main           -> refs/unforced/main
- * [new branch]      deleted-branch -> refs/forced/deleted-branch
- * [new branch]      fast-forward   -> refs/forced/fast-forward
- * [new branch]      force-updated  -> refs/forced/force-updated
- * [new branch]      main           -> refs/forced/main
-ok 6 - fetch porcelain output (atomic)
-
-expecting success of 5574.7 'fetch porcelain with multiple remotes': 
-	test_when_finished "rm -rf porcelain" &&
-
-	git switch --create multiple-remotes &&
-	git clone . porcelain &&
-	git -C porcelain remote add second-remote "$PWD" &&
-	git -C porcelain fetch second-remote &&
-
-	test_commit --no-tag multi-commit &&
-	old_commit=$(git rev-parse HEAD~) &&
-	new_commit=$(git rev-parse HEAD) &&
-
-	cat >expect <<-EOF &&
-	  $old_commit $new_commit refs/remotes/origin/multiple-remotes
-	  $old_commit $new_commit refs/remotes/second-remote/multiple-remotes
-	EOF
-
-	git -C porcelain fetch --porcelain --all >actual 2>stderr &&
-	test_cmp expect actual &&
-	test_must_be_empty stderr
-
-Switched to a new branch 'multiple-remotes'
-Cloning into 'porcelain'...
-done.
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output
- * [new branch]      fast-forward     -> second-remote/fast-forward
- * [new branch]      force-updated    -> second-remote/force-updated
- * [new branch]      main             -> second-remote/main
- * [new branch]      multiple-remotes -> second-remote/multiple-remotes
- * [new branch]      new-branch       -> second-remote/new-branch
-[multiple-remotes 9d09634] multi-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 multi-commit.t
-ok 7 - fetch porcelain with multiple remotes
-
-expecting success of 5574.8 'fetch porcelain refuses to work with submodules': 
-	test_when_finished "rm -rf porcelain" &&
-
-	cat >expect <<-EOF &&
-	fatal: options ${SQ}--porcelain${SQ} and ${SQ}--recurse-submodules${SQ} cannot be used together
-	EOF
-
-	git init porcelain &&
-	test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=yes 2>stderr &&
-	test_cmp expect stderr &&
-
-	test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=on-demand 2>stderr &&
-	test_cmp expect stderr
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output/porcelain/.git/
-ok 8 - fetch porcelain refuses to work with submodules
-
-expecting success of 5574.9 'fetch porcelain overrides fetch.output config': 
-	test_when_finished "rm -rf porcelain" &&
-
-	git switch --create config-override &&
-	git clone . porcelain &&
-	test_commit new-commit &&
-	old_commit=$(git rev-parse HEAD~) &&
-	new_commit=$(git rev-parse HEAD) &&
-
-	cat >expect <<-EOF &&
-	  $old_commit $new_commit refs/remotes/origin/config-override
-	* $ZERO_OID $new_commit refs/tags/new-commit
-	EOF
-
-	git -C porcelain -c fetch.output=compact fetch --porcelain >stdout 2>stderr &&
-	test_must_be_empty stderr &&
-	test_cmp expect stdout
-
-Switched to a new branch 'config-override'
-Cloning into 'porcelain'...
-done.
-[config-override ead9d61] new-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new-commit.t
-ok 9 - fetch porcelain overrides fetch.output config
-
-expecting success of 5574.10 'fetch --no-porcelain overrides previous --porcelain': 
-	test_when_finished "rm -rf no-porcelain" &&
-
-	git switch --create no-porcelain &&
-	git clone . no-porcelain &&
-	test_commit --no-tag no-porcelain &&
-	old_commit=$(git rev-parse --short HEAD~) &&
-	new_commit=$(git rev-parse --short HEAD) &&
-
-	cat >expect <<-EOF &&
-	From $(test-tool path-utils real_path .)/.
-	   $old_commit..$new_commit  no-porcelain -> origin/no-porcelain
-	EOF
-
-	git -C no-porcelain fetch --porcelain --no-porcelain >stdout 2>stderr &&
-	test_cmp expect stderr &&
-	test_must_be_empty stdout
-
-Switched to a new branch 'no-porcelain'
-Cloning into 'no-porcelain'...
-done.
-[no-porcelain cf8719e] no-porcelain
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 no-porcelain.t
-ok 10 - fetch --no-porcelain overrides previous --porcelain
-
-expecting success of 5574.11 'fetch output with HEAD': 
-	test_when_finished "rm -rf head" &&
-	git clone . head &&
-
-	git -C head fetch --dry-run origin HEAD >actual.out 2>actual.err &&
-	cat >expect <<-EOF &&
-	From $(test-tool path-utils real_path .)/.
-	 * branch            HEAD       -> FETCH_HEAD
-	EOF
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err &&
-
-	git -C head fetch origin HEAD >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err &&
-
-	git -C head fetch --dry-run origin HEAD:foo >actual.out 2>actual.err &&
-	cat >expect <<-EOF &&
-	From $(test-tool path-utils real_path .)/.
-	 * [new ref]         HEAD       -> foo
-	EOF
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err &&
-
-	git -C head fetch origin HEAD:foo >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err
-
-Cloning into 'head'...
-done.
-ok 11 - fetch output with HEAD
-
-expecting success of 5574.12 'fetch porcelain output with HEAD': 
-	test_when_finished "rm -rf head" &&
-	git clone . head &&
-	COMMIT_ID=$(git rev-parse HEAD) &&
-
-	git -C head fetch --porcelain --dry-run origin HEAD >actual &&
-	cat >expect <<-EOF &&
-	* $ZERO_OID $COMMIT_ID FETCH_HEAD
-	EOF
-	test_cmp expect actual &&
-
-	git -C head fetch --porcelain origin HEAD >actual &&
-	test_cmp expect actual &&
-
-	git -C head fetch --porcelain --dry-run origin HEAD:foo >actual &&
-	cat >expect <<-EOF &&
-	* $ZERO_OID $COMMIT_ID refs/heads/foo
-	EOF
-	test_cmp expect actual &&
-
-	git -C head fetch --porcelain origin HEAD:foo >actual &&
-	test_cmp expect actual
-
-Cloning into 'head'...
-done.
-ok 12 - fetch porcelain output with HEAD
-
-expecting success of 5574.13 'fetch output with object ID': 
-	test_when_finished "rm -rf object-id" &&
-	git clone . object-id &&
-	commit=$(git rev-parse HEAD) &&
-
-	git -C object-id fetch --dry-run origin $commit:object-id >actual.out 2>actual.err &&
-	cat >expect <<-EOF &&
-	From $(test-tool path-utils real_path .)/.
-	 * [new ref]         $commit -> object-id
-	EOF
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err &&
-
-	git -C object-id fetch origin $commit:object-id >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err
-
-Cloning into 'object-id'...
-done.
-ok 13 - fetch output with object ID
-
-expecting success of 5574.14 '--no-show-forced-updates': 
-	mkdir forced-updates &&
-	(
-		cd forced-updates &&
-		git init &&
-		test_commit 1 &&
-		test_commit 2
-	) &&
-	git clone forced-updates forced-update-clone &&
-	git clone forced-updates no-forced-update-clone &&
-	git -C forced-updates reset --hard HEAD~1 &&
-	(
-		cd forced-update-clone &&
-		git fetch --show-forced-updates origin 2>output &&
-		test_grep "(forced update)" output
-	) &&
-	(
-		cd no-forced-update-clone &&
-		git fetch --no-show-forced-updates origin 2>output &&
-		test_grep ! "(forced update)" output
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5574-fetch-output/forced-updates/.git/
-[main (root-commit) 925a26a] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[main 3d049f7] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Cloning into 'forced-update-clone'...
-done.
-Cloning into 'no-forced-update-clone'...
-done.
-HEAD is now at 925a26a 1
- + 3d049f7...925a26a main       -> origin/main  (forced update)
-ok 14 - --no-show-forced-updates
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5608-clone-2gb.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5605-clone-local.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/.git/
-expecting success of 5605.1 'preparing origin repository': 
-	: >file && git add . && git commit -m1 &&
-	git clone --bare . a.git &&
-	git clone --bare . x &&
-	echo true >expect &&
-	git -C a.git config --bool core.bare >actual &&
-	test_cmp expect actual &&
-	echo true >expect &&
-	git -C x config --bool core.bare >actual &&
-	test_cmp expect actual &&
-	git bundle create b1.bundle --all &&
-	git bundle create b2.bundle main &&
-	mkdir dir &&
-	cp b1.bundle dir/b3 &&
-	cp b1.bundle b4 &&
-	git branch not-main main &&
-	git bundle create b5.bundle not-main
-
-[main (root-commit) a4ae174] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Cloning into bare repository 'a.git'...
-done.
-Cloning into bare repository 'x'...
-done.
-ok 1 - preparing origin repository
-
-expecting success of 5605.2 'local clone without .git suffix': 
-	git clone -l -s a b &&
-	(cd b &&
-	echo false >expect &&
-	git config --bool core.bare >actual &&
-	test_cmp expect actual &&
-	git fetch)
-
-Cloning into 'b'...
-done.
-ok 2 - local clone without .git suffix
-
-expecting success of 5605.3 'local clone with .git suffix': 
-	git clone -l -s a.git c &&
-	(cd c && git fetch)
-
-Cloning into 'c'...
-done.
-ok 3 - local clone with .git suffix
-
-expecting success of 5605.4 'local clone from x': 
-	git clone -l -s x y &&
-	(cd y && git fetch)
-
-Cloning into 'y'...
-done.
-ok 4 - local clone from x
-
-expecting success of 5605.5 'local clone from x.git that does not exist': 
-	test_must_fail git clone -l -s x.git z
-
-fatal: repository 'x.git' does not exist
-ok 5 - local clone from x.git that does not exist
-
-expecting success of 5605.6 'With -no-hardlinks, local will make a copy': 
-	git clone --bare --no-hardlinks x w &&
-	! repo_is_hardlinked w
-
-Cloning into bare repository 'w'...
-done.
-test_line_count: line count for output != 0
-w/objects/a4/ae174c9759876c669998f2c8e401fcb298b8d6
-w/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078
-w/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 6 - With -no-hardlinks, local will make a copy
-
-expecting success of 5605.7 'Even without -l, local will make a hardlink': 
-	rm -fr w &&
-	git clone -l --bare x w &&
-	repo_is_hardlinked w
-
-Cloning into bare repository 'w'...
-done.
-ok 7 - Even without -l, local will make a hardlink
-
-expecting success of 5605.8 'local clone of repo with nonexistent ref in HEAD': 
-	git -C a.git symbolic-ref HEAD refs/heads/nonexistent &&
-	git clone a d &&
-	(cd d &&
-	git fetch &&
-	test_ref_missing refs/remotes/origin/HEAD)
-
-Cloning into 'd'...
-done.
-warning: remote HEAD refers to nonexistent ref, unable to checkout
-error: reference does not exist
-ok 8 - local clone of repo with nonexistent ref in HEAD
-
-expecting success of 5605.9 'bundle clone without .bundle suffix': 
-	git clone dir/b3 &&
-	(cd b3 && git fetch)
-
-Cloning into 'b3'...
-ok 9 - bundle clone without .bundle suffix
-
-expecting success of 5605.10 'bundle clone with .bundle suffix': 
-	git clone b1.bundle &&
-	(cd b1 && git fetch)
-
-Cloning into 'b1'...
-ok 10 - bundle clone with .bundle suffix
-
-expecting success of 5605.11 'bundle clone from b4': 
-	git clone b4 bdl &&
-	(cd bdl && git fetch)
-
-Cloning into 'bdl'...
-ok 11 - bundle clone from b4
-
-expecting success of 5605.12 'bundle clone from b4.bundle that does not exist': 
-	test_must_fail git clone b4.bundle bb
-
-fatal: repository 'b4.bundle' does not exist
-ok 12 - bundle clone from b4.bundle that does not exist
-
-expecting success of 5605.13 'bundle clone with nonexistent HEAD (match default)': 
-	git clone b2.bundle b2 &&
-	(cd b2 &&
-	git fetch &&
-	git rev-parse --verify refs/heads/main)
-
-Cloning into 'b2'...
-a4ae174c9759876c669998f2c8e401fcb298b8d6
-ok 13 - bundle clone with nonexistent HEAD (match default)
-
-expecting success of 5605.14 'bundle clone with nonexistent HEAD (no match default)': 
-	git clone b5.bundle b5 &&
-	(cd b5 &&
-	git fetch &&
-	test_must_fail git rev-parse --verify refs/heads/main &&
-	test_must_fail git rev-parse --verify refs/heads/not-main)
-
-Cloning into 'b5'...
-warning: remote HEAD refers to nonexistent ref, unable to checkout
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 14 - bundle clone with nonexistent HEAD (no match default)
-
-expecting success of 5605.15 'clone empty repository': 
-	mkdir empty &&
-	(cd empty &&
-	 git init &&
-	 git config receive.denyCurrentBranch warn) &&
-	git clone empty empty-clone &&
-	test_tick &&
-	(cd empty-clone &&
-	 echo "content" >> foo &&
-	 git add foo &&
-	 git commit -m "Initial commit" &&
-	 git push origin main &&
-	 expected=$(git rev-parse main) &&
-	 actual=$(git --git-dir=../empty/.git rev-parse main) &&
-	 test $actual = $expected)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/empty/.git/
-Cloning into 'empty-clone'...
-warning: You appear to have cloned an empty repository.
-done.
-[main (root-commit) b8e7dd3] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To /build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/empty
- * [new branch]      main -> main
-ok 15 - clone empty repository
-
-expecting success of 5605.16 'clone empty repository, and then push should not segfault.': 
-	rm -fr empty/ empty-clone/ &&
-	mkdir empty &&
-	(cd empty && git init) &&
-	git clone empty empty-clone &&
-	(cd empty-clone &&
-	test_must_fail git push)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/empty/.git/
-Cloning into 'empty-clone'...
-warning: You appear to have cloned an empty repository.
-done.
-error: src refspec refs/heads/main does not match any
-error: failed to push some refs to '/build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/empty'
-ok 16 - clone empty repository, and then push should not segfault.
-
-expecting success of 5605.17 'cloning non-existent directory fails': 
-	rm -rf does-not-exist &&
-	test_must_fail git clone does-not-exist
-
-fatal: repository 'does-not-exist' does not exist
-ok 17 - cloning non-existent directory fails
-
-expecting success of 5605.18 'cloning non-git directory fails': 
-	rm -rf not-a-git-repo not-a-git-repo-clone &&
-	mkdir not-a-git-repo &&
-	test_must_fail git clone not-a-git-repo not-a-git-repo-clone
-
-fatal: repository 'not-a-git-repo' does not exist
-ok 18 - cloning non-git directory fails
-
-expecting success of 5605.19 'cloning file:// does not hardlink': 
-	git clone --bare file://"$(pwd)"/a non-local &&
-	! repo_is_hardlinked non-local
-
-Cloning into bare repository 'non-local'...
-test_line_count: line count for output != 0
-non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.idx
-non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.rev
-non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.pack
-ok 19 - cloning file:// does not hardlink
-
-expecting success of 5605.20 'cloning a local path with --no-local does not hardlink': 
-	git clone --bare --no-local a force-nonlocal &&
-	! repo_is_hardlinked force-nonlocal
-
-Cloning into bare repository 'force-nonlocal'...
-test_line_count: line count for output != 0
-force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.idx
-force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.rev
-force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.pack
-ok 20 - cloning a local path with --no-local does not hardlink
-
-expecting success of 5605.21 'cloning locally respects "-u" for fetching refs': 
-	test_must_fail git clone --bare -u false a should_not_work.git
-
-Cloning into bare repository 'should_not_work.git'...
-fatal: Could not read from remote repository.
-
-Please make sure you have the correct access rights
-and the repository exists.
-ok 21 - cloning locally respects "-u" for fetching refs
-
-expecting success of 5605.22 'local clone from repo with corrupt refs fails gracefully': 
-	git init corrupt &&
-	test_commit -C corrupt one &&
-	echo a >corrupt/.git/refs/heads/topic &&
-
-	test_must_fail git clone corrupt working 2>err &&
-	grep "has neither a valid OID nor a target" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/corrupt/.git/
-[main (root-commit) b838542] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-fatal: 'refs/remotes/origin/topic' has neither a valid OID nor a target
-ok 22 - local clone from repo with corrupt refs fails gracefully
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5603-clone-dirname.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5603-clone-dirname/.git/
 expecting success of 5603.1 'setup ssh wrapper': 
@@ -363008,143 +362741,696 @@
 1..47
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5609-clone-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+*** t5605-clone-local.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/.git/
+expecting success of 5605.1 'preparing origin repository': 
+	: >file && git add . && git commit -m1 &&
+	git clone --bare . a.git &&
+	git clone --bare . x &&
+	echo true >expect &&
+	git -C a.git config --bool core.bare >actual &&
+	test_cmp expect actual &&
+	echo true >expect &&
+	git -C x config --bool core.bare >actual &&
+	test_cmp expect actual &&
+	git bundle create b1.bundle --all &&
+	git bundle create b2.bundle main &&
+	mkdir dir &&
+	cp b1.bundle dir/b3 &&
+	cp b1.bundle b4 &&
+	git branch not-main main &&
+	git bundle create b5.bundle not-main
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5609-clone-branch/parent/.git/
-[main (root-commit) 1993c08] one
+[main (root-commit) a4ae174] 1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
  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.47.2/t/trash directory.t5609-clone-branch/empty/.git/
-ok 1 - setup
+Cloning into bare repository 'a.git'...
+done.
+Cloning into bare repository 'x'...
+done.
+ok 1 - preparing origin repository
 
-expecting success of 5609.2 'vanilla clone chooses HEAD': 
-	git clone parent clone &&
-	(cd clone &&
-	 check_HEAD main &&
-	 check_file one
-	)
+expecting success of 5605.2 'local clone without .git suffix': 
+	git clone -l -s a b &&
+	(cd b &&
+	echo false >expect &&
+	git config --bool core.bare >actual &&
+	test_cmp expect actual &&
+	git fetch)
 
-Cloning into 'clone'...
+Cloning into 'b'...
 done.
-ok 2 - vanilla clone chooses HEAD
+ok 2 - local clone without .git suffix
 
-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 5605.3 'local clone with .git suffix': 
+	git clone -l -s a.git c &&
+	(cd c && git fetch)
 
-Cloning into 'clone-two'...
+Cloning into 'c'...
 done.
-ok 3 - clone -b chooses specified branch
+ok 3 - local clone with .git suffix
 
-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 5605.4 'local clone from x': 
+	git clone -l -s x y &&
+	(cd y && git fetch)
 
-ok 4 - clone -b sets up tracking
+Cloning into 'y'...
+done.
+ok 4 - local clone from x
 
-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 5605.5 'local clone from x.git that does not exist': 
+	test_must_fail git clone -l -s x.git z
 
-ok 5 - clone -b does not munge remotes/origin/HEAD
+fatal: repository 'x.git' does not exist
+ok 5 - local clone from x.git that does not exist
 
-expecting success of 5609.6 'clone -b with bogus branch': 
-	test_must_fail git clone -b bogus parent clone-bogus
+expecting success of 5605.6 'With -no-hardlinks, local will make a copy': 
+	git clone --bare --no-hardlinks x w &&
+	! repo_is_hardlinked w
 
-Cloning into 'clone-bogus'...
-fatal: Remote branch bogus not found in upstream origin
-ok 6 - clone -b with bogus branch
+Cloning into bare repository 'w'...
+done.
+test_line_count: line count for output != 0
+w/objects/a4/ae174c9759876c669998f2c8e401fcb298b8d6
+w/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078
+w/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 6 - With -no-hardlinks, local will make a copy
 
-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 5605.7 'Even without -l, local will make a hardlink': 
+	rm -fr w &&
+	git clone -l --bare x w &&
+	repo_is_hardlinked w
 
-Cloning into 'clone-branch-empty'...
-fatal: Remote branch branch not found in upstream origin
-ok 7 - clone -b not allowed with empty repos
+Cloning into bare repository 'w'...
+done.
+ok 7 - Even without -l, local will make a hardlink
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5607-clone-bundle.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5607-clone-bundle/.git/
-expecting success of 5607.1 'setup': 
-	test_oid_cache <<-EOF &&
-	version sha1:2
-	version sha256:3
-	EOF
-	test_commit initial &&
-	test_tick &&
-	git tag -m tag tag &&
-	test_commit second &&
-	test_commit third &&
-	git tag -d initial &&
-	git tag -d second &&
-	git tag -d third
+expecting success of 5605.8 'local clone of repo with nonexistent ref in HEAD': 
+	git -C a.git symbolic-ref HEAD refs/heads/nonexistent &&
+	git clone a d &&
+	(cd d &&
+	git fetch &&
+	test_ref_missing refs/remotes/origin/HEAD)
 
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 21f74a9] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[main d31729a] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third.t
-Deleted tag 'initial' (was 24b24cf)
-Deleted tag 'second' (was 21f74a9)
-Deleted tag 'third' (was d31729a)
-ok 1 - setup
+Cloning into 'd'...
+done.
+warning: remote HEAD refers to nonexistent ref, unable to checkout
+error: reference does not exist
+ok 8 - local clone of repo with nonexistent ref in HEAD
 
-expecting success of 5607.2 '"verify" needs a worktree': 
-	git bundle create tip.bundle -1 main &&
-	nongit test_must_fail git bundle verify ../tip.bundle 2>err &&
-	test_grep "need a repository" err
+expecting success of 5605.9 'bundle clone without .bundle suffix': 
+	git clone dir/b3 &&
+	(cd b3 && git fetch)
 
-error: need a repository to verify a bundle
-ok 2 - "verify" needs a worktree
+Cloning into 'b3'...
+ok 9 - bundle clone without .bundle suffix
 
-expecting success of 5607.3 'annotated tags can be excluded by rev-list options': 
-	git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 &&
-	cat >expect <<-EOF &&
-	$(git rev-parse HEAD)	HEAD
-	$(git rev-parse tag)	refs/tags/tag
-	$(git rev-parse main)	refs/heads/main
-	EOF
-	git ls-remote bundle >actual &&
-	test_cmp expect actual &&
+expecting success of 5605.10 'bundle clone with .bundle suffix': 
+	git clone b1.bundle &&
+	(cd b1 && git fetch)
 
-	git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 &&
+Cloning into 'b1'...
+ok 10 - bundle clone with .bundle suffix
+
+expecting success of 5605.11 'bundle clone from b4': 
+	git clone b4 bdl &&
+	(cd bdl && git fetch)
+
+Cloning into 'bdl'...
+ok 11 - bundle clone from b4
+
+expecting success of 5605.12 'bundle clone from b4.bundle that does not exist': 
+	test_must_fail git clone b4.bundle bb
+
+fatal: repository 'b4.bundle' does not exist
+ok 12 - bundle clone from b4.bundle that does not exist
+
+expecting success of 5605.13 'bundle clone with nonexistent HEAD (match default)': 
+	git clone b2.bundle b2 &&
+	(cd b2 &&
+	git fetch &&
+	git rev-parse --verify refs/heads/main)
+
+Cloning into 'b2'...
+a4ae174c9759876c669998f2c8e401fcb298b8d6
+ok 13 - bundle clone with nonexistent HEAD (match default)
+
+expecting success of 5605.14 'bundle clone with nonexistent HEAD (no match default)': 
+	git clone b5.bundle b5 &&
+	(cd b5 &&
+	git fetch &&
+	test_must_fail git rev-parse --verify refs/heads/main &&
+	test_must_fail git rev-parse --verify refs/heads/not-main)
+
+Cloning into 'b5'...
+warning: remote HEAD refers to nonexistent ref, unable to checkout
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 14 - bundle clone with nonexistent HEAD (no match default)
+
+expecting success of 5605.15 'clone empty repository': 
+	mkdir empty &&
+	(cd empty &&
+	 git init &&
+	 git config receive.denyCurrentBranch warn) &&
+	git clone empty empty-clone &&
+	test_tick &&
+	(cd empty-clone &&
+	 echo "content" >> foo &&
+	 git add foo &&
+	 git commit -m "Initial commit" &&
+	 git push origin main &&
+	 expected=$(git rev-parse main) &&
+	 actual=$(git --git-dir=../empty/.git rev-parse main) &&
+	 test $actual = $expected)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/empty/.git/
+Cloning into 'empty-clone'...
+warning: You appear to have cloned an empty repository.
+done.
+[main (root-commit) b8e7dd3] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To /build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/empty
+ * [new branch]      main -> main
+ok 15 - clone empty repository
+
+expecting success of 5605.16 'clone empty repository, and then push should not segfault.': 
+	rm -fr empty/ empty-clone/ &&
+	mkdir empty &&
+	(cd empty && git init) &&
+	git clone empty empty-clone &&
+	(cd empty-clone &&
+	test_must_fail git push)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/empty/.git/
+Cloning into 'empty-clone'...
+warning: You appear to have cloned an empty repository.
+done.
+error: src refspec refs/heads/main does not match any
+error: failed to push some refs to '/build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/empty'
+ok 16 - clone empty repository, and then push should not segfault.
+
+expecting success of 5605.17 'cloning non-existent directory fails': 
+	rm -rf does-not-exist &&
+	test_must_fail git clone does-not-exist
+
+fatal: repository 'does-not-exist' does not exist
+ok 17 - cloning non-existent directory fails
+
+expecting success of 5605.18 'cloning non-git directory fails': 
+	rm -rf not-a-git-repo not-a-git-repo-clone &&
+	mkdir not-a-git-repo &&
+	test_must_fail git clone not-a-git-repo not-a-git-repo-clone
+
+fatal: repository 'not-a-git-repo' does not exist
+ok 18 - cloning non-git directory fails
+
+expecting success of 5605.19 'cloning file:// does not hardlink': 
+	git clone --bare file://"$(pwd)"/a non-local &&
+	! repo_is_hardlinked non-local
+
+Cloning into bare repository 'non-local'...
+test_line_count: line count for output != 0
+non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.idx
+non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.rev
+non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.pack
+ok 19 - cloning file:// does not hardlink
+
+expecting success of 5605.20 'cloning a local path with --no-local does not hardlink': 
+	git clone --bare --no-local a force-nonlocal &&
+	! repo_is_hardlinked force-nonlocal
+
+Cloning into bare repository 'force-nonlocal'...
+test_line_count: line count for output != 0
+force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.idx
+force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.rev
+force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.pack
+ok 20 - cloning a local path with --no-local does not hardlink
+
+expecting success of 5605.21 'cloning locally respects "-u" for fetching refs': 
+	test_must_fail git clone --bare -u false a should_not_work.git
+
+Cloning into bare repository 'should_not_work.git'...
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 21 - cloning locally respects "-u" for fetching refs
+
+expecting success of 5605.22 'local clone from repo with corrupt refs fails gracefully': 
+	git init corrupt &&
+	test_commit -C corrupt one &&
+	echo a >corrupt/.git/refs/heads/topic &&
+
+	test_must_fail git clone corrupt working 2>err &&
+	grep "has neither a valid OID nor a target" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5605-clone-local/corrupt/.git/
+[main (root-commit) b838542] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+fatal: 'refs/remotes/origin/topic' has neither a valid OID nor a target
+ok 22 - local clone from repo with corrupt refs fails gracefully
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5608-clone-2gb.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5606-clone-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5606-clone-options/.git/
+expecting success of 5606.1 'setup': 
+
+	mkdir parent &&
+	(cd parent && git init &&
+	 echo one >file && git add file &&
+	 git commit -m one) &&
+	git clone --depth=1 --no-local parent shallow-repo
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5606-clone-options/parent/.git/
+[main (root-commit) 1993c08] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'shallow-repo'...
+ok 1 - setup
+
+expecting success of 5606.2 'submodule.stickyRecursiveClone flag manipulates submodule.recurse value': 
+
+	test_config_global submodule.stickyRecursiveClone true &&
+	git clone --recurse-submodules parent clone_recurse_true &&
+	test_cmp_config -C clone_recurse_true true submodule.recurse &&
+
+	test_config_global submodule.stickyRecursiveClone false &&
+	git clone --recurse-submodules parent clone_recurse_false &&
+	test_expect_code 1 git -C clone_recurse_false config --get submodule.recurse
+
+
+Cloning into 'clone_recurse_true'...
+done.
+Cloning into 'clone_recurse_false'...
+done.
+ok 2 - submodule.stickyRecursiveClone flag manipulates submodule.recurse value
+
+expecting success of 5606.3 'clone -o': 
+
+	git clone -o foo parent clone-o &&
+	git -C clone-o rev-parse --verify refs/remotes/foo/main
+
+
+Cloning into 'clone-o'...
+done.
+1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
+ok 3 - clone -o
+
+expecting success of 5606.4 'rejects invalid -o/--origin': 
+
+	test_must_fail git clone -o "bad...name" parent clone-bad-name 2>err &&
+	test_grep "'bad...name' is not a valid remote name" err
+
+
+fatal: 'bad...name' is not a valid remote name
+ok 4 - rejects invalid -o/--origin
+
+expecting success of 5606.5 'clone --bare -o': 
+
+	git clone -o foo --bare parent clone-bare-o &&
+	(cd parent && pwd) >expect &&
+	git -C clone-bare-o config remote.foo.url >actual &&
+	test_cmp expect actual
+
+
+Cloning into bare repository 'clone-bare-o'...
+done.
+ok 5 - clone --bare -o
+
+expecting success of 5606.6 'disallows --bare with --separate-git-dir': 
+
+	test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&
+	test_debug "cat err" &&
+	test_grep -e "options .--bare. and .--separate-git-dir. cannot be used together" err
+
+
+fatal: options '--bare' and '--separate-git-dir' cannot be used together
+ok 6 - disallows --bare with --separate-git-dir
+
+expecting success of 5606.7 'disallows --bundle-uri with shallow options': 
+	for option in --depth=1 --shallow-since=01-01-2000 --shallow-exclude=HEAD
+	do
+		test_must_fail git clone --bundle-uri=bundle $option from to 2>err &&
+		grep "bundle-uri.* cannot be used together" err || return 1
+	done
+
+fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
+fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
+fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
+ok 7 - disallows --bundle-uri with shallow options
+
+expecting success of 5606.8 'reject cloning shallow repository': 
+	test_when_finished "rm -rf repo" &&
+	test_must_fail git clone --reject-shallow shallow-repo out 2>err &&
+	test_grep -e "source repository is shallow, reject to clone." err &&
+
+	git clone --no-reject-shallow shallow-repo repo
+
+fatal: source repository is shallow, reject to clone.
+Cloning into 'repo'...
+ok 8 - reject cloning shallow repository
+
+expecting success of 5606.9 'reject cloning non-local shallow repository': 
+	test_when_finished "rm -rf repo" &&
+	test_must_fail git clone --reject-shallow --no-local shallow-repo out 2>err &&
+	test_grep -e "source repository is shallow, reject to clone." err &&
+
+	git clone --no-reject-shallow --no-local shallow-repo repo
+
+fatal: source repository is shallow, reject to clone.
+Cloning into 'repo'...
+ok 9 - reject cloning non-local shallow repository
+
+expecting success of 5606.10 'succeed cloning normal repository': 
+	test_when_finished "rm -rf chilad1 child2 child3 child4 " &&
+	git clone --reject-shallow parent child1 &&
+	git clone --reject-shallow --no-local parent child2 &&
+	git clone --no-reject-shallow parent child3 &&
+	git clone --no-reject-shallow --no-local parent child4
+
+Cloning into 'child1'...
+done.
+Cloning into 'child2'...
+Cloning into 'child3'...
+done.
+Cloning into 'child4'...
+ok 10 - succeed cloning normal repository
+
+expecting success of 5606.11 'uses "origin" for default remote name': 
+
+	git clone parent clone-default-origin &&
+	git -C clone-default-origin rev-parse --verify refs/remotes/origin/main
+
+
+Cloning into 'clone-default-origin'...
+done.
+1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
+ok 11 - uses "origin" for default remote name
+
+expecting success of 5606.12 'prefers --template config over normal config': 
+
+	template="$TRASH_DIRECTORY/template-with-config" &&
+	mkdir "$template" &&
+	git config --file "$template/config" foo.bar from_template &&
+	test_config_global foo.bar from_global &&
+	git clone "--template=$template" parent clone-template-config &&
+	test "$(git -C clone-template-config config --local foo.bar)" = "from_template"
+
+
+Cloning into 'clone-template-config'...
+done.
+ok 12 - prefers --template config over normal config
+
+expecting success of 5606.13 'prefers -c config over --template config': 
+
+	template="$TRASH_DIRECTORY/template-with-ignored-config" &&
+	mkdir "$template" &&
+	git config --file "$template/config" foo.bar from_template &&
+	git clone "--template=$template" -c foo.bar=inline parent clone-template-inline-config &&
+	test "$(git -C clone-template-inline-config config --local foo.bar)" = "inline"
+
+
+Cloning into 'clone-template-inline-config'...
+done.
+ok 13 - prefers -c config over --template config
+
+expecting success of 5606.14 'ignore --template config for core.bare': 
+
+	template="$TRASH_DIRECTORY/template-with-bare-config" &&
+	mkdir "$template" &&
+	git config --file "$template/config" core.bare true &&
+	git clone "--template=$template" parent clone-bare-config &&
+	test "$(git -C clone-bare-config config --local core.bare)" = "false" &&
+	test_path_is_missing clone-bare-config/HEAD
+
+Cloning into 'clone-bare-config'...
+done.
+ok 14 - ignore --template config for core.bare
+
+expecting success of 5606.15 'prefers config "clone.defaultRemoteName" over default': 
+
+	test_config_global clone.defaultRemoteName from_config &&
+	git clone parent clone-config-origin &&
+	git -C clone-config-origin rev-parse --verify refs/remotes/from_config/main
+
+
+Cloning into 'clone-config-origin'...
+done.
+1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
+ok 15 - prefers config "clone.defaultRemoteName" over default
+
+expecting success of 5606.16 'prefers --origin over -c config': 
+
+	git clone -c clone.defaultRemoteName=inline --origin from_option parent clone-o-and-inline-config &&
+	git -C clone-o-and-inline-config rev-parse --verify refs/remotes/from_option/main
+
+
+Cloning into 'clone-o-and-inline-config'...
+done.
+1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
+ok 16 - prefers --origin over -c config
+
+expecting success of 5606.17 'redirected clone does not show progress': 
+
+	git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
+	! grep % err &&
+	test_grep ! "Checking connectivity" err
+
+
+ok 17 - redirected clone does not show progress
+
+expecting success of 5606.18 'redirected clone -v does show progress': 
+
+	git clone --progress "file://$(pwd)/parent" clone-redirected-progress \
+		>out 2>err &&
+	grep % err
+
+
+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), done.
+ok 18 - redirected clone -v does show progress
+
+expecting success of 5606.19 'clone does not segfault with --bare and core.bare=false': 
+	test_config_global core.bare false &&
+	git clone --bare parent clone-bare &&
+	echo true >expect &&
+	git -C clone-bare rev-parse --is-bare-repository >actual &&
+	test_cmp expect actual
+
+Cloning into bare repository 'clone-bare'...
+done.
+ok 19 - clone does not segfault with --bare and core.bare=false
+
+expecting success of 5606.20 'chooses correct default initial branch name': 
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=foo init --bare empty &&
+	test_config -C empty lsrefs.unborn advertise &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=up -c protocol.version=2 clone empty whats-up &&
+	test refs/heads/foo = $(git -C whats-up symbolic-ref HEAD) &&
+	test refs/heads/foo = $(git -C whats-up config branch.foo.merge)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5606-clone-options/empty/
+Cloning into 'whats-up'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 20 - chooses correct default initial branch name
+
+expecting success of 5606.21 'guesses initial branch name correctly': 
+	git init --initial-branch=guess initial-branch &&
+	test_commit -C initial-branch no-spoilers &&
+	git -C initial-branch branch abc guess &&
+	git clone initial-branch is-it &&
+	test refs/heads/guess = $(git -C is-it symbolic-ref HEAD) &&
+
+	git -c init.defaultBranch=none init --bare no-head &&
+	git -C initial-branch push ../no-head guess abc &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git clone no-head is-it2 &&
+	test_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD &&
+	git -C no-head update-ref --no-deref HEAD refs/heads/guess &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=guess clone no-head is-it3 &&
+	test refs/remotes/origin/guess = \
+		$(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5606-clone-options/initial-branch/.git/
+[guess (root-commit) d4c6c35] no-spoilers
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 no-spoilers.t
+Cloning into 'is-it'...
+done.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5606-clone-options/no-head/
+To ../no-head
+ * [new branch]      guess -> guess
+ * [new branch]      abc -> abc
+Cloning into 'is-it2'...
+done.
+warning: remote HEAD refers to nonexistent ref, unable to checkout
+fatal: ref refs/remotes/origin/HEAD is not a symbolic ref
+Cloning into 'is-it3'...
+done.
+ok 21 - guesses initial branch name correctly
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5609-clone-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5607-clone-bundle.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5607-clone-bundle/.git/
+expecting success of 5607.1 'setup': 
+	test_oid_cache <<-EOF &&
+	version sha1:2
+	version sha256:3
+	EOF
+	test_commit initial &&
+	test_tick &&
+	git tag -m tag tag &&
+	test_commit second &&
+	test_commit third &&
+	git tag -d initial &&
+	git tag -d second &&
+	git tag -d third
+
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main 21f74a9] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[main d31729a] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third.t
+Deleted tag 'initial' (was 24b24cf)
+Deleted tag 'second' (was 21f74a9)
+Deleted tag 'third' (was d31729a)
+ok 1 - setup
+
+expecting success of 5607.2 '"verify" needs a worktree': 
+	git bundle create tip.bundle -1 main &&
+	nongit test_must_fail git bundle verify ../tip.bundle 2>err &&
+	test_grep "need a repository" err
+
+error: need a repository to verify a bundle
+ok 2 - "verify" needs a worktree
+
+expecting success of 5607.3 'annotated tags can be excluded by rev-list options': 
+	git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 &&
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD)	HEAD
+	$(git rev-parse tag)	refs/tags/tag
+	$(git rev-parse main)	refs/heads/main
+	EOF
+	git ls-remote bundle >actual &&
+	test_cmp expect actual &&
+
+	git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 &&
 	cat >expect <<-EOF &&
 	$(git rev-parse HEAD)	HEAD
 	$(git rev-parse main)	refs/heads/main
@@ -363576,458 +363862,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5606-clone-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5606-clone-options/.git/
-expecting success of 5606.1 'setup': 
-
-	mkdir parent &&
-	(cd parent && git init &&
-	 echo one >file && git add file &&
-	 git commit -m one) &&
-	git clone --depth=1 --no-local parent shallow-repo
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5606-clone-options/parent/.git/
-[main (root-commit) 1993c08] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'shallow-repo'...
-ok 1 - setup
-
-expecting success of 5606.2 'submodule.stickyRecursiveClone flag manipulates submodule.recurse value': 
-
-	test_config_global submodule.stickyRecursiveClone true &&
-	git clone --recurse-submodules parent clone_recurse_true &&
-	test_cmp_config -C clone_recurse_true true submodule.recurse &&
-
-	test_config_global submodule.stickyRecursiveClone false &&
-	git clone --recurse-submodules parent clone_recurse_false &&
-	test_expect_code 1 git -C clone_recurse_false config --get submodule.recurse
-
-
-Cloning into 'clone_recurse_true'...
-done.
-Cloning into 'clone_recurse_false'...
-done.
-ok 2 - submodule.stickyRecursiveClone flag manipulates submodule.recurse value
-
-expecting success of 5606.3 'clone -o': 
-
-	git clone -o foo parent clone-o &&
-	git -C clone-o rev-parse --verify refs/remotes/foo/main
-
-
-Cloning into 'clone-o'...
-done.
-1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
-ok 3 - clone -o
-
-expecting success of 5606.4 'rejects invalid -o/--origin': 
-
-	test_must_fail git clone -o "bad...name" parent clone-bad-name 2>err &&
-	test_grep "'bad...name' is not a valid remote name" err
-
-
-fatal: 'bad...name' is not a valid remote name
-ok 4 - rejects invalid -o/--origin
-
-expecting success of 5606.5 'clone --bare -o': 
-
-	git clone -o foo --bare parent clone-bare-o &&
-	(cd parent && pwd) >expect &&
-	git -C clone-bare-o config remote.foo.url >actual &&
-	test_cmp expect actual
-
-
-Cloning into bare repository 'clone-bare-o'...
-done.
-ok 5 - clone --bare -o
-
-expecting success of 5606.6 'disallows --bare with --separate-git-dir': 
-
-	test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&
-	test_debug "cat err" &&
-	test_grep -e "options .--bare. and .--separate-git-dir. cannot be used together" err
-
-
-fatal: options '--bare' and '--separate-git-dir' cannot be used together
-ok 6 - disallows --bare with --separate-git-dir
-
-expecting success of 5606.7 'disallows --bundle-uri with shallow options': 
-	for option in --depth=1 --shallow-since=01-01-2000 --shallow-exclude=HEAD
-	do
-		test_must_fail git clone --bundle-uri=bundle $option from to 2>err &&
-		grep "bundle-uri.* cannot be used together" err || return 1
-	done
-
-fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
-fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
-fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
-ok 7 - disallows --bundle-uri with shallow options
-
-expecting success of 5606.8 'reject cloning shallow repository': 
-	test_when_finished "rm -rf repo" &&
-	test_must_fail git clone --reject-shallow shallow-repo out 2>err &&
-	test_grep -e "source repository is shallow, reject to clone." err &&
-
-	git clone --no-reject-shallow shallow-repo repo
-
-fatal: source repository is shallow, reject to clone.
-Cloning into 'repo'...
-ok 8 - reject cloning shallow repository
-
-expecting success of 5606.9 'reject cloning non-local shallow repository': 
-	test_when_finished "rm -rf repo" &&
-	test_must_fail git clone --reject-shallow --no-local shallow-repo out 2>err &&
-	test_grep -e "source repository is shallow, reject to clone." err &&
-
-	git clone --no-reject-shallow --no-local shallow-repo repo
-
-fatal: source repository is shallow, reject to clone.
-Cloning into 'repo'...
-ok 9 - reject cloning non-local shallow repository
-
-expecting success of 5606.10 'succeed cloning normal repository': 
-	test_when_finished "rm -rf chilad1 child2 child3 child4 " &&
-	git clone --reject-shallow parent child1 &&
-	git clone --reject-shallow --no-local parent child2 &&
-	git clone --no-reject-shallow parent child3 &&
-	git clone --no-reject-shallow --no-local parent child4
-
-Cloning into 'child1'...
-done.
-Cloning into 'child2'...
-Cloning into 'child3'...
-done.
-Cloning into 'child4'...
-ok 10 - succeed cloning normal repository
-
-expecting success of 5606.11 'uses "origin" for default remote name': 
-
-	git clone parent clone-default-origin &&
-	git -C clone-default-origin rev-parse --verify refs/remotes/origin/main
-
-
-Cloning into 'clone-default-origin'...
-done.
-1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
-ok 11 - uses "origin" for default remote name
-
-expecting success of 5606.12 'prefers --template config over normal config': 
-
-	template="$TRASH_DIRECTORY/template-with-config" &&
-	mkdir "$template" &&
-	git config --file "$template/config" foo.bar from_template &&
-	test_config_global foo.bar from_global &&
-	git clone "--template=$template" parent clone-template-config &&
-	test "$(git -C clone-template-config config --local foo.bar)" = "from_template"
-
-
-Cloning into 'clone-template-config'...
-done.
-ok 12 - prefers --template config over normal config
-
-expecting success of 5606.13 'prefers -c config over --template config': 
-
-	template="$TRASH_DIRECTORY/template-with-ignored-config" &&
-	mkdir "$template" &&
-	git config --file "$template/config" foo.bar from_template &&
-	git clone "--template=$template" -c foo.bar=inline parent clone-template-inline-config &&
-	test "$(git -C clone-template-inline-config config --local foo.bar)" = "inline"
-
-
-Cloning into 'clone-template-inline-config'...
-done.
-ok 13 - prefers -c config over --template config
-
-expecting success of 5606.14 'ignore --template config for core.bare': 
-
-	template="$TRASH_DIRECTORY/template-with-bare-config" &&
-	mkdir "$template" &&
-	git config --file "$template/config" core.bare true &&
-	git clone "--template=$template" parent clone-bare-config &&
-	test "$(git -C clone-bare-config config --local core.bare)" = "false" &&
-	test_path_is_missing clone-bare-config/HEAD
-
-Cloning into 'clone-bare-config'...
-done.
-ok 14 - ignore --template config for core.bare
-
-expecting success of 5606.15 'prefers config "clone.defaultRemoteName" over default': 
-
-	test_config_global clone.defaultRemoteName from_config &&
-	git clone parent clone-config-origin &&
-	git -C clone-config-origin rev-parse --verify refs/remotes/from_config/main
-
-
-Cloning into 'clone-config-origin'...
-done.
-1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
-ok 15 - prefers config "clone.defaultRemoteName" over default
-
-expecting success of 5606.16 'prefers --origin over -c config': 
-
-	git clone -c clone.defaultRemoteName=inline --origin from_option parent clone-o-and-inline-config &&
-	git -C clone-o-and-inline-config rev-parse --verify refs/remotes/from_option/main
-
-
-Cloning into 'clone-o-and-inline-config'...
-done.
-1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
-ok 16 - prefers --origin over -c config
-
-expecting success of 5606.17 'redirected clone does not show progress': 
-
-	git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
-	! grep % err &&
-	test_grep ! "Checking connectivity" err
-
-
-ok 17 - redirected clone does not show progress
-
-expecting success of 5606.18 'redirected clone -v does show progress': 
-
-	git clone --progress "file://$(pwd)/parent" clone-redirected-progress \
-		>out 2>err &&
-	grep % err
-
-
-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), done.
-ok 18 - redirected clone -v does show progress
-
-expecting success of 5606.19 'clone does not segfault with --bare and core.bare=false': 
-	test_config_global core.bare false &&
-	git clone --bare parent clone-bare &&
-	echo true >expect &&
-	git -C clone-bare rev-parse --is-bare-repository >actual &&
-	test_cmp expect actual
-
-Cloning into bare repository 'clone-bare'...
-done.
-ok 19 - clone does not segfault with --bare and core.bare=false
-
-expecting success of 5606.20 'chooses correct default initial branch name': 
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=foo init --bare empty &&
-	test_config -C empty lsrefs.unborn advertise &&
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=up -c protocol.version=2 clone empty whats-up &&
-	test refs/heads/foo = $(git -C whats-up symbolic-ref HEAD) &&
-	test refs/heads/foo = $(git -C whats-up config branch.foo.merge)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5606-clone-options/empty/
-Cloning into 'whats-up'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 20 - chooses correct default initial branch name
-
-expecting success of 5606.21 'guesses initial branch name correctly': 
-	git init --initial-branch=guess initial-branch &&
-	test_commit -C initial-branch no-spoilers &&
-	git -C initial-branch branch abc guess &&
-	git clone initial-branch is-it &&
-	test refs/heads/guess = $(git -C is-it symbolic-ref HEAD) &&
-
-	git -c init.defaultBranch=none init --bare no-head &&
-	git -C initial-branch push ../no-head guess abc &&
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git clone no-head is-it2 &&
-	test_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD &&
-	git -C no-head update-ref --no-deref HEAD refs/heads/guess &&
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=guess clone no-head is-it3 &&
-	test refs/remotes/origin/guess = \
-		$(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5606-clone-options/initial-branch/.git/
-[guess (root-commit) d4c6c35] no-spoilers
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 no-spoilers.t
-Cloning into 'is-it'...
-done.
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5606-clone-options/no-head/
-To ../no-head
- * [new branch]      guess -> guess
- * [new branch]      abc -> abc
-Cloning into 'is-it2'...
-done.
-warning: remote HEAD refers to nonexistent ref, unable to checkout
-fatal: ref refs/remotes/origin/HEAD is not a symbolic ref
-Cloning into 'is-it3'...
-done.
-ok 21 - guesses initial branch name correctly
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5611-clone-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5604-clone-reference.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5604-clone-reference/.git/
 expecting success of 5604.1 'preparing first repository': 
@@ -364568,6 +364402,170 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5611-clone-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5615-alternate-env.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5615-alternate-env/.git/
 expecting success of 5615.1 'create alternate repositories': 
@@ -364899,6 +364897,21 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5619-clone-local-ambiguous-transport.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5619-clone-local-ambiguous-transport/.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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5612-clone-refspec.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5612-clone-refspec/.git/
 expecting success of 5612.1 'setup': 
@@ -365111,8 +365124,8 @@
 	! test_cmp expect actual &&
 	test_line_count = 2 actual
 
---- expect	2026-03-04 08:00:43.487352315 +0000
-+++ actual	2026-03-04 08:00:43.471352315 +0000
+--- expect	2025-01-30 02:14:07.836957312 +0000
++++ actual	2025-01-30 02:14:07.816957192 +0000
 @@ -1,2 +1,2 @@
  0c9f2ac7142a96473515181c5d9c2ce77c5ea4ed commit	refs/tags/five
 -5efd04f7018dafa5c97b7431a71f14902ebbdf7e commit	refs/tags/two
@@ -365305,21 +365318,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5619-clone-local-ambiguous-transport.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5619-clone-local-ambiguous-transport/.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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5552-skipping-fetch-negotiator.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5552-skipping-fetch-negotiator/.git/
 expecting success of 5552.1 'fetch.negotiationalgorithm config': 
@@ -366664,6 +366662,369 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5617-clone-submodules-remote.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/.git/
+expecting success of 5617.1 'setup': 
+	git config --global protocol.file.allow always &&
+	git checkout -b main &&
+	test_commit commit1 &&
+	mkdir sub &&
+	(
+		cd sub &&
+		git init &&
+		test_commit subcommit1 &&
+		git tag sub_when_added_to_super &&
+		git branch other
+	) &&
+	git submodule add "file://$pwd/sub" sub &&
+	git commit -m "add submodule" &&
+	(
+		cd sub &&
+		test_commit subcommit2
+	)
+
+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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub/.git/
+[main (root-commit) 5110c63] subcommit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subcommit1.t
+Adding existing repo at 'sub' to the index
+[main 6bdd2d6] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[main c24f10e] subcommit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subcommit2.t
+ok 1 - setup
+
+expecting success of 5617.2 'setup bare clone for server': 
+	git clone --bare "file://$(pwd)/." srv.bare &&
+	git -C srv.bare config --local uploadpack.allowfilter 1 &&
+	git -C srv.bare config --local uploadpack.allowanysha1inwant 1
+
+Cloning into bare repository 'srv.bare'...
+ok 2 - setup bare clone for server
+
+expecting success of 5617.3 'clone with --no-remote-submodules': 
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --no-remote-submodules "file://$pwd/." super_clone &&
+	(
+		cd super_clone/sub &&
+		git diff --exit-code sub_when_added_to_super
+	)
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+ok 3 - clone with --no-remote-submodules
+
+expecting success of 5617.4 'clone with --remote-submodules': 
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --remote-submodules "file://$pwd/." super_clone &&
+	(
+		cd super_clone/sub &&
+		git diff --exit-code remotes/origin/main
+	)
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
+Submodule path 'sub': checked out 'c24f10ee4103ccdd16360092dcb618ad35ca1288'
+ok 4 - clone with --remote-submodules
+
+expecting success of 5617.5 'check the default is --no-remote-submodules': 
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules "file://$pwd/." super_clone &&
+	(
+		cd super_clone/sub &&
+		git diff --exit-code sub_when_added_to_super
+	)
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+ok 5 - check the default is --no-remote-submodules
+
+expecting success of 5617.6 'clone with --single-branch': 
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --single-branch "file://$pwd/." super_clone &&
+	(
+		cd super_clone/sub &&
+		git rev-parse --verify origin/main &&
+		test_must_fail git rev-parse --verify origin/other
+	)
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+c24f10ee4103ccdd16360092dcb618ad35ca1288
+fatal: Needed a single revision
+ok 6 - clone with --single-branch
+
+expecting success of 5617.7 'clone with --filter': 
+	git clone --recurse-submodules \
+		--filter blob:none --also-filter-submodules \
+		"file://$pwd/srv.bare" super_clone &&
+	test_cmp_config -C super_clone true remote.origin.promisor &&
+	test_cmp_config -C super_clone blob:none remote.origin.partialclonefilter &&
+	test_cmp_config -C super_clone/sub true remote.origin.promisor &&
+	test_cmp_config -C super_clone/sub blob:none remote.origin.partialclonefilter
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
+warning: filtering not recognized by server, ignoring
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+ok 7 - clone with --filter
+
+expecting success of 5617.8 'filters applied with clone.filterSubmodules': 
+	test_config_global clone.filterSubmodules true &&
+	git clone --recurse-submodules --filter blob:none \
+		"file://$pwd/srv.bare" super_clone2 &&
+	test_cmp_config -C super_clone2 true remote.origin.promisor &&
+	test_cmp_config -C super_clone2 blob:none remote.origin.partialclonefilter &&
+	test_cmp_config -C super_clone2/sub true remote.origin.promisor &&
+	test_cmp_config -C super_clone2/sub blob:none remote.origin.partialclonefilter
+
+Cloning into 'super_clone2'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone2/sub'...
+warning: filtering not recognized by server, ignoring
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+ok 8 - filters applied with clone.filterSubmodules
+
+expecting success of 5617.9 '--no-also-filter-submodules overrides clone.filterSubmodules=true': 
+	test_config_global clone.filterSubmodules true &&
+	git clone --recurse-submodules --filter blob:none \
+		--no-also-filter-submodules \
+		"file://$pwd/srv.bare" super_clone3 &&
+	test_cmp_config -C super_clone3 true remote.origin.promisor &&
+	test_cmp_config -C super_clone3 blob:none remote.origin.partialclonefilter &&
+	test_cmp_config -C super_clone3/sub false --default false remote.origin.promisor
+
+Cloning into 'super_clone3'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone3/sub'...
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+ok 9 - --no-also-filter-submodules overrides clone.filterSubmodules=true
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5614-clone-submodules-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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 f469455] 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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/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 dade4d6] 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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/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 8743fc2] 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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5701-git-serve.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5701-git-serve/.git/
 expecting success of 5701.1 'test capability advertisement': 
@@ -367103,369 +367464,6 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5617-clone-submodules-remote.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/.git/
-expecting success of 5617.1 'setup': 
-	git config --global protocol.file.allow always &&
-	git checkout -b main &&
-	test_commit commit1 &&
-	mkdir sub &&
-	(
-		cd sub &&
-		git init &&
-		test_commit subcommit1 &&
-		git tag sub_when_added_to_super &&
-		git branch other
-	) &&
-	git submodule add "file://$pwd/sub" sub &&
-	git commit -m "add submodule" &&
-	(
-		cd sub &&
-		test_commit subcommit2
-	)
-
-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
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub/.git/
-[main (root-commit) 5110c63] subcommit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subcommit1.t
-Adding existing repo at 'sub' to the index
-[main 6bdd2d6] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[main c24f10e] subcommit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subcommit2.t
-ok 1 - setup
-
-expecting success of 5617.2 'setup bare clone for server': 
-	git clone --bare "file://$(pwd)/." srv.bare &&
-	git -C srv.bare config --local uploadpack.allowfilter 1 &&
-	git -C srv.bare config --local uploadpack.allowanysha1inwant 1
-
-Cloning into bare repository 'srv.bare'...
-ok 2 - setup bare clone for server
-
-expecting success of 5617.3 'clone with --no-remote-submodules': 
-	test_when_finished "rm -rf super_clone" &&
-	git clone --recurse-submodules --no-remote-submodules "file://$pwd/." super_clone &&
-	(
-		cd super_clone/sub &&
-		git diff --exit-code sub_when_added_to_super
-	)
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-ok 3 - clone with --no-remote-submodules
-
-expecting success of 5617.4 'clone with --remote-submodules': 
-	test_when_finished "rm -rf super_clone" &&
-	git clone --recurse-submodules --remote-submodules "file://$pwd/." super_clone &&
-	(
-		cd super_clone/sub &&
-		git diff --exit-code remotes/origin/main
-	)
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
-Submodule path 'sub': checked out 'c24f10ee4103ccdd16360092dcb618ad35ca1288'
-ok 4 - clone with --remote-submodules
-
-expecting success of 5617.5 'check the default is --no-remote-submodules': 
-	test_when_finished "rm -rf super_clone" &&
-	git clone --recurse-submodules "file://$pwd/." super_clone &&
-	(
-		cd super_clone/sub &&
-		git diff --exit-code sub_when_added_to_super
-	)
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-ok 5 - check the default is --no-remote-submodules
-
-expecting success of 5617.6 'clone with --single-branch': 
-	test_when_finished "rm -rf super_clone" &&
-	git clone --recurse-submodules --single-branch "file://$pwd/." super_clone &&
-	(
-		cd super_clone/sub &&
-		git rev-parse --verify origin/main &&
-		test_must_fail git rev-parse --verify origin/other
-	)
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-c24f10ee4103ccdd16360092dcb618ad35ca1288
-fatal: Needed a single revision
-ok 6 - clone with --single-branch
-
-expecting success of 5617.7 'clone with --filter': 
-	git clone --recurse-submodules \
-		--filter blob:none --also-filter-submodules \
-		"file://$pwd/srv.bare" super_clone &&
-	test_cmp_config -C super_clone true remote.origin.promisor &&
-	test_cmp_config -C super_clone blob:none remote.origin.partialclonefilter &&
-	test_cmp_config -C super_clone/sub true remote.origin.promisor &&
-	test_cmp_config -C super_clone/sub blob:none remote.origin.partialclonefilter
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
-warning: filtering not recognized by server, ignoring
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-ok 7 - clone with --filter
-
-expecting success of 5617.8 'filters applied with clone.filterSubmodules': 
-	test_config_global clone.filterSubmodules true &&
-	git clone --recurse-submodules --filter blob:none \
-		"file://$pwd/srv.bare" super_clone2 &&
-	test_cmp_config -C super_clone2 true remote.origin.promisor &&
-	test_cmp_config -C super_clone2 blob:none remote.origin.partialclonefilter &&
-	test_cmp_config -C super_clone2/sub true remote.origin.promisor &&
-	test_cmp_config -C super_clone2/sub blob:none remote.origin.partialclonefilter
-
-Cloning into 'super_clone2'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone2/sub'...
-warning: filtering not recognized by server, ignoring
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-ok 8 - filters applied with clone.filterSubmodules
-
-expecting success of 5617.9 '--no-also-filter-submodules overrides clone.filterSubmodules=true': 
-	test_config_global clone.filterSubmodules true &&
-	git clone --recurse-submodules --filter blob:none \
-		--no-also-filter-submodules \
-		"file://$pwd/srv.bare" super_clone3 &&
-	test_cmp_config -C super_clone3 true remote.origin.promisor &&
-	test_cmp_config -C super_clone3 blob:none remote.origin.partialclonefilter &&
-	test_cmp_config -C super_clone3/sub false --default false remote.origin.promisor
-
-Cloning into 'super_clone3'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5617-clone-submodules-remote/super_clone3/sub'...
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-ok 9 - --no-also-filter-submodules overrides clone.filterSubmodules=true
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5614-clone-submodules-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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 f469455] 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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/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 dade4d6] 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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/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 8743fc2] 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.47.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5700-protocol-v1.sh ***
 checking prerequisite: PIPE
 
@@ -367479,7 +367477,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[703376] Ready to rumble
+[1953530] 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
@@ -367504,11 +367502,11 @@
 	# Server responded using protocol v1
 	grep "clone< version 1" log
 
-[703499] Connection from 127.0.0.1:51668
-[703499] Extended attribute "host": 127.0.0.1:5700
-[703499] Extended attribute "protocol": version=1
-[703499] Request upload-pack for '/parent'
-[703376] [703499] Disconnected
+[1953662] Connection from 127.0.0.1:34718
+[1953662] Extended attribute "host": 127.0.0.1:5700
+[1953662] Extended attribute "protocol": version=1
+[1953662] Request upload-pack for '/parent'
+[1953530] [1953662] 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
@@ -367532,11 +367530,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-[703773] Connection from 127.0.0.1:51676
-[703773] Extended attribute "host": 127.0.0.1:5700
-[703773] Extended attribute "protocol": version=1
-[703773] Request upload-pack for '/parent'
-[703376] [703773] Disconnected
+[1953917] Connection from 127.0.0.1:34732
+[1953917] Extended attribute "host": 127.0.0.1:5700
+[1953917] Extended attribute "protocol": version=1
+[1953917] Request upload-pack for '/parent'
+[1953530] [1953917] 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
@@ -367554,11 +367552,11 @@
 	# Server responded using protocol v1
 	grep "fetch< version 1" log
 
-[704083] Connection from 127.0.0.1:51680
-[704083] Extended attribute "host": 127.0.0.1:5700
-[704083] Extended attribute "protocol": version=1
-[704083] Request upload-pack for '/parent'
-[703376] [704083] Disconnected
+[1954156] Connection from 127.0.0.1:34736
+[1954156] Extended attribute "host": 127.0.0.1:5700
+[1954156] Extended attribute "protocol": version=1
+[1954156] Request upload-pack for '/parent'
+[1953530] [1954156] Disconnected
 Updating d79ce16..139b20d
 Fast-forward
  two.t | 1 +
@@ -367589,17 +367587,16 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 three.t
-[704362] Connection from 127.0.0.1:51692
-[704362] Extended attribute "host": 127.0.0.1:5700
-[704362] Extended attribute "protocol": version=1
-[704362] Request receive-pack for '/parent'
-[703376] [704362] Disconnected
+[1954364] Connection from 127.0.0.1:34744
+[1954364] Extended attribute "host": 127.0.0.1:5700
+[1954364] Extended attribute "protocol": version=1
+[1954364] Request receive-pack for '/parent'
+[1953530] [1954364] 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
@@ -368120,574 +368117,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5703-upload-pack-ref-in-want.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
-	perl -ne "/ref-in-want/ and print" out >out.filter &&
-	test_must_be_empty out.filter &&
-
-	git config uploadpack.allowRefInWant false &&
-	test-tool serve-v2 --advertise-capabilities >out &&
-	perl -ne "/ref-in-want/ and print" out >out.filter &&
-	test_must_be_empty out.filter &&
-
-	git config uploadpack.allowRefInWant true &&
-	test-tool serve-v2 --advertise-capabilities >out &&
-	perl -ne "/ref-in-want/ and print" out >out.filter &&
-	test_file_not_empty out.filter
-
-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.47.2/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.47.2/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.47.2/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":"20260304T080049.682682Z-H8d819085-P000ac880","thread":"main","time":"2026-03-04T08:00:49.719799Z","file":"fetch-pack.c","line":1755,"repo":1,"t_abs":0.037303,"t_rel":0.001827,"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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5601-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5601-clone/.git/
 expecting success of 5601.1 'setup': 
@@ -370238,7 +369667,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[708936] Ready to rumble
+[1958310] 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 &&
@@ -370267,11 +369696,11 @@
 
 	! grep bundle-uri log
 
-[709148] Connection from 127.0.0.1:37316
-[709148] Extended attribute "host": 127.0.0.1:5731
-[709148] Extended attribute "protocol": version=2
-[709148] Request upload-pack for '/parent'
-[708936] [709148] Disconnected
+[1958526] Connection from 127.0.0.1:59074
+[1958526] Extended attribute "host": 127.0.0.1:5731
+[1958526] Extended attribute "protocol": version=2
+[1958526] Request upload-pack for '/parent'
+[1958310] [1958526] Disconnected
 packet:    ls-remote< version 2
 ok 2 - connect with git:// using protocol v2: no bundle-uri
 
@@ -370290,11 +369719,11 @@
 	# Server advertised bundle-uri capability
 	grep "< bundle-uri" log
 
-[709327] Connection from 127.0.0.1:37318
-[709327] Extended attribute "host": 127.0.0.1:5731
-[709327] Extended attribute "protocol": version=2
-[709327] Request upload-pack for '/parent'
-[708936] [709327] Disconnected
+[1958677] Connection from 127.0.0.1:59086
+[1958677] Extended attribute "host": 127.0.0.1:5731
+[1958677] Extended attribute "protocol": version=2
+[1958677] Request upload-pack for '/parent'
+[1958310] [1958677] Disconnected
 packet:    ls-remote< version 2
 packet:    ls-remote< bundle-uri
 ok 3 - connect with git:// using protocol v2: have bundle-uri
@@ -370351,28 +369780,28 @@
 	# Client did not issue bundle-uri command (--bundle-uri override)
 	! grep "> command=bundle-uri" log3
 
-[709495] Connection from 127.0.0.1:37324
-[709495] Extended attribute "host": 127.0.0.1:5731
-[709495] Extended attribute "protocol": version=2
-[709495] Request upload-pack for '/parent'
-[708936] [709495] Disconnected
+[1958771] Connection from 127.0.0.1:59088
+[1958771] Extended attribute "host": 127.0.0.1:5731
+[1958771] Extended attribute "protocol": version=2
+[1958771] Request upload-pack for '/parent'
+[1958310] [1958771] Disconnected
 packet:        clone< version 2
 packet:        clone< bundle-uri
-[709717] Connection from 127.0.0.1:37326
-[709717] Extended attribute "host": 127.0.0.1:5731
-[709717] Extended attribute "protocol": version=2
-[709717] Request upload-pack for '/parent'
-[708936] [709717] Disconnected
+[1958913] Connection from 127.0.0.1:59094
+[1958913] Extended attribute "host": 127.0.0.1:5731
+[1958913] Extended attribute "protocol": version=2
+[1958913] Request upload-pack for '/parent'
+[1958310] [1958913] Disconnected
 packet:        clone< version 2
 packet:        clone< version 2
 packet:        clone< bundle-uri
 packet:        clone< bundle-uri
 packet:        clone> command=bundle-uri
-[709969] Connection from 127.0.0.1:37332
-[709969] Extended attribute "host": 127.0.0.1:5731
-[709969] Extended attribute "protocol": version=2
-[709969] Request upload-pack for '/parent'
-[708936] [709969] Disconnected
+[1959084] Connection from 127.0.0.1:59102
+[1959084] Extended attribute "host": 127.0.0.1:5731
+[1959084] Extended attribute "protocol": version=2
+[1959084] Request upload-pack for '/parent'
+[1958310] [1959084] Disconnected
 packet:        clone< version 2
 packet:        clone< bundle-uri
 ok 4 - clone with git:// using protocol v2: request bundle-uris
@@ -370401,11 +369830,11 @@
 		>actual &&
 	test_cmp_config_output expect actual
 
-[710277] Connection from 127.0.0.1:37346
-[710277] Extended attribute "host": 127.0.0.1:5731
-[710277] Extended attribute "protocol": version=2
-[710277] Request upload-pack for '/parent'
-[708936] [710277] Disconnected
+[1959324] Connection from 127.0.0.1:59114
+[1959324] Extended attribute "host": 127.0.0.1:5731
+[1959324] Extended attribute "protocol": version=2
+[1959324] Request upload-pack for '/parent'
+[1958310] [1959324] 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': 
@@ -370430,11 +369859,11 @@
 		>actual &&
 	test_cmp_config_output expect actual
 
-[710591] Connection from 127.0.0.1:37356
-[710591] Extended attribute "host": 127.0.0.1:5731
-[710591] Extended attribute "protocol": version=2
-[710591] Request upload-pack for '/parent'
-[708936] [710591] Disconnected
+[1959556] Connection from 127.0.0.1:59130
+[1959556] Extended attribute "host": 127.0.0.1:5731
+[1959556] Extended attribute "protocol": version=2
+[1959556] Request upload-pack for '/parent'
+[1958310] [1959556] 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': 
@@ -370464,15 +369893,14 @@
 		>actual &&
 	test_cmp_config_output expect actual
 
-[710924] Connection from 127.0.0.1:37370
-[710924] Extended attribute "host": 127.0.0.1:5731
-[710924] Extended attribute "protocol": version=2
-[710924] Request upload-pack for '/parent'
-[708936] [710924] Disconnected
+[1959830] Connection from 127.0.0.1:59146
+[1959830] Extended attribute "host": 127.0.0.1:5731
+[1959830] Extended attribute "protocol": version=2
+[1959830] Request upload-pack for '/parent'
+[1958310] [1959830] 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.47.2/t'
@@ -370776,162 +370204,343 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5812-proto-disable-http.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5802-connect-helper.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t5705-session-id-in-capabilities.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/.git/
+expecting success of 5705.1 'setup repos for session ID capability tests': 
+	git init "$REPO" &&
+	test_commit -C "$REPO" a &&
+	git clone "file://$REPO" "$LOCAL_PRISTINE" &&
+	test_commit -C "$REPO" b
 
-[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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo/.git/
+[master (root-commit) ce450c7] a
  Author: A U Thor <author@example.com>
-[master b0c6cf2] fourth
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/local_pristine'...
+[master 020ea9b] b
  Author: A U Thor <author@example.com>
-ok 1 - setup
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+ok 1 - setup repos for session ID capability tests
 
-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
+expecting success of 5705.2 'session IDs not advertised by default (fetch v0)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local fetch \
+			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+			origin &&
+		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
+		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+ok 2 - session IDs not advertised by default (fetch v0)
 
-Cloning into 'dst'...
-ok 2 - clone
+expecting success of 5705.3 'session IDs not advertised by default (push v0)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		test_when_finished "git -C local push --delete origin new-branch" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		git -C local pull --no-rebase origin &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local push \
+			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
+			origin HEAD:new-branch &&
+		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
+		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+Updating ce450c7..020ea9b
+Fast-forward
+ b.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ - [deleted]         new-branch
+ok 3 - session IDs not advertised by default (push v0)
 
-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
+expecting success of 5705.4 'session IDs not advertised by default (fetch v1)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local fetch \
+			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+			origin &&
+		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
+		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+ok 4 - session IDs not advertised by default (fetch v1)
 
-[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
+expecting success of 5705.5 'session IDs not advertised by default (push v1)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		test_when_finished "git -C local push --delete origin new-branch" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		git -C local pull --no-rebase origin &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local push \
+			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
+			origin HEAD:new-branch &&
+		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
+		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+Updating ce450c7..020ea9b
 Fast-forward
-ok 3 - update following tag
+ b.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ - [deleted]         new-branch
+ok 5 - session IDs not advertised by default (push v1)
 
-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
+expecting success of 5705.6 'session IDs not advertised by default (fetch v2)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local fetch \
+			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+			origin &&
+		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
+		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+ok 6 - session IDs not advertised by default (fetch v2)
 
-[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
+expecting success of 5705.7 'session IDs not advertised by default (push v2)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		test_when_finished "git -C local push --delete origin new-branch" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		git -C local pull --no-rebase origin &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local push \
+			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
+			origin HEAD:new-branch &&
+		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
+		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+Updating ce450c7..020ea9b
 Fast-forward
-ok 4 - update backfilled tag
+ b.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ - [deleted]         new-branch
+ok 7 - session IDs not advertised by default (push v2)
 
-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
+expecting success of 5705.8 'enable SID advertisement': 
+	git -C "$REPO" config transfer.advertiseSID true &&
+	git -C "$LOCAL_PRISTINE" config transfer.advertiseSID true
 
-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
+ok 8 - enable SID advertisement
 
-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
+expecting success of 5705.9 'session IDs advertised (fetch v0)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local fetch \
+			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+			origin &&
+		grep \"key\":\"server-sid\" tr2-client-events &&
+		grep \"key\":\"client-sid\" tr2-server-events
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20250130T021420.909245Z-H5c947e1c-P001de6f1","thread":"main","time":"2025-01-30T02:14:20.940389Z","file":"transport.c","line":355,"t_abs":0.031328,"t_rel":0.030260,"nesting":3,"category":"transfer","key":"server-sid","value":"20250130T021420.909245Z-H5c947e1c-P001de6f1/20250130T021420.922440Z-H5c947e1c-P001de6fa"}
+{"event":"data","sid":"20250130T021420.909245Z-H5c947e1c-P001de6f1/20250130T021420.922440Z-H5c947e1c-P001de6fa","thread":"main","time":"2025-01-30T02:14:20.943397Z","file":"upload-pack.c","line":1164,"t_abs":0.021182,"t_rel":0.021182,"nesting":1,"category":"transfer","key":"client-sid","value":"20250130T021420.909245Z-H5c947e1c-P001de6f1"}
+ok 9 - session IDs advertised (fetch v0)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5802-connect-helper/remote/one.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5802-connect-helper/remote/host/two.git/
-ok 6 - set up fake git-daemon
+expecting success of 5705.10 'session IDs advertised (push v0)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		test_when_finished "git -C local push --delete origin new-branch" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		git -C local pull --no-rebase origin &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local push \
+			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
+			origin HEAD:new-branch &&
+		grep \"key\":\"server-sid\" tr2-client-events &&
+		grep \"key\":\"client-sid\" tr2-server-events
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+Updating ce450c7..020ea9b
+Fast-forward
+ b.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+{"event":"data","sid":"20250130T021421.394730Z-H5c947e1c-P001de82e","thread":"main","time":"2025-01-30T02:14:21.426585Z","file":"transport.c","line":355,"t_abs":0.032067,"t_rel":0.022663,"nesting":3,"category":"transfer","key":"server-sid","value":"20250130T021421.394730Z-H5c947e1c-P001de82e/20250130T021421.425846Z-H5c947e1c-P001de840"}
+{"event":"data","sid":"20250130T021421.394730Z-H5c947e1c-P001de82e/20250130T021421.425846Z-H5c947e1c-P001de840","thread":"main","time":"2025-01-30T02:14:21.431396Z","file":"builtin/receive-pack.c","line":2134,"t_abs":0.005755,"t_rel":0.005755,"nesting":1,"category":"transfer","key":"client-sid","value":"20250130T021421.394730Z-H5c947e1c-P001de82e"}
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ - [deleted]         new-branch
+ok 10 - session IDs advertised (push v0)
 
-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
+expecting success of 5705.11 'client & server log negotiated version (v0)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local fetch \
+			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+			origin &&
+		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-client-events &&
+		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-server-events
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20250130T021421.834111Z-H5c947e1c-P001de961","thread":"main","time":"2025-01-30T02:14:21.863498Z","file":"connect.c","line":177,"t_abs":0.029593,"t_rel":0.028482,"nesting":3,"category":"transfer","key":"negotiated-version","value":"0"}
+{"event":"data","sid":"20250130T021421.834111Z-H5c947e1c-P001de961/20250130T021421.854472Z-H5c947e1c-P001de96d","thread":"main","time":"2025-01-30T02:14:21.854999Z","file":"protocol.c","line":80,"t_abs":0.000732,"t_rel":0.000732,"nesting":1,"category":"transfer","key":"negotiated-version","value":"0"}
+ok 11 - client & server log negotiated version (v0)
 
-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 5705.12 'session IDs advertised (fetch v1)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local fetch \
+			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+			origin &&
+		grep \"key\":\"server-sid\" tr2-client-events &&
+		grep \"key\":\"client-sid\" tr2-server-events
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20250130T021422.113999Z-H5c947e1c-P001dea1a","thread":"main","time":"2025-01-30T02:14:22.134800Z","file":"transport.c","line":355,"t_abs":0.020991,"t_rel":0.019763,"nesting":3,"category":"transfer","key":"server-sid","value":"20250130T021422.113999Z-H5c947e1c-P001dea1a/20250130T021422.133837Z-H5c947e1c-P001dea27"}
+{"event":"data","sid":"20250130T021422.113999Z-H5c947e1c-P001dea1a/20250130T021422.133837Z-H5c947e1c-P001dea27","thread":"main","time":"2025-01-30T02:14:22.139392Z","file":"upload-pack.c","line":1164,"t_abs":0.005748,"t_rel":0.005748,"nesting":1,"category":"transfer","key":"client-sid","value":"20250130T021422.113999Z-H5c947e1c-P001dea1a"}
+ok 12 - session IDs advertised (fetch v1)
 
-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
+expecting success of 5705.13 'session IDs advertised (push v1)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		test_when_finished "git -C local push --delete origin new-branch" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		git -C local pull --no-rebase origin &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local push \
+			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
+			origin HEAD:new-branch &&
+		grep \"key\":\"server-sid\" tr2-client-events &&
+		grep \"key\":\"client-sid\" tr2-server-events
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+Updating ce450c7..020ea9b
+Fast-forward
+ b.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+{"event":"data","sid":"20250130T021422.615531Z-H5c947e1c-P001deb8f","thread":"main","time":"2025-01-30T02:14:22.646876Z","file":"transport.c","line":355,"t_abs":0.031568,"t_rel":0.019023,"nesting":3,"category":"transfer","key":"server-sid","value":"20250130T021422.615531Z-H5c947e1c-P001deb8f/20250130T021422.646118Z-H5c947e1c-P001deb9f"}
+{"event":"data","sid":"20250130T021422.615531Z-H5c947e1c-P001deb8f/20250130T021422.646118Z-H5c947e1c-P001deb9f","thread":"main","time":"2025-01-30T02:14:22.651402Z","file":"builtin/receive-pack.c","line":2134,"t_abs":0.005473,"t_rel":0.005473,"nesting":1,"category":"transfer","key":"client-sid","value":"20250130T021422.615531Z-H5c947e1c-P001deb8f"}
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ - [deleted]         new-branch
+ok 13 - session IDs advertised (push v1)
 
-Cloning into 'dst'...
-warning: You appear to have cloned an empty repository.
-ok 8 - ext command can connect to git daemon (vhost)
+expecting success of 5705.14 'client & server log negotiated version (v1)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local fetch \
+			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+			origin &&
+		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-client-events &&
+		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-server-events
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20250130T021422.982051Z-H5c947e1c-P001dec95","thread":"main","time":"2025-01-30T02:14:22.993351Z","file":"connect.c","line":177,"t_abs":0.011502,"t_rel":0.010384,"nesting":3,"category":"transfer","key":"negotiated-version","value":"1"}
+{"event":"data","sid":"20250130T021422.982051Z-H5c947e1c-P001dec95/20250130T021422.990265Z-H5c947e1c-P001deca0","thread":"main","time":"2025-01-30T02:14:22.990764Z","file":"protocol.c","line":80,"t_abs":0.000694,"t_rel":0.000694,"nesting":1,"category":"transfer","key":"negotiated-version","value":"1"}
+ok 14 - client & server log negotiated version (v1)
 
-# passed all 8 test(s)
-1..8
+expecting success of 5705.15 'session IDs advertised (fetch v2)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local fetch \
+			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+			origin &&
+		grep \"key\":\"server-sid\" tr2-client-events &&
+		grep \"key\":\"client-sid\" tr2-server-events
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20250130T021423.249904Z-H5c947e1c-P001ded48","thread":"main","time":"2025-01-30T02:14:23.267553Z","file":"transport.c","line":338,"t_abs":0.017846,"t_rel":0.016749,"nesting":3,"category":"transfer","key":"server-sid","value":"20250130T021423.249904Z-H5c947e1c-P001ded48/20250130T021423.266170Z-H5c947e1c-P001ded5e"}
+{"event":"data","sid":"20250130T021423.249904Z-H5c947e1c-P001ded48/20250130T021423.266170Z-H5c947e1c-P001ded5e","thread":"main","time":"2025-01-30T02:14:23.279393Z","file":"serve.c","line":70,"t_abs":0.013404,"t_rel":0.013404,"nesting":1,"category":"transfer","key":"client-sid","value":"20250130T021423.249904Z-H5c947e1c-P001ded48"}
+ok 15 - session IDs advertised (fetch v2)
+
+expecting success of 5705.16 'session IDs advertised (push v2)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		test_when_finished "git -C local push --delete origin new-branch" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		git -C local pull --no-rebase origin &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local push \
+			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
+			origin HEAD:new-branch &&
+		grep \"key\":\"server-sid\" tr2-client-events &&
+		grep \"key\":\"client-sid\" tr2-server-events
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+Updating ce450c7..020ea9b
+Fast-forward
+ b.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ * [new branch]      HEAD -> new-branch
+{"event":"data","sid":"20250130T021423.635477Z-H5c947e1c-P001dee73","thread":"main","time":"2025-01-30T02:14:23.648468Z","file":"transport.c","line":355,"t_abs":0.013228,"t_rel":0.012209,"nesting":3,"category":"transfer","key":"server-sid","value":"20250130T021423.635477Z-H5c947e1c-P001dee73/20250130T021423.647686Z-H5c947e1c-P001dee7a"}
+{"event":"data","sid":"20250130T021423.635477Z-H5c947e1c-P001dee73/20250130T021423.647686Z-H5c947e1c-P001dee7a","thread":"main","time":"2025-01-30T02:14:23.655394Z","file":"builtin/receive-pack.c","line":2134,"t_abs":0.007909,"t_rel":0.007909,"nesting":1,"category":"transfer","key":"client-sid","value":"20250130T021423.635477Z-H5c947e1c-P001dee73"}
+To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+ - [deleted]         new-branch
+ok 16 - session IDs advertised (push v2)
+
+expecting success of 5705.17 'client & server log negotiated version (v2)': 
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local fetch \
+			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+			origin &&
+		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-client-events &&
+		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-server-events
+	
+From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
+   ce450c7..020ea9b  master     -> origin/master
+ * [new tag]         b          -> b
+{"event":"data","sid":"20250130T021424.038147Z-H5c947e1c-P001def83","thread":"main","time":"2025-01-30T02:14:24.059395Z","file":"connect.c","line":177,"t_abs":0.021448,"t_rel":0.020354,"nesting":3,"category":"transfer","key":"negotiated-version","value":"2"}
+{"event":"data","sid":"20250130T021424.038147Z-H5c947e1c-P001def83/20250130T021424.054856Z-H5c947e1c-P001def8e","thread":"main","time":"2025-01-30T02:14:24.055388Z","file":"protocol.c","line":80,"t_abs":0.000730,"t_rel":0.000730,"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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5526-fetch-submodules.sh ***
@@ -372230,14 +371839,14 @@
 warning: 9046bc78daaa9f50e656f8625005fb634da44370:.gitmodules, multiple configurations found for 'submodule.submodule.url'. Skipping second one!
 Fetching submodule sub1
 Fetching submodule sub1/subdir/deepsubmodule
+From /build/reproducible-path/git-2.47.2/t/trash directory.t5526-fetch-submodules/submodule
+ * branch            0dc9c78ed0042b44e5327c2b33655845d4c876ae -> FETCH_HEAD
+Fetching submodule submodule/subdir/deepsubmodule
 Fetching submodule submodule
 Fetching submodule submodule/subdir/deepsubmodule
 From /build/reproducible-path/git-2.47.2/t/trash directory.t5526-fetch-submodules/./sub1
  * branch            2ba68f261967ab7f6d68525be667d123d03649d4 -> FETCH_HEAD
 Fetching submodule sub1/subdir/deepsubmodule
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5526-fetch-submodules/submodule
- * branch            0dc9c78ed0042b44e5327c2b33655845d4c876ae -> FETCH_HEAD
-Fetching submodule submodule/subdir/deepsubmodule
 commit
 commit
 Previous HEAD position was d83be38 delete gitmodules file
@@ -372797,343 +372406,730 @@
 1..54
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5705-session-id-in-capabilities.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/.git/
-expecting success of 5705.1 'setup repos for session ID capability tests': 
-	git init "$REPO" &&
-	test_commit -C "$REPO" a &&
-	git clone "file://$REPO" "$LOCAL_PRISTINE" &&
-	test_commit -C "$REPO" b
+*** t5703-upload-pack-ref-in-want.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo/.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 '/build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/local_pristine'...
-[master 020ea9b] b
+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
-ok 1 - setup repos for session ID capability tests
+[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 5705.2 'session IDs not advertised by default (fetch v0)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local fetch \
-			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
-			origin &&
-		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
-		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-ok 2 - session IDs not advertised by default (fetch v0)
+expecting success of 5703.2 'config controls ref-in-want advertisement': 
+	test-tool serve-v2 --advertise-capabilities >out &&
+	perl -ne "/ref-in-want/ and print" out >out.filter &&
+	test_must_be_empty out.filter &&
 
-expecting success of 5705.3 'session IDs not advertised by default (push v0)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		test_when_finished "git -C local push --delete origin new-branch" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		git -C local pull --no-rebase origin &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local push \
-			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
-			origin HEAD:new-branch &&
-		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
-		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-Updating ce450c7..020ea9b
-Fast-forward
- b.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- - [deleted]         new-branch
-ok 3 - session IDs not advertised by default (push v0)
+	git config uploadpack.allowRefInWant false &&
+	test-tool serve-v2 --advertise-capabilities >out &&
+	perl -ne "/ref-in-want/ and print" out >out.filter &&
+	test_must_be_empty out.filter &&
 
-expecting success of 5705.4 'session IDs not advertised by default (fetch v1)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local fetch \
-			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
-			origin &&
-		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
-		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-ok 4 - session IDs not advertised by default (fetch v1)
+	git config uploadpack.allowRefInWant true &&
+	test-tool serve-v2 --advertise-capabilities >out &&
+	perl -ne "/ref-in-want/ and print" out >out.filter &&
+	test_file_not_empty out.filter
 
-expecting success of 5705.5 'session IDs not advertised by default (push v1)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		test_when_finished "git -C local push --delete origin new-branch" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		git -C local pull --no-rebase origin &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local push \
-			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
-			origin HEAD:new-branch &&
-		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
-		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-Updating ce450c7..020ea9b
-Fast-forward
- b.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- - [deleted]         new-branch
-ok 5 - session IDs not advertised by default (push v1)
+ok 2 - config controls ref-in-want advertisement
 
-expecting success of 5705.6 'session IDs not advertised by default (fetch v2)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local fetch \
-			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
-			origin &&
-		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
-		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-ok 6 - session IDs not advertised by default (fetch v2)
+expecting success of 5703.3 'invalid want-ref line': 
+	write_fetch_command >pkt <<-EOF &&
+	want-ref refs/heads/non-existent
+	EOF
 
-expecting success of 5705.7 'session IDs not advertised by default (push v2)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		test_when_finished "git -C local push --delete origin new-branch" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		git -C local pull --no-rebase origin &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local push \
-			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
-			origin HEAD:new-branch &&
-		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
-		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-Updating ce450c7..020ea9b
-Fast-forward
- b.t | 1 +
+	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.47.2/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.47.2/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
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- - [deleted]         new-branch
-ok 7 - session IDs not advertised by default (push v2)
+[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 5705.8 'enable SID advertisement': 
-	git -C "$REPO" config transfer.advertiseSID true &&
-	git -C "$LOCAL_PRISTINE" config transfer.advertiseSID true
+expecting success of 5703.9 'fetching with exact OID': 
+	test_when_finished "rm -f log trace2" &&
 
-ok 8 - enable SID advertisement
+	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 &&
 
-expecting success of 5705.9 'session IDs advertised (fetch v0)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local fetch \
-			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
-			origin &&
-		grep \"key\":\"server-sid\" tr2-client-events &&
-		grep \"key\":\"client-sid\" tr2-server-events
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20260304T080053.828108Z-H8d819085-P000ad8ec","thread":"main","time":"2026-03-04T08:00:53.854834Z","file":"transport.c","line":355,"t_abs":0.026931,"t_rel":0.025802,"nesting":3,"category":"transfer","key":"server-sid","value":"20260304T080053.828108Z-H8d819085-P000ad8ec/20260304T080053.853897Z-H8d819085-P000ad90a"}
-{"event":"data","sid":"20260304T080053.828108Z-H8d819085-P000ad8ec/20260304T080053.853897Z-H8d819085-P000ad90a","thread":"main","time":"2026-03-04T08:00:53.861010Z","file":"upload-pack.c","line":1164,"t_abs":0.007290,"t_rel":0.007290,"nesting":1,"category":"transfer","key":"client-sid","value":"20260304T080053.828108Z-H8d819085-P000ad8ec"}
-ok 9 - session IDs advertised (fetch v0)
+	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
 
-expecting success of 5705.10 'session IDs advertised (push v0)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		test_when_finished "git -C local push --delete origin new-branch" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		git -C local pull --no-rebase origin &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local push \
-			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
-			origin HEAD:new-branch &&
-		grep \"key\":\"server-sid\" tr2-client-events &&
-		grep \"key\":\"client-sid\" tr2-server-events
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
+From file:///build/reproducible-path/git-2.47.2/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":"20250130T021420.261881Z-H5c947e1c-P001de51c","thread":"main","time":"2025-01-30T02:14:20.291082Z","file":"fetch-pack.c","line":1755,"repo":1,"t_abs":0.029399,"t_rel":0.001770,"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.47.2/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.47.2/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.47.2/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
-Updating ce450c7..020ea9b
-Fast-forward
- b.t | 1 +
+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.47.2/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
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20260304T080054.290391Z-H8d819085-P000adac2","thread":"main","time":"2026-03-04T08:00:54.314657Z","file":"transport.c","line":355,"t_abs":0.024468,"t_rel":0.023463,"nesting":3,"category":"transfer","key":"server-sid","value":"20260304T080054.290391Z-H8d819085-P000adac2/20260304T080054.313933Z-H8d819085-P000adada"}
-{"event":"data","sid":"20260304T080054.290391Z-H8d819085-P000adac2/20260304T080054.313933Z-H8d819085-P000adada","thread":"main","time":"2026-03-04T08:00:54.315134Z","file":"builtin/receive-pack.c","line":2134,"t_abs":0.001387,"t_rel":0.001387,"nesting":1,"category":"transfer","key":"client-sid","value":"20260304T080054.290391Z-H8d819085-P000adac2"}
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- - [deleted]         new-branch
-ok 10 - session IDs advertised (push v0)
+Note: switching to 'a'.
 
-expecting success of 5705.11 'client & server log negotiated version (v0)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local fetch \
-			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
-			origin &&
-		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-client-events &&
-		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-server-events
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20260304T080054.614982Z-H8d819085-P000adc2c","thread":"main","time":"2026-03-04T08:00:54.645020Z","file":"connect.c","line":177,"t_abs":0.030213,"t_rel":0.029072,"nesting":3,"category":"transfer","key":"negotiated-version","value":"0"}
-{"event":"data","sid":"20260304T080054.614982Z-H8d819085-P000adc2c/20260304T080054.642103Z-H8d819085-P000adc40","thread":"main","time":"2026-03-04T08:00:54.642648Z","file":"protocol.c","line":80,"t_abs":0.000730,"t_rel":0.000730,"nesting":1,"category":"transfer","key":"negotiated-version","value":"0"}
-ok 11 - client & server log negotiated version (v0)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 5705.12 'session IDs advertised (fetch v1)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local fetch \
-			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
-			origin &&
-		grep \"key\":\"server-sid\" tr2-client-events &&
-		grep \"key\":\"client-sid\" tr2-server-events
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20260304T080054.838494Z-H8d819085-P000add0d","thread":"main","time":"2026-03-04T08:00:54.857075Z","file":"transport.c","line":355,"t_abs":0.018751,"t_rel":0.017707,"nesting":3,"category":"transfer","key":"server-sid","value":"20260304T080054.838494Z-H8d819085-P000add0d/20260304T080054.854116Z-H8d819085-P000add21"}
-{"event":"data","sid":"20260304T080054.838494Z-H8d819085-P000add0d/20260304T080054.854116Z-H8d819085-P000add21","thread":"main","time":"2026-03-04T08:00:54.861062Z","file":"upload-pack.c","line":1164,"t_abs":0.007128,"t_rel":0.007128,"nesting":1,"category":"transfer","key":"client-sid","value":"20260304T080054.838494Z-H8d819085-P000add0d"}
-ok 12 - session IDs advertised (fetch v1)
+If you want to 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 5705.13 'session IDs advertised (push v1)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		test_when_finished "git -C local push --delete origin new-branch" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		git -C local pull --no-rebase origin &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local push \
-			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
-			origin HEAD:new-branch &&
-		grep \"key\":\"server-sid\" tr2-client-events &&
-		grep \"key\":\"client-sid\" tr2-server-events
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-Updating ce450c7..020ea9b
-Fast-forward
- b.t | 1 +
+  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 b.t
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20260304T080055.212167Z-H8d819085-P000adea5","thread":"main","time":"2026-03-04T08:00:55.235644Z","file":"transport.c","line":355,"t_abs":0.023654,"t_rel":0.022709,"nesting":3,"category":"transfer","key":"server-sid","value":"20260304T080055.212167Z-H8d819085-P000adea5/20260304T080055.233570Z-H8d819085-P000adebd"}
-{"event":"data","sid":"20260304T080055.212167Z-H8d819085-P000adea5/20260304T080055.233570Z-H8d819085-P000adebd","thread":"main","time":"2026-03-04T08:00:55.241028Z","file":"builtin/receive-pack.c","line":2134,"t_abs":0.007660,"t_rel":0.007660,"nesting":1,"category":"transfer","key":"client-sid","value":"20260304T080055.212167Z-H8d819085-P000adea5"}
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- - [deleted]         new-branch
-ok 13 - session IDs advertised (push v1)
+ 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 5705.14 'client & server log negotiated version (v1)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local fetch \
-			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
-			origin &&
-		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-client-events &&
-		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-server-events
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20260304T080055.594699Z-H8d819085-P000ae037","thread":"main","time":"2026-03-04T08:00:55.617027Z","file":"connect.c","line":177,"t_abs":0.022521,"t_rel":0.021417,"nesting":3,"category":"transfer","key":"negotiated-version","value":"1"}
-{"event":"data","sid":"20260304T080055.594699Z-H8d819085-P000ae037/20260304T080055.610761Z-H8d819085-P000ae04f","thread":"main","time":"2026-03-04T08:00:55.611294Z","file":"protocol.c","line":80,"t_abs":0.000714,"t_rel":0.000714,"nesting":1,"category":"transfer","key":"negotiated-version","value":"1"}
-ok 14 - client & server log negotiated version (v1)
+expecting success of 5703.15 'with namespace: want-ref is considered relative to namespace': 
+	wanted_ref=refs/heads/ns-yes &&
 
-expecting success of 5705.15 'session IDs advertised (fetch v2)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local fetch \
-			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
-			origin &&
-		grep \"key\":\"server-sid\" tr2-client-events &&
-		grep \"key\":\"client-sid\" tr2-server-events
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20260304T080055.782690Z-H8d819085-P000ae105","thread":"main","time":"2026-03-04T08:00:55.798582Z","file":"transport.c","line":338,"t_abs":0.016066,"t_rel":0.015025,"nesting":3,"category":"transfer","key":"server-sid","value":"20260304T080055.782690Z-H8d819085-P000ae105/20260304T080055.797907Z-H8d819085-P000ae119"}
-{"event":"data","sid":"20260304T080055.782690Z-H8d819085-P000ae105/20260304T080055.797907Z-H8d819085-P000ae119","thread":"main","time":"2026-03-04T08:00:55.799309Z","file":"serve.c","line":70,"t_abs":0.001569,"t_rel":0.001569,"nesting":1,"category":"transfer","key":"client-sid","value":"20260304T080055.782690Z-H8d819085-P000ae105"}
-ok 15 - session IDs advertised (fetch v2)
+	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
 
-expecting success of 5705.16 'session IDs advertised (push v2)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		test_when_finished "git -C local push --delete origin new-branch" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		git -C local pull --no-rebase origin &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local push \
-			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
-			origin HEAD:new-branch &&
-		grep \"key\":\"server-sid\" tr2-client-events &&
-		grep \"key\":\"client-sid\" tr2-server-events
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-Updating ce450c7..020ea9b
+	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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5802-connect-helper.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
- b.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20260304T080056.166670Z-H8d819085-P000ae2a6","thread":"main","time":"2026-03-04T08:00:56.181265Z","file":"transport.c","line":355,"t_abs":0.014795,"t_rel":0.013799,"nesting":3,"category":"transfer","key":"server-sid","value":"20260304T080056.166670Z-H8d819085-P000ae2a6/20260304T080056.178147Z-H8d819085-P000ae2b9"}
-{"event":"data","sid":"20260304T080056.166670Z-H8d819085-P000ae2a6/20260304T080056.178147Z-H8d819085-P000ae2b9","thread":"main","time":"2026-03-04T08:00:56.185016Z","file":"builtin/receive-pack.c","line":2134,"t_abs":0.007050,"t_rel":0.007050,"nesting":1,"category":"transfer","key":"client-sid","value":"20260304T080056.166670Z-H8d819085-P000ae2a6"}
-To file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
- - [deleted]         new-branch
-ok 16 - session IDs advertised (push v2)
+ok 3 - update following tag
 
-expecting success of 5705.17 'client & server log negotiated version (v2)': 
-		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
-		cp -r "$LOCAL_PRISTINE" local &&
-		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
-		git -c protocol.version=$PROTO -C local fetch \
-			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
-			origin &&
-		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-client-events &&
-		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-server-events
-	
-From file:///build/reproducible-path/git-2.47.2/t/trash directory.t5705-session-id-in-capabilities/repo
-   ce450c7..020ea9b  master     -> origin/master
- * [new tag]         b          -> b
-{"event":"data","sid":"20260304T080056.478915Z-H8d819085-P000ae40d","thread":"main","time":"2026-03-04T08:00:56.502097Z","file":"connect.c","line":177,"t_abs":0.023357,"t_rel":0.022291,"nesting":3,"category":"transfer","key":"negotiated-version","value":"2"}
-{"event":"data","sid":"20260304T080056.478915Z-H8d819085-P000ae40d/20260304T080056.498022Z-H8d819085-P000ae424","thread":"main","time":"2026-03-04T08:00:56.498563Z","file":"protocol.c","line":80,"t_abs":0.000733,"t_rel":0.000733,"nesting":1,"category":"transfer","key":"negotiated-version","value":"2"}
-ok 17 - client & server log negotiated version (v2)
+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
 
-# passed all 17 test(s)
-1..17
+[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.47.2/t/trash directory.t5802-connect-helper/remote/one.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5812-proto-disable-http.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5811-proto-disable-git.sh ***
@@ -373150,7 +373146,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[712462] Ready to rumble
+[1961720] Ready to rumble
 expecting success of 5811.1 'create git-accessible repo': 
 	bare="$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
 	test_commit one &&
@@ -373177,11 +373173,11 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-[712794] Connection from 127.0.0.1:59640
-[712794] Extended attribute "host": 127.0.0.1:5811
-[712794] Extended attribute "protocol": version=2
-[712794] Request upload-pack for '/repo.git'
-[712462] [712794] Disconnected
+[1962003] Connection from 127.0.0.1:51426
+[1962003] Extended attribute "host": 127.0.0.1:5811
+[1962003] Extended attribute "protocol": version=2
+[1962003] Request upload-pack for '/repo.git'
+[1961720] [1962003] Disconnected
 ok 2 - clone git:// (enabled)
 
 expecting success of 5811.3 'fetch git:// (enabled)': 
@@ -373192,13 +373188,13 @@
 			git fetch
 		)
 	
-[712954] Connection from 127.0.0.1:59652
-[712954] Extended attribute "host": 127.0.0.1:5811
-[712954] Extended attribute "protocol": version=2
-[712954] Request upload-pack for '/repo.git'
+[1962122] Connection from 127.0.0.1:51432
+[1962122] Extended attribute "host": 127.0.0.1:5811
+[1962122] Extended attribute "protocol": version=2
+[1962122] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[712462] [712954] Disconnected
+[1961720] [1962122] Disconnected
 ok 3 - fetch git:// (enabled)
 
 expecting success of 5811.4 'push git:// (enabled)': 
@@ -373209,14 +373205,14 @@
 			git push origin HEAD:pushed
 		)
 	
-[713086] Connection from 127.0.0.1:59656
-[713086] Extended attribute "host": 127.0.0.1:5811
-[713086] Request receive-pack for '/repo.git'
+[1962232] Connection from 127.0.0.1:51448
+[1962232] Extended attribute "host": 127.0.0.1:5811
+[1962232] Request receive-pack for '/repo.git'
 To git://127.0.0.1:5811/repo.git
  * [new branch]      HEAD -> pushed
 ok 4 - push git:// (enabled)
 
-[712462] [713086] Disconnected
+[1961720] [1962232] Disconnected
 expecting success of 5811.5 'push git:// (disabled)': 
 		(
 			cd tmp.git &&
@@ -373271,35 +373267,35 @@
 		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[713573] Connection from 127.0.0.1:59670
-[713573] Extended attribute "host": 127.0.0.1:5811
-[713573] Extended attribute "protocol": version=2
-[713573] Request upload-pack for '/repo.git'
-[712462] [713573] Disconnected
+[1962577] Connection from 127.0.0.1:51458
+[1962577] Extended attribute "host": 127.0.0.1:5811
+[1962577] Extended attribute "protocol": version=2
+[1962577] Request upload-pack for '/repo.git'
+[1961720] [1962577] 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
 	
-[713744] Connection from 127.0.0.1:59680
-[713744] Extended attribute "host": 127.0.0.1:5811
-[713744] Extended attribute "protocol": version=2
-[713744] Request upload-pack for '/repo.git'
+[1962685] Connection from 127.0.0.1:51460
+[1962685] Extended attribute "host": 127.0.0.1:5811
+[1962685] Extended attribute "protocol": version=2
+[1962685] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[712462] [713744] Disconnected
+[1961720] [1962685] 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
 	
-[713862] Connection from 127.0.0.1:59696
-[713862] Extended attribute "host": 127.0.0.1:5811
-[713862] Request receive-pack for '/repo.git'
+[1962775] Connection from 127.0.0.1:51462
+[1962775] Extended attribute "host": 127.0.0.1:5811
+[1962775] Request receive-pack for '/repo.git'
 Everything up-to-date
 ok 11 - push git:// (enabled)
 
-[712462] [713862] Disconnected
+[1961720] [1962775] 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
 	
@@ -373325,35 +373321,35 @@
 		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[714006] Connection from 127.0.0.1:59706
-[714006] Extended attribute "host": 127.0.0.1:5811
-[714006] Extended attribute "protocol": version=2
-[714006] Request upload-pack for '/repo.git'
-[712462] [714006] Disconnected
+[1962927] Connection from 127.0.0.1:51466
+[1962927] Extended attribute "host": 127.0.0.1:5811
+[1962927] Extended attribute "protocol": version=2
+[1962927] Request upload-pack for '/repo.git'
+[1961720] [1962927] Disconnected
 ok 15 - clone git:// (enabled)
 
 expecting success of 5811.16 'fetch git:// (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=user fetch
 	
-[714189] Connection from 127.0.0.1:59714
-[714189] Extended attribute "host": 127.0.0.1:5811
-[714189] Extended attribute "protocol": version=2
-[714189] Request upload-pack for '/repo.git'
+[1963084] Connection from 127.0.0.1:51474
+[1963084] Extended attribute "host": 127.0.0.1:5811
+[1963084] Extended attribute "protocol": version=2
+[1963084] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[712462] [714189] Disconnected
+[1961720] [1963084] Disconnected
 ok 16 - fetch git:// (enabled)
 
 expecting success of 5811.17 'push git:// (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
 	
-[714371] Connection from 127.0.0.1:59724
-[714371] Extended attribute "host": 127.0.0.1:5811
-[714371] Request receive-pack for '/repo.git'
+[1963182] Connection from 127.0.0.1:51486
+[1963182] Extended attribute "host": 127.0.0.1:5811
+[1963182] Request receive-pack for '/repo.git'
 Everything up-to-date
 ok 17 - push git:// (enabled)
 
-[712462] [714371] Disconnected
+[1961720] [1963182] Disconnected
 expecting success of 5811.18 'push git:// (disabled)': 
 		(
 			cd tmp.git &&
@@ -373394,35 +373390,35 @@
 		git clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[714636] Connection from 127.0.0.1:59726
-[714636] Extended attribute "host": 127.0.0.1:5811
-[714636] Extended attribute "protocol": version=2
-[714636] Request upload-pack for '/repo.git'
-[712462] [714636] Disconnected
+[1963357] Connection from 127.0.0.1:51490
+[1963357] Extended attribute "host": 127.0.0.1:5811
+[1963357] Extended attribute "protocol": version=2
+[1963357] Request upload-pack for '/repo.git'
+[1961720] [1963357] 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
 	
-[714831] Connection from 127.0.0.1:59742
-[714831] Extended attribute "host": 127.0.0.1:5811
-[714831] Extended attribute "protocol": version=2
-[714831] Request upload-pack for '/repo.git'
+[1963519] Connection from 127.0.0.1:51494
+[1963519] Extended attribute "host": 127.0.0.1:5811
+[1963519] Extended attribute "protocol": version=2
+[1963519] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[712462] [714831] Disconnected
+[1961720] [1963519] 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
 	
-[715026] Connection from 127.0.0.1:59750
-[715026] Extended attribute "host": 127.0.0.1:5811
-[715026] Request receive-pack for '/repo.git'
+[1963663] Connection from 127.0.0.1:51504
+[1963663] Extended attribute "host": 127.0.0.1:5811
+[1963663] Request receive-pack for '/repo.git'
 Everything up-to-date
-[712462] [715026] Disconnected
+[1961720] [1963663] Disconnected
 ok 23 - push git:// (enabled)
 
 expecting success of 5811.24 'push git:// (disabled)': 
@@ -373449,7 +373445,6 @@
 ok 26 - clone git:// (disabled)
 
 Stopping git daemon ...
-Terminated
 # passed all 26 test(s)
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
@@ -374213,83 +374208,653 @@
 1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5702-protocol-v2.sh ***
-checking prerequisite: PIPE
+*** t5815-submodule-protos.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/.git/
+expecting success of 5815.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
 
-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 5815.2 'setup ssh wrapper': 
+		write_script ssh-wrapper <<-\EOF &&
+		echo >&2 "ssh: $*"
+		host=$1; shift
+		cd "$TRASH_DIRECTORY/$host" &&
+		eval "$*"
+		EOF
+		GIT_SSH="$PWD/ssh-wrapper" &&
+		export GIT_SSH &&
+		export TRASH_DIRECTORY
+	
+ok 2 - setup ssh wrapper
 
-)
-prerequisite PIPE ok
-Starting git daemon ...
-[703441] 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
+expecting success of 5815.3 'setup repository with submodules': 
+	mkdir remote &&
+	git init remote/repo.git &&
+	(cd remote/repo.git && test_commit one) &&
+	# submodule-add should probably trust what we feed it on the cmdline,
+	# but its implementation is overly conservative.
+	GIT_ALLOW_PROTOCOL=ssh git submodule add remote:repo.git ssh-module &&
+	GIT_ALLOW_PROTOCOL=ext git submodule add "ext::fake-remote %S repo.git" ext-module &&
+	git commit -m "add submodules"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5702-protocol-v2/repo/parent/.git/
-[main (root-commit) d79ce16] one
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/remote/repo.git/.git/
+[master (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 one.t
-ok 1 - create repo to be served by git-daemon
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/ssh-module'...
+ssh: remote git-upload-pack 'repo.git'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/ext-module'...
+fake-remote: git-upload-pack repo.git
+[master (root-commit) 9de083d] add submodules
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 ext-module
+ create mode 160000 ssh-module
+ok 3 - setup repository with submodules
 
-expecting success of 5702.2 'list refs with git:// using protocol v2': 
-	test_when_finished "rm -f log" &&
+expecting success of 5815.4 'clone with recurse-submodules fails': 
+	test_must_fail git clone --recurse-submodules . dst
 
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		ls-remote --symref "$GIT_DAEMON_URL/parent" >actual &&
+Cloning into 'dst'...
+done.
+Submodule 'ext-module' (ext::fake-remote %S repo.git) registered for path 'ext-module'
+Submodule 'ssh-module' (remote:repo.git) registered for path 'ssh-module'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module'...
+fatal: transport 'ext' not allowed
+fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
+Failed to clone 'ext-module'. Retry scheduled
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ssh-module'...
+ssh: remote git-upload-pack 'repo.git'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module'...
+fatal: transport 'ext' not allowed
+fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
+Failed to clone 'ext-module' a second time, aborting
+ok 4 - clone with recurse-submodules fails
 
-	# Client requested to use protocol v2
-	grep "ls-remote> .*\\\0\\\0version=2\\\0$" log &&
-	# Server responded using protocol v2
-	grep "ls-remote< version 2" log &&
+expecting success of 5815.5 'setup individual updates': 
+	rm -rf dst &&
+	git clone . dst &&
+	git -C dst submodule init
 
-	git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
-	test_cmp expect actual
+Cloning into 'dst'...
+done.
+Submodule 'ext-module' (ext::fake-remote %S repo.git) registered for path 'ext-module'
+Submodule 'ssh-module' (remote:repo.git) registered for path 'ssh-module'
+ok 5 - setup individual updates
 
-[703584] Connection from 127.0.0.1:47342
-[703584] Extended attribute "host": 127.0.0.1:5702
-[703584] Extended attribute "protocol": version=2
-[703584] Request upload-pack for '/parent'
-[703441] [703584] Disconnected
-packet:    ls-remote> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
-packet:    ls-remote< version 2
-[703722] Connection from 127.0.0.1:47344
-[703722] Extended attribute "host": 127.0.0.1:5702
-[703722] Extended attribute "protocol": version=2
-[703722] Request upload-pack for '/parent'
-[703441] [703722] Disconnected
-ok 2 - list refs with git:// using protocol v2
+expecting success of 5815.6 'update of ssh allowed': 
+	git -C dst submodule update ssh-module
 
-expecting success of 5702.3 'ref advertisement is filtered with ls-remote using protocol v2': 
-	test_when_finished "rm -f log" &&
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ssh-module'...
+ssh: remote git-upload-pack 'repo.git'
+Submodule path 'ssh-module': checked out 'd79ce1670bdcb76e6d1da2ae095e890ccb326ae9'
+ok 6 - update of ssh allowed
 
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		ls-remote "$GIT_DAEMON_URL/parent" main >actual &&
+expecting success of 5815.7 'update of ext not allowed': 
+	test_must_fail git -C dst submodule update ext-module
 
-	cat >expect <<-EOF &&
-	$(git -C "$daemon_parent" rev-parse refs/heads/main)$(printf "\t")refs/heads/main
-	EOF
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module'...
+fatal: transport 'ext' not allowed
+fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
+Failed to clone 'ext-module'. Retry scheduled
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module'...
+fatal: transport 'ext' not allowed
+fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
+Failed to clone 'ext-module' a second time, aborting
+ok 7 - update of ext not allowed
 
-	test_cmp expect actual
+expecting success of 5815.8 'user can filter protocols with GIT_ALLOW_PROTOCOL': 
+	GIT_ALLOW_PROTOCOL=ext git -C dst submodule update ext-module
 
-[703897] Connection from 127.0.0.1:47354
-[703897] Extended attribute "host": 127.0.0.1:5702
-[703897] Extended attribute "protocol": version=2
-[703897] Request upload-pack for '/parent'
-[703441] [703897] Disconnected
-ok 3 - ref advertisement is filtered with ls-remote using protocol v2
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module'...
+fake-remote: git-upload-pack repo.git
+Submodule path 'ext-module': checked out 'd79ce1670bdcb76e6d1da2ae095e890ccb326ae9'
+ok 8 - user can filter protocols with GIT_ALLOW_PROTOCOL
 
-expecting success of 5702.4 'clone with git:// using protocol v2': 
-	test_when_finished "rm -f log" &&
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6000-rev-list-misc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6000-rev-list-misc/.git/
+expecting success of 6000.1 'setup': 
+	echo content1 >wanted_file &&
+	echo content2 >unwanted_file &&
+	git add wanted_file unwanted_file &&
+	test_tick &&
+	git commit -m one
 
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		clone "$GIT_DAEMON_URL/parent" daemon_child &&
+[main (root-commit) 8b046b3] one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 unwanted_file
+ create mode 100644 wanted_file
+ok 1 - setup
+
+expecting success of 6000.2 'rev-list --objects heeds pathspecs': 
+	git rev-list --objects HEAD -- wanted_file >output &&
+	grep wanted_file output &&
+	! grep unwanted_file output
+
+ac3e272b72bbf89def8657766b855d0656630ed4 wanted_file
+ok 2 - rev-list --objects heeds pathspecs
+
+expecting success of 6000.3 'rev-list --objects with pathspecs and deeper paths': 
+	mkdir foo &&
+	>foo/file &&
+	git add foo/file &&
+	test_tick &&
+	git commit -m two &&
+
+	git rev-list --objects HEAD -- foo >output &&
+	grep foo/file output &&
+
+	git rev-list --objects HEAD -- foo/file >output &&
+	grep foo/file output &&
+	! grep unwanted_file output
+
+[main 0045dbd] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo/file
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 foo/file
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 foo/file
+ok 3 - rev-list --objects with pathspecs and deeper paths
+
+expecting success of 6000.4 'rev-list --objects with pathspecs and copied files': 
+	git checkout --orphan junio-testcase &&
+	git rm -rf . &&
+
+	mkdir two &&
+	echo frotz >one &&
+	cp one two/three &&
+	git add one two/three &&
+	test_tick &&
+	git commit -m that &&
+
+	ONE=$(git rev-parse HEAD:one) &&
+	git rev-list --objects HEAD two >output &&
+	grep "$ONE two/three" output &&
+	! grep one output
+
+Switched to a new branch 'junio-testcase'
+rm 'foo/file'
+rm 'unwanted_file'
+rm 'wanted_file'
+[junio-testcase (root-commit) adaab4b] that
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one
+ create mode 100644 two/three
+8e4020bb5a8d8c873b25de15933e75cc0fc275df two/three
+ok 4 - rev-list --objects with pathspecs and copied files
+
+expecting success of 6000.5 'rev-list --objects --no-object-names has no space/names': 
+	git rev-list --objects --no-object-names HEAD >output &&
+	! grep wanted_file output &&
+	! grep unwanted_file output &&
+	! grep " " output
+
+ok 5 - rev-list --objects --no-object-names has no space/names
+
+expecting success of 6000.6 'rev-list --objects --no-object-names works with cat-file': 
+	git rev-list --objects --no-object-names --all >list-output &&
+	git cat-file --batch-check <list-output >cat-output &&
+	! grep missing cat-output
+
+ok 6 - rev-list --objects --no-object-names works with cat-file
+
+expecting success of 6000.7 '--no-object-names and --object-names are last-one-wins': 
+	git rev-list --objects --no-object-names --object-names --all >output &&
+	grep wanted_file output &&
+	git rev-list --objects --object-names --no-object-names --all >output &&
+	! grep wanted_file output
+
+637f0347d31dad180d6fc7f6720c187b05a8754c unwanted_file
+ac3e272b72bbf89def8657766b855d0656630ed4 wanted_file
+ok 7 - --no-object-names and --object-names are last-one-wins
+
+expecting success of 6000.8 'rev-list A..B and rev-list ^A B are the same': 
+	test_tick &&
+	git commit --allow-empty -m another &&
+	git tag -a -m "annotated" v1.0 &&
+	git rev-list --objects ^v1.0^ v1.0 >expect &&
+	git rev-list --objects v1.0^..v1.0 >actual &&
+	test_cmp expect actual
+
+[junio-testcase eefa24e] another
+ Author: A U Thor <author@example.com>
+ok 8 - rev-list A..B and rev-list ^A B are the same
+
+expecting success of 6000.9 'propagate uninteresting flag down correctly': 
+	git rev-list --objects ^HEAD^{tree} HEAD^{tree} >actual &&
+	test_must_be_empty actual
+
+ok 9 - propagate uninteresting flag down correctly
+
+expecting success of 6000.10 'symleft flag bit is propagated down from tag': 
+	git log --format="%m %s" --left-right v1.0...main >actual &&
+	cat >expect <<-\EOF &&
+	< another
+	< that
+	> two
+	> one
+	EOF
+	test_cmp expect actual
+
+ok 10 - symleft flag bit is propagated down from tag
+
+expecting success of 6000.11 'rev-list can show index objects': 
+	# Of the blobs and trees in the index, note:
+	#
+	#   - we do not show two/three, because it is the
+	#     same blob as "one", and we show objects only once
+	#
+	#   - we do show the tree "two", because it has a valid cache tree
+	#     from the last commit
+	#
+	#   - we do not show the root tree; since we updated the index, it
+	#     does not have a valid cache tree
+	#
+	echo only-in-index >only-in-index &&
+	test_when_finished "git reset --hard" &&
+	rev1=$(git rev-parse HEAD:one) &&
+	rev2=$(git rev-parse HEAD:two) &&
+	revi=$(git hash-object only-in-index) &&
+	cat >expect <<-EOF &&
+	$rev1 one
+	$revi only-in-index
+	$rev2 two
+	EOF
+	git add only-in-index &&
+	git rev-list --objects --indexed-objects >actual &&
+	test_cmp expect actual
+
+HEAD is now at eefa24e another
+ok 11 - rev-list can show index objects
+
+expecting success of 6000.12 'rev-list can negate index objects': 
+	git rev-parse HEAD >expect &&
+	git rev-list -1 --objects HEAD --not --indexed-objects >actual &&
+	test_cmp expect actual
+
+ok 12 - rev-list can negate index objects
+
+expecting success of 6000.13 '--bisect and --first-parent can be combined': 
+	git rev-list --bisect --first-parent HEAD
+
+adaab4b805f0f10feaa65a52f3d14dfa87c675f1
+ok 13 - --bisect and --first-parent can be combined
+
+expecting success of 6000.14 '--header shows a NUL after each commit': 
+	# We know that there is no Q in the true payload; names and
+	# addresses of the authors and the committers do not have
+	# any, and object names or header names do not, either.
+	git rev-list --header --max-count=2 HEAD |
+	nul_to_q |
+	grep "^Q" >actual &&
+	cat >expect <<-EOF &&
+	Q$(git rev-parse HEAD~1)
+	Q
+	EOF
+	test_cmp expect actual
+
+ok 14 - --header shows a NUL after each commit
+
+expecting success of 6000.15 'rev-list --end-of-options': 
+	git update-ref refs/heads/--output=yikes HEAD &&
+	git rev-list --end-of-options --output=yikes >actual &&
+	test_path_is_missing yikes &&
+	git rev-list HEAD >expect &&
+	test_cmp expect actual
+
+ok 15 - rev-list --end-of-options
+
+expecting success of 6000.16 'rev-list --count': 
+	count=$(git rev-list --count HEAD) &&
+	git rev-list HEAD >actual &&
+	test_line_count = $count actual
+
+ok 16 - rev-list --count
+
+expecting success of 6000.17 'rev-list --count --objects': 
+	count=$(git rev-list --count --objects HEAD) &&
+	git rev-list --objects HEAD >actual &&
+	test_line_count = $count actual
+
+ok 17 - rev-list --count --objects
+
+expecting success of 6000.18 'rev-list --unpacked': 
+	git repack -ad &&
+	test_commit unpacked &&
+
+	git rev-list --objects --no-object-names unpacked^.. >expect.raw &&
+	sort expect.raw >expect &&
+
+	git rev-list --all --objects --unpacked --no-object-names >actual.raw &&
+	sort actual.raw >actual &&
+
+	test_cmp expect actual
+
+[junio-testcase 72791fe] unpacked
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unpacked.t
+ok 18 - rev-list --unpacked
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6001-rev-list-graft.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6001-rev-list-graft/.git/
+expecting success of 6001.1 'setup': 
+	mkdir subdir &&
+	echo >fileA fileA &&
+	echo >subdir/fileB fileB &&
+	git add fileA subdir/fileB &&
+	git commit -a -m "Initial in one history." &&
+	A0=$(git rev-parse --verify HEAD) &&
+
+	echo >fileA fileA modified &&
+	git commit -a -m "Second in one history." &&
+	A1=$(git rev-parse --verify HEAD) &&
+
+	echo >subdir/fileB fileB modified &&
+	git commit -a -m "Third in one history." &&
+	A2=$(git rev-parse --verify HEAD) &&
+
+	git update-ref -d refs/heads/main &&
+	rm -f .git/index &&
+
+	echo >fileA fileA again &&
+	echo >subdir/fileB fileB again &&
+	git add fileA subdir/fileB &&
+	git commit -a -m "Initial in alternate history." &&
+	B0=$(git rev-parse --verify HEAD) &&
+
+	echo >fileA fileA modified in alternate history &&
+	git commit -a -m "Second in alternate history." &&
+	B1=$(git rev-parse --verify HEAD) &&
+
+	echo >subdir/fileB fileB modified in alternate history &&
+	git commit -a -m "Third in alternate history." &&
+	B2=$(git rev-parse --verify HEAD) &&
+	: done
+
+[main (root-commit) ef139ee] Initial in one history.
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 subdir/fileB
+[main c65f681] Second in one history.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 65ed2c0] Third in one history.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main (root-commit) 0d82fde] Initial in alternate history.
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 subdir/fileB
+[main a28d994] Second in alternate history.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 5e838f4] Third in alternate history.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6001.2 'without grafts': 
+		rm -f .git/info/grafts &&
+		check basic 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 2 - without grafts
+
+expecting success of 6001.3 'with grafts': 
+		mkdir -p .git/info &&
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check basic 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+ok 3 - with grafts
+
+expecting success of 6001.4 'without grafts, with pathlimit': 
+		rm -f .git/info/grafts &&
+		check basic 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 4 - without grafts, with pathlimit
+
+expecting success of 6001.5 'with grafts, with pathlimit': 
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check basic 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+ok 5 - with grafts, with pathlimit
+
+expecting success of 6001.6 'without grafts': 
+		rm -f .git/info/grafts &&
+		check parents 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 6 - without grafts
+
+expecting success of 6001.7 'with grafts': 
+		mkdir -p .git/info &&
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check parents 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+ok 7 - with grafts
+
+expecting success of 6001.8 'without grafts, with pathlimit': 
+		rm -f .git/info/grafts &&
+		check parents 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 8 - without grafts, with pathlimit
+
+expecting success of 6001.9 'with grafts, with pathlimit': 
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check parents 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+ok 9 - with grafts, with pathlimit
+
+expecting success of 6001.10 'without grafts': 
+		rm -f .git/info/grafts &&
+		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 10 - without grafts
+
+expecting success of 6001.11 'with grafts': 
+		mkdir -p .git/info &&
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+ok 11 - with grafts
+
+expecting success of 6001.12 'without grafts, with pathlimit': 
+		rm -f .git/info/grafts &&
+		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 12 - without grafts, with pathlimit
+
+expecting success of 6001.13 'with grafts, with pathlimit': 
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+ok 13 - with grafts, with pathlimit
+
+expecting success of 6001.14 'show advice that grafts are deprecated': 
+	git show HEAD 2>err &&
+	test_grep "git replace" err &&
+	test_config advice.graftFileDeprecated false &&
+	git show HEAD 2>err &&
+	test_grep ! "git replace" err
+
+commit 5e838f46836efb51cd27c11e568fb921733be212
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Third in alternate history.
+
+diff --git a/subdir/fileB b/subdir/fileB
+index 2da7ce9..8e5449e 100644
+--- a/subdir/fileB
++++ b/subdir/fileB
+@@ -1 +1 @@
+-fileB again
++fileB modified in alternate history
+hint: Please use "git replace --convert-graft-file"
+commit 5e838f46836efb51cd27c11e568fb921733be212
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Third in alternate history.
+
+diff --git a/subdir/fileB b/subdir/fileB
+index 2da7ce9..8e5449e 100644
+--- a/subdir/fileB
++++ b/subdir/fileB
+@@ -1 +1 @@
+-fileB again
++fileB modified in alternate history
+ok 14 - show advice that grafts are deprecated
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t5702-protocol-v2.sh ***
+checking prerequisite: PIPE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
+
+)
+prerequisite PIPE ok
+Starting git daemon ...
+[1954424] Ready to rumble
+expecting success of 5702.1 'create repo to be served by git-daemon': 
+	git init "$daemon_parent" &&
+	test_commit -C "$daemon_parent" one
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5702-protocol-v2/repo/parent/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - create repo to be served by git-daemon
+
+expecting success of 5702.2 'list refs with git:// using protocol v2': 
+	test_when_finished "rm -f log" &&
+
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		ls-remote --symref "$GIT_DAEMON_URL/parent" >actual &&
+
+	# Client requested to use protocol v2
+	grep "ls-remote> .*\\\0\\\0version=2\\\0$" log &&
+	# Server responded using protocol v2
+	grep "ls-remote< version 2" log &&
+
+	git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
+	test_cmp expect actual
+
+[1954585] Connection from 127.0.0.1:48070
+[1954585] Extended attribute "host": 127.0.0.1:5702
+[1954585] Extended attribute "protocol": version=2
+[1954585] Request upload-pack for '/parent'
+[1954424] [1954585] Disconnected
+packet:    ls-remote> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
+packet:    ls-remote< version 2
+[1954693] Connection from 127.0.0.1:47172
+[1954693] Extended attribute "host": 127.0.0.1:5702
+[1954693] Extended attribute "protocol": version=2
+[1954693] Request upload-pack for '/parent'
+[1954424] [1954693] Disconnected
+ok 2 - list refs with git:// using protocol v2
+
+expecting success of 5702.3 'ref advertisement is filtered with ls-remote using protocol v2': 
+	test_when_finished "rm -f log" &&
+
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		ls-remote "$GIT_DAEMON_URL/parent" main >actual &&
+
+	cat >expect <<-EOF &&
+	$(git -C "$daemon_parent" rev-parse refs/heads/main)$(printf "\t")refs/heads/main
+	EOF
+
+	test_cmp expect actual
+
+[1954819] Connection from 127.0.0.1:47178
+[1954819] Extended attribute "host": 127.0.0.1:5702
+[1954819] Extended attribute "protocol": version=2
+[1954819] Request upload-pack for '/parent'
+[1954424] [1954819] Disconnected
+ok 3 - ref advertisement is filtered with ls-remote using protocol v2
+
+expecting success of 5702.4 'clone with git:// using protocol v2': 
+	test_when_finished "rm -f log" &&
+
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		clone "$GIT_DAEMON_URL/parent" daemon_child &&
 
 	git -C daemon_child log -1 --format=%s >actual &&
 	git -C "$daemon_parent" log -1 --format=%s >expect &&
@@ -374301,11 +374866,11 @@
 	grep "clone< version 2" log
 
 Cloning into 'daemon_child'...
-[704123] Connection from 127.0.0.1:47356
-[704123] Extended attribute "host": 127.0.0.1:5702
-[704123] Extended attribute "protocol": version=2
-[704123] Request upload-pack for '/parent'
-[703441] [704123] Disconnected
+[1954971] Connection from 127.0.0.1:47188
+[1954971] Extended attribute "host": 127.0.0.1:5702
+[1954971] Extended attribute "protocol": version=2
+[1954971] Request upload-pack for '/parent'
+[1954424] [1954971] 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
@@ -374331,11 +374896,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-[704547] Connection from 127.0.0.1:47370
-[704547] Extended attribute "host": 127.0.0.1:5702
-[704547] Extended attribute "protocol": version=2
-[704547] Request upload-pack for '/parent'
-[703441] [704547] Disconnected
+[1955320] Connection from 127.0.0.1:47196
+[1955320] Extended attribute "host": 127.0.0.1:5702
+[1955320] Extended attribute "protocol": version=2
+[1955320] Request upload-pack for '/parent'
+[1954424] [1955320] Disconnected
 From git://127.0.0.1:5702/parent
    d79ce16..139b20d  main       -> origin/main
  * [new tag]         two        -> two
@@ -374359,11 +374924,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two_a.t
-[704944] Connection from 127.0.0.1:47374
-[704944] Extended attribute "host": 127.0.0.1:5702
-[704944] Extended attribute "protocol": version=2
-[704944] Request upload-pack for '/parent'
-[703441] [704944] Disconnected
+[1955673] Connection from 127.0.0.1:47206
+[1955673] Extended attribute "host": 127.0.0.1:5702
+[1955673] Extended attribute "protocol": version=2
+[1955673] Request upload-pack for '/parent'
+[1954424] [1955673] Disconnected
 From git://127.0.0.1:5702/parent
  * branch            7e9f7d092ed45f242659c87db76fd08923e99801 -> FETCH_HEAD
 packet:        fetch< version 2
@@ -374384,14 +374949,14 @@
 	# Server responded using protocol v2
 	grep "fetch< version 2" log
 
-[705207] Connection from 127.0.0.1:47386
-[705207] Extended attribute "host": 127.0.0.1:5702
-[705207] Extended attribute "protocol": version=2
-[705207] Request upload-pack for '/parent'
+[1955893] Connection from 127.0.0.1:47216
+[1955893] Extended attribute "host": 127.0.0.1:5702
+[1955893] Extended attribute "protocol": version=2
+[1955893] Request upload-pack for '/parent'
 From git://127.0.0.1:5702/parent
    139b20d..7e9f7d0  main       -> origin/main
  * [new tag]         two_a      -> two_a
-[703441] [705207] Disconnected
+[1954424] [1955893] Disconnected
 Updating d79ce16..7e9f7d0
 Fast-forward
  two.t   | 1 +
@@ -374430,16 +374995,15 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 three.t
-[705612] Connection from 127.0.0.1:47388
-[705612] Extended attribute "host": 127.0.0.1:5702
-[705612] Request receive-pack for '/parent'
+[1956233] Connection from 127.0.0.1:47218
+[1956233] Extended attribute "host": 127.0.0.1:5702
+[1956233] Request receive-pack for '/parent'
 To git://127.0.0.1:5702/parent
  * [new branch]      HEAD -> client_branch
-[703441] [705612] Disconnected
+[1954424] [1956233] 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
@@ -375484,353 +376048,6 @@
 1..50
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6000-rev-list-misc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6000-rev-list-misc/.git/
-expecting success of 6000.1 'setup': 
-	echo content1 >wanted_file &&
-	echo content2 >unwanted_file &&
-	git add wanted_file unwanted_file &&
-	test_tick &&
-	git commit -m one
-
-[main (root-commit) 8b046b3] one
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 unwanted_file
- create mode 100644 wanted_file
-ok 1 - setup
-
-expecting success of 6000.2 'rev-list --objects heeds pathspecs': 
-	git rev-list --objects HEAD -- wanted_file >output &&
-	grep wanted_file output &&
-	! grep unwanted_file output
-
-ac3e272b72bbf89def8657766b855d0656630ed4 wanted_file
-ok 2 - rev-list --objects heeds pathspecs
-
-expecting success of 6000.3 'rev-list --objects with pathspecs and deeper paths': 
-	mkdir foo &&
-	>foo/file &&
-	git add foo/file &&
-	test_tick &&
-	git commit -m two &&
-
-	git rev-list --objects HEAD -- foo >output &&
-	grep foo/file output &&
-
-	git rev-list --objects HEAD -- foo/file >output &&
-	grep foo/file output &&
-	! grep unwanted_file output
-
-[main 0045dbd] two
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo/file
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 foo/file
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 foo/file
-ok 3 - rev-list --objects with pathspecs and deeper paths
-
-expecting success of 6000.4 'rev-list --objects with pathspecs and copied files': 
-	git checkout --orphan junio-testcase &&
-	git rm -rf . &&
-
-	mkdir two &&
-	echo frotz >one &&
-	cp one two/three &&
-	git add one two/three &&
-	test_tick &&
-	git commit -m that &&
-
-	ONE=$(git rev-parse HEAD:one) &&
-	git rev-list --objects HEAD two >output &&
-	grep "$ONE two/three" output &&
-	! grep one output
-
-Switched to a new branch 'junio-testcase'
-rm 'foo/file'
-rm 'unwanted_file'
-rm 'wanted_file'
-[junio-testcase (root-commit) adaab4b] that
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100644 two/three
-8e4020bb5a8d8c873b25de15933e75cc0fc275df two/three
-ok 4 - rev-list --objects with pathspecs and copied files
-
-expecting success of 6000.5 'rev-list --objects --no-object-names has no space/names': 
-	git rev-list --objects --no-object-names HEAD >output &&
-	! grep wanted_file output &&
-	! grep unwanted_file output &&
-	! grep " " output
-
-ok 5 - rev-list --objects --no-object-names has no space/names
-
-expecting success of 6000.6 'rev-list --objects --no-object-names works with cat-file': 
-	git rev-list --objects --no-object-names --all >list-output &&
-	git cat-file --batch-check <list-output >cat-output &&
-	! grep missing cat-output
-
-ok 6 - rev-list --objects --no-object-names works with cat-file
-
-expecting success of 6000.7 '--no-object-names and --object-names are last-one-wins': 
-	git rev-list --objects --no-object-names --object-names --all >output &&
-	grep wanted_file output &&
-	git rev-list --objects --object-names --no-object-names --all >output &&
-	! grep wanted_file output
-
-637f0347d31dad180d6fc7f6720c187b05a8754c unwanted_file
-ac3e272b72bbf89def8657766b855d0656630ed4 wanted_file
-ok 7 - --no-object-names and --object-names are last-one-wins
-
-expecting success of 6000.8 'rev-list A..B and rev-list ^A B are the same': 
-	test_tick &&
-	git commit --allow-empty -m another &&
-	git tag -a -m "annotated" v1.0 &&
-	git rev-list --objects ^v1.0^ v1.0 >expect &&
-	git rev-list --objects v1.0^..v1.0 >actual &&
-	test_cmp expect actual
-
-[junio-testcase eefa24e] another
- Author: A U Thor <author@example.com>
-ok 8 - rev-list A..B and rev-list ^A B are the same
-
-expecting success of 6000.9 'propagate uninteresting flag down correctly': 
-	git rev-list --objects ^HEAD^{tree} HEAD^{tree} >actual &&
-	test_must_be_empty actual
-
-ok 9 - propagate uninteresting flag down correctly
-
-expecting success of 6000.10 'symleft flag bit is propagated down from tag': 
-	git log --format="%m %s" --left-right v1.0...main >actual &&
-	cat >expect <<-\EOF &&
-	< another
-	< that
-	> two
-	> one
-	EOF
-	test_cmp expect actual
-
-ok 10 - symleft flag bit is propagated down from tag
-
-expecting success of 6000.11 'rev-list can show index objects': 
-	# Of the blobs and trees in the index, note:
-	#
-	#   - we do not show two/three, because it is the
-	#     same blob as "one", and we show objects only once
-	#
-	#   - we do show the tree "two", because it has a valid cache tree
-	#     from the last commit
-	#
-	#   - we do not show the root tree; since we updated the index, it
-	#     does not have a valid cache tree
-	#
-	echo only-in-index >only-in-index &&
-	test_when_finished "git reset --hard" &&
-	rev1=$(git rev-parse HEAD:one) &&
-	rev2=$(git rev-parse HEAD:two) &&
-	revi=$(git hash-object only-in-index) &&
-	cat >expect <<-EOF &&
-	$rev1 one
-	$revi only-in-index
-	$rev2 two
-	EOF
-	git add only-in-index &&
-	git rev-list --objects --indexed-objects >actual &&
-	test_cmp expect actual
-
-HEAD is now at eefa24e another
-ok 11 - rev-list can show index objects
-
-expecting success of 6000.12 'rev-list can negate index objects': 
-	git rev-parse HEAD >expect &&
-	git rev-list -1 --objects HEAD --not --indexed-objects >actual &&
-	test_cmp expect actual
-
-ok 12 - rev-list can negate index objects
-
-expecting success of 6000.13 '--bisect and --first-parent can be combined': 
-	git rev-list --bisect --first-parent HEAD
-
-adaab4b805f0f10feaa65a52f3d14dfa87c675f1
-ok 13 - --bisect and --first-parent can be combined
-
-expecting success of 6000.14 '--header shows a NUL after each commit': 
-	# We know that there is no Q in the true payload; names and
-	# addresses of the authors and the committers do not have
-	# any, and object names or header names do not, either.
-	git rev-list --header --max-count=2 HEAD |
-	nul_to_q |
-	grep "^Q" >actual &&
-	cat >expect <<-EOF &&
-	Q$(git rev-parse HEAD~1)
-	Q
-	EOF
-	test_cmp expect actual
-
-ok 14 - --header shows a NUL after each commit
-
-expecting success of 6000.15 'rev-list --end-of-options': 
-	git update-ref refs/heads/--output=yikes HEAD &&
-	git rev-list --end-of-options --output=yikes >actual &&
-	test_path_is_missing yikes &&
-	git rev-list HEAD >expect &&
-	test_cmp expect actual
-
-ok 15 - rev-list --end-of-options
-
-expecting success of 6000.16 'rev-list --count': 
-	count=$(git rev-list --count HEAD) &&
-	git rev-list HEAD >actual &&
-	test_line_count = $count actual
-
-ok 16 - rev-list --count
-
-expecting success of 6000.17 'rev-list --count --objects': 
-	count=$(git rev-list --count --objects HEAD) &&
-	git rev-list --objects HEAD >actual &&
-	test_line_count = $count actual
-
-ok 17 - rev-list --count --objects
-
-expecting success of 6000.18 'rev-list --unpacked': 
-	git repack -ad &&
-	test_commit unpacked &&
-
-	git rev-list --objects --no-object-names unpacked^.. >expect.raw &&
-	sort expect.raw >expect &&
-
-	git rev-list --all --objects --unpacked --no-object-names >actual.raw &&
-	sort actual.raw >actual &&
-
-	test_cmp expect actual
-
-[junio-testcase 72791fe] unpacked
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unpacked.t
-ok 18 - rev-list --unpacked
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5815-submodule-protos.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/.git/
-expecting success of 5815.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 5815.2 'setup ssh wrapper': 
-		write_script ssh-wrapper <<-\EOF &&
-		echo >&2 "ssh: $*"
-		host=$1; shift
-		cd "$TRASH_DIRECTORY/$host" &&
-		eval "$*"
-		EOF
-		GIT_SSH="$PWD/ssh-wrapper" &&
-		export GIT_SSH &&
-		export TRASH_DIRECTORY
-	
-ok 2 - setup ssh wrapper
-
-expecting success of 5815.3 'setup repository with submodules': 
-	mkdir remote &&
-	git init remote/repo.git &&
-	(cd remote/repo.git && test_commit one) &&
-	# submodule-add should probably trust what we feed it on the cmdline,
-	# but its implementation is overly conservative.
-	GIT_ALLOW_PROTOCOL=ssh git submodule add remote:repo.git ssh-module &&
-	GIT_ALLOW_PROTOCOL=ext git submodule add "ext::fake-remote %S repo.git" ext-module &&
-	git commit -m "add submodules"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/remote/repo.git/.git/
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/ssh-module'...
-ssh: remote git-upload-pack 'repo.git'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/ext-module'...
-fake-remote: git-upload-pack repo.git
-[master (root-commit) 9de083d] add submodules
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 ext-module
- create mode 160000 ssh-module
-ok 3 - setup repository with submodules
-
-expecting success of 5815.4 'clone with recurse-submodules fails': 
-	test_must_fail git clone --recurse-submodules . dst
-
-Cloning into 'dst'...
-done.
-Submodule 'ext-module' (ext::fake-remote %S repo.git) registered for path 'ext-module'
-Submodule 'ssh-module' (remote:repo.git) registered for path 'ssh-module'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module'...
-fatal: transport 'ext' not allowed
-fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
-Failed to clone 'ext-module'. Retry scheduled
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ssh-module'...
-ssh: remote git-upload-pack 'repo.git'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module'...
-fatal: transport 'ext' not allowed
-fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
-Failed to clone 'ext-module' a second time, aborting
-ok 4 - clone with recurse-submodules fails
-
-expecting success of 5815.5 'setup individual updates': 
-	rm -rf dst &&
-	git clone . dst &&
-	git -C dst submodule init
-
-Cloning into 'dst'...
-done.
-Submodule 'ext-module' (ext::fake-remote %S repo.git) registered for path 'ext-module'
-Submodule 'ssh-module' (remote:repo.git) registered for path 'ssh-module'
-ok 5 - setup individual updates
-
-expecting success of 5815.6 'update of ssh allowed': 
-	git -C dst submodule update ssh-module
-
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ssh-module'...
-ssh: remote git-upload-pack 'repo.git'
-Submodule path 'ssh-module': checked out 'd79ce1670bdcb76e6d1da2ae095e890ccb326ae9'
-ok 6 - update of ssh allowed
-
-expecting success of 5815.7 'update of ext not allowed': 
-	test_must_fail git -C dst submodule update ext-module
-
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module'...
-fatal: transport 'ext' not allowed
-fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
-Failed to clone 'ext-module'. Retry scheduled
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module'...
-fatal: transport 'ext' not allowed
-fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
-Failed to clone 'ext-module' a second time, aborting
-ok 7 - update of ext not allowed
-
-expecting success of 5815.8 'user can filter protocols with GIT_ALLOW_PROTOCOL': 
-	GIT_ALLOW_PROTOCOL=ext git -C dst submodule update ext-module
-
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5815-submodule-protos/dst/ext-module'...
-fake-remote: git-upload-pack repo.git
-Submodule path 'ext-module': checked out 'd79ce1670bdcb76e6d1da2ae095e890ccb326ae9'
-ok 8 - user can filter protocols with GIT_ALLOW_PROTOCOL
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5900-repo-selection.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5900-repo-selection/.git/
 expecting success of 5900.1 'find .git dir in worktree': 
@@ -375975,355 +376192,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6001-rev-list-graft.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6001-rev-list-graft/.git/
-expecting success of 6001.1 'setup': 
-	mkdir subdir &&
-	echo >fileA fileA &&
-	echo >subdir/fileB fileB &&
-	git add fileA subdir/fileB &&
-	git commit -a -m "Initial in one history." &&
-	A0=$(git rev-parse --verify HEAD) &&
-
-	echo >fileA fileA modified &&
-	git commit -a -m "Second in one history." &&
-	A1=$(git rev-parse --verify HEAD) &&
-
-	echo >subdir/fileB fileB modified &&
-	git commit -a -m "Third in one history." &&
-	A2=$(git rev-parse --verify HEAD) &&
-
-	git update-ref -d refs/heads/main &&
-	rm -f .git/index &&
-
-	echo >fileA fileA again &&
-	echo >subdir/fileB fileB again &&
-	git add fileA subdir/fileB &&
-	git commit -a -m "Initial in alternate history." &&
-	B0=$(git rev-parse --verify HEAD) &&
-
-	echo >fileA fileA modified in alternate history &&
-	git commit -a -m "Second in alternate history." &&
-	B1=$(git rev-parse --verify HEAD) &&
-
-	echo >subdir/fileB fileB modified in alternate history &&
-	git commit -a -m "Third in alternate history." &&
-	B2=$(git rev-parse --verify HEAD) &&
-	: done
-
-[main (root-commit) ef139ee] Initial in one history.
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA
- create mode 100644 subdir/fileB
-[main c65f681] Second in one history.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 65ed2c0] Third in one history.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main (root-commit) 0d82fde] Initial in alternate history.
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA
- create mode 100644 subdir/fileB
-[main a28d994] Second in alternate history.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 5e838f4] Third in alternate history.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 6001.2 'without grafts': 
-		rm -f .git/info/grafts &&
-		check basic 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 2 - without grafts
-
-expecting success of 6001.3 'with grafts': 
-		mkdir -p .git/info &&
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check basic 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-ok 3 - with grafts
-
-expecting success of 6001.4 'without grafts, with pathlimit': 
-		rm -f .git/info/grafts &&
-		check basic 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 4 - without grafts, with pathlimit
-
-expecting success of 6001.5 'with grafts, with pathlimit': 
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check basic 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-ok 5 - with grafts, with pathlimit
-
-expecting success of 6001.6 'without grafts': 
-		rm -f .git/info/grafts &&
-		check parents 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 6 - without grafts
-
-expecting success of 6001.7 'with grafts': 
-		mkdir -p .git/info &&
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check parents 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-ok 7 - with grafts
-
-expecting success of 6001.8 'without grafts, with pathlimit': 
-		rm -f .git/info/grafts &&
-		check parents 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 8 - without grafts, with pathlimit
-
-expecting success of 6001.9 'with grafts, with pathlimit': 
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check parents 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-ok 9 - with grafts, with pathlimit
-
-expecting success of 6001.10 'without grafts': 
-		rm -f .git/info/grafts &&
-		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 10 - without grafts
-
-expecting success of 6001.11 'with grafts': 
-		mkdir -p .git/info &&
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-ok 11 - with grafts
-
-expecting success of 6001.12 'without grafts, with pathlimit': 
-		rm -f .git/info/grafts &&
-		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 12 - without grafts, with pathlimit
-
-expecting success of 6001.13 'with grafts, with pathlimit': 
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-ok 13 - with grafts, with pathlimit
-
-expecting success of 6001.14 'show advice that grafts are deprecated': 
-	git show HEAD 2>err &&
-	test_grep "git replace" err &&
-	test_config advice.graftFileDeprecated false &&
-	git show HEAD 2>err &&
-	test_grep ! "git replace" err
-
-commit 5e838f46836efb51cd27c11e568fb921733be212
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    Third in alternate history.
-
-diff --git a/subdir/fileB b/subdir/fileB
-index 2da7ce9..8e5449e 100644
---- a/subdir/fileB
-+++ b/subdir/fileB
-@@ -1 +1 @@
--fileB again
-+fileB modified in alternate history
-hint: Please use "git replace --convert-graft-file"
-commit 5e838f46836efb51cd27c11e568fb921733be212
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    Third in alternate history.
-
-diff --git a/subdir/fileB b/subdir/fileB
-index 2da7ce9..8e5449e 100644
---- a/subdir/fileB
-+++ b/subdir/fileB
-@@ -1 +1 @@
--fileB again
-+fileB modified in alternate history
-ok 14 - show advice that grafts are deprecated
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6004-rev-list-path-optim.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5510-fetch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5510-fetch/.git/
 expecting success of 5510.1 'setup': 
@@ -384873,6 +384741,132 @@
 1..187
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6004-rev-list-path-optim.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t5801-remote-helpers.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5801-remote-helpers/.git/
 expecting success of 5801.1 'setup repository': 
@@ -385158,8 +385152,8 @@
  1 file changed, 1 insertion(+)
 warning: Not updating refs/heads/new (new tip a81a4147c0db7a0bc38d047c3205b7c3ac8fc9c5 does not contain 9a8e2abfa604731e07ce2fb257109eb918e2280b)
 Everything up-to-date
---- expect	2026-03-04 08:00:59.795352315 +0000
-+++ actual	2026-03-04 08:00:59.819352315 +0000
+--- expect	2025-01-30 02:14:29.005084262 +0000
++++ actual	2025-01-30 02:14:29.021084358 +0000
 @@ -1 +1 @@
 -899057158430267bac82448fb89f21aa89c35cb0
 +9a8e2abfa604731e07ce2fb257109eb918e2280b
@@ -387439,8 +387433,8 @@
 	test_cmp expect3 fuzzy3 &&
 	! test_cmp actual1 actual2
 
---- actual1	2026-03-04 08:01:07.407352315 +0000
-+++ actual2	2026-03-04 08:01:07.419352315 +0000
+--- actual1	2025-01-30 02:14:39.145145075 +0000
++++ actual2	2025-01-30 02:14:39.169145219 +0000
 @@ -1 +1 @@
 -79c1a11 79c1a11 79c1a11
 +79c1a 79c1a 79c1a
@@ -387531,1818 +387525,5309 @@
 1..80
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6016-rev-list-graph-simplify-history.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6016-rev-list-graph-simplify-history/.git/
-expecting success of 6016.1 'set up rev-list --graph test': 
-	# 3 commits on branch A
-	test_commit A1 foo.txt &&
-	test_commit A2 bar.txt &&
-	test_commit A3 bar.txt &&
-	git branch -m main A &&
-
-	# 2 commits on branch B, started from A1
-	git checkout -b B A1 &&
-	test_commit B1 foo.txt &&
-	test_commit B2 abc.txt &&
-
-	# 2 commits on branch C, started from A2
-	git checkout -b C A2 &&
-	test_commit C1 xyz.txt &&
-	test_commit C2 xyz.txt &&
-
-	# Octopus merge B and C into branch A
-	git checkout A &&
-	git merge B C -m A4 &&
-	git tag A4 &&
+*** t5516-fetch-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/.git/
+expecting success of 5516.1 'setup': 
 
-	test_commit A5 bar.txt &&
+	>path1 &&
+	git add path1 &&
+	test_tick &&
+	git commit -a -m repo &&
+	the_first_commit=$(git show-ref -s --verify refs/heads/main) &&
 
-	# More commits on C, then merge C into A
-	git checkout C &&
-	test_commit C3 foo.txt &&
-	test_commit C4 bar.txt &&
-	git checkout A &&
-	git merge -s ours C -m A6 &&
-	git tag A6 &&
+	>path2 &&
+	git add path2 &&
+	test_tick &&
+	git commit -a -m second &&
+	the_commit=$(git show-ref -s --verify refs/heads/main)
 
-	test_commit A7 bar.txt
 
-[main (root-commit) 9b00348] A1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.txt
-[main 02e4832] A2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.txt
-[main 993a1f0] A3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'B'
-[B 4accf7e] B1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[B e76ada1] B2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 abc.txt
-Switched to a new branch 'C'
-[C 0c196cf] C1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 xyz.txt
-[C ea5d98c] C2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'A'
-Trying simple merge with B
-Trying simple merge with C
-Merge made by the 'octopus' strategy.
- abc.txt | 1 +
- foo.txt | 2 +-
- xyz.txt | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 abc.txt
- create mode 100644 xyz.txt
-[A 3f4a8d1] A5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'C'
-[C f01c181] C3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[C 406947e] C4
+[main (root-commit) b9c09d6] repo
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'A'
-Merge made by the 'ours' strategy.
-[A 691bdad] A7
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path1
+[main 9ad36e1] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - set up rev-list --graph test
-
-expecting success of 6016.2 '--graph --all': 
-	check_graph --all <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	| * C3
-	* | A5
-	| |
-	|  \
-	*-. | A4
-	|\ \|
-	| | * C2
-	| | * C1
-	| * | B2
-	| * | B1
-	* | | A3
-	| |/
-	|/|
-	* | A2
-	|/
-	* A1
-	EOF
-
-ok 2 - --graph --all
-
-expecting success of 6016.3 '--graph --simplify-by-decoration': 
-	git tag -d A4 &&
-	check_graph --all --simplify-by-decoration <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	| * C3
-	* | A5
-	| |
-	|  \
-	*-. | A4
-	|\ \|
-	| | * C2
-	| | * C1
-	| * | B2
-	| * | B1
-	* | | A3
-	| |/
-	|/|
-	* | A2
-	|/
-	* A1
-	EOF
-
-Deleted tag 'A4' (was c96d503)
-ok 3 - --graph --simplify-by-decoration
-
-expecting success of 6016.4 'setup: get rid of decorations on B': 
-	git tag -d B2 &&
-	git tag -d B1 &&
-	git branch -d B
-
-Deleted tag 'B2' (was e76ada1)
-Deleted tag 'B1' (was 4accf7e)
-Deleted branch B (was e76ada1).
-ok 4 - setup: get rid of decorations on B
-
-expecting success of 6016.5 '--graph --simplify-by-decoration prune branch B': 
-	check_graph --simplify-by-decoration --all <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	| * C3
-	* | A5
-	* | A4
-	|\|
-	| * C2
-	| * C1
-	* | A3
-	|/
-	* A2
-	* A1
-	EOF
-
-ok 5 - --graph --simplify-by-decoration prune branch B
-
-expecting success of 6016.6 '--graph --full-history -- bar.txt': 
-	check_graph --full-history --all -- bar.txt <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	* | A5
-	* | A4
-	|\|
-	* | A3
-	|/
-	* A2
-	EOF
-
-ok 6 - --graph --full-history -- bar.txt
-
-expecting success of 6016.7 '--graph --full-history --simplify-merges -- bar.txt': 
-	check_graph --full-history --simplify-merges --all -- bar.txt <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	* | A5
-	* | A3
-	|/
-	* A2
-	EOF
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+ok 1 - setup
 
-ok 7 - --graph --full-history --simplify-merges -- bar.txt
+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 6016.8 '--graph -- bar.txt': 
-	check_graph --all -- bar.txt <<-\EOF
-	* A7
-	* A5
-	* A3
-	| * C4
-	|/
-	* A2
-	EOF
+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'
 
-ok 8 - --graph -- bar.txt
+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 6016.9 '--graph --sparse -- bar.txt': 
-	check_graph --sparse --all -- bar.txt <<-\EOF
-	* A7
-	* A6
-	* A5
-	* A4
-	* A3
-	| * C4
-	| * C3
-	| * C2
-	| * C1
-	|/
-	* A2
-	* A1
-	EOF
+expecting success of 5516.5 'reject 'git fetch --no-ipv6'': 
+			test_must_fail git $cmd --no-$opt 2>err &&
+			grep "unknown option .no-$opt" err
+		
+error: unknown option `no-ipv6'
+ok 5 - reject 'git fetch --no-ipv6'
 
-ok 9 - --graph --sparse -- bar.txt
+expecting success of 5516.6 'fetch without wildcard': 
+	mk_empty testrepo &&
+	(
+		cd testrepo &&
+		git fetch .. refs/heads/main:refs/remotes/origin/main &&
 
-expecting success of 6016.10 '--graph ^C4': 
-	check_graph --all ^C4 <<-\EOF
-	* A7
-	* A6
-	* A5
-	*   A4
-	|\
-	| * B2
-	| * B1
-	* A3
-	EOF
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-ok 10 - --graph ^C4
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+From ..
+ * [new branch]      main       -> origin/main
+ok 6 - fetch without wildcard
 
-expecting success of 6016.11 '--graph ^C3': 
-	check_graph --all ^C3 <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	* A5
-	*   A4
-	|\
-	| * B2
-	| * B1
-	* A3
-	EOF
+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 &&
 
-ok 11 - --graph ^C3
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 6016.12 '--graph --boundary ^C3': 
-	check_graph --boundary --all ^C3 <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	* | A5
-	| |
-	|  \
-	*-. \   A4
-	|\ \ \
-	| * | | B2
-	| * | | B1
-	* | | | A3
-	o | | | A2
-	|/ / /
-	o / / A1
-	 / /
-	| o C3
-	|/
-	o C2
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+From ..
+ * [new branch]      main       -> origin/main
+ok 7 - fetch with wildcard
 
-ok 12 - --graph --boundary ^C3
+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 &&
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6009-rev-list-parent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6009-rev-list-parent/.git/
-expecting success of 6009.1 'setup': 
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-	touch file &&
-	git add file &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+From /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/.
+ * [new branch]      main       -> origin/main
+ok 8 - fetch with insteadOf
 
-	test_commit one &&
+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=$(($test_tick - 2400)) &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-	test_commit two &&
-	test_commit three &&
-	test_commit four &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+From /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/.
+ * [new branch]      main       -> origin/main
+ok 9 - fetch with pushInsteadOf (should not rewrite)
 
-	git log --pretty=oneline --abbrev-commit
+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
 
-[main (root-commit) e622cea] one
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 file
- create mode 100644 one.t
-[main bfa07e2] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main ecfa770] three
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 three.t
-[main 0906875] four
+ create mode 100644 unrelated_commit.t
+To testrepo
+ * [new reference]   main -> origin/main
+{"event":"data","sid":"20250130T021302.617657Z-H5c947e1c-P001d17aa/20250130T021302.668432Z-H5c947e1c-P001d17cb","thread":"main","time":"2025-01-30T02:13:02.696217Z","file":"builtin/pack-objects.c","line":1429,"repo":1,"t_abs":0.027977,"t_rel":0.000743,"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.47.2/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 four.t
-0906875 four
-ecfa770 three
-bfa07e2 two
-e622cea one
-ok 1 - setup
-
-expecting success of 6009.2 'one is ancestor of others and should not be shown': 
+ create mode 100644 unrelated_commit.t
+To testrepo
+ * [new reference]   main -> origin/main
+{"event":"data","sid":"20250130T021303.242225Z-H5c947e1c-P001d1980/20250130T021303.288484Z-H5c947e1c-P001d19a3","thread":"main","time":"2025-01-30T02:13:03.316854Z","file":"fetch-pack.c","line":2228,"repo":1,"t_abs":0.028540,"t_rel":0.027754,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
+{"event":"data","sid":"20250130T021303.242225Z-H5c947e1c-P001d1980/20250130T021303.342271Z-H5c947e1c-P001d19d6","thread":"main","time":"2025-01-30T02:13:03.355851Z","file":"builtin/pack-objects.c","line":1429,"repo":1,"t_abs":0.013777,"t_rel":0.000447,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"2"}
+ok 11 - push with negotiation
 
-	git rev-list one --not four >result &&
-	test_must_be_empty result
+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.47.2/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":"20250130T021303.858803Z-H5c947e1c-P001d1b62/20250130T021303.948740Z-H5c947e1c-P001d1ba9","thread":"main","time":"2025-01-30T02:13:03.972142Z","file":"builtin/pack-objects.c","line":1429,"repo":1,"t_abs":0.023614,"t_rel":0.000737,"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
 
-ok 2 - one is ancestor of others and should not be shown
+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
 
-expecting success of 6009.3 'setup roots, merges and octopuses': 
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+ok 13 - push deletion with negotiation
 
-	git checkout --orphan newroot &&
-	test_commit five &&
-	git checkout -b sidebranch two &&
-	test_commit six &&
-	git checkout -b anotherbranch three &&
-	test_commit seven &&
-	git checkout -b yetanotherbranch four &&
-	test_commit eight &&
-	git checkout main &&
-	test_tick &&
-	git merge --allow-unrelated-histories -m normalmerge newroot &&
-	git tag normalmerge &&
-	test_tick &&
-	git merge -m tripus sidebranch anotherbranch &&
-	git tag tripus &&
-	git checkout -b tetrabranch normalmerge &&
-	test_tick &&
-	git merge -m tetrapus sidebranch anotherbranch yetanotherbranch &&
-	git tag tetrapus &&
-	git checkout main
+expecting success of 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
 
-Switched to a new branch 'newroot'
-[newroot (root-commit) 04238a1] five
- Author: A U Thor <author@example.com>
- 6 files changed, 5 insertions(+)
- create mode 100644 file
- create mode 100644 five.t
- create mode 100644 four.t
- create mode 100644 one.t
- create mode 100644 three.t
- create mode 100644 two.t
-Switched to a new branch 'sidebranch'
-[sidebranch e29a44f] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-Switched to a new branch 'anotherbranch'
-[anotherbranch f863663] seven
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 seven.t
-Switched to a new branch 'yetanotherbranch'
-[yetanotherbranch 3e13a02] eight
+ create mode 100644 submodule_commit.t
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/submodule'...
+done.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 eight.t
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- five.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-Trying simple merge with sidebranch
-Trying simple merge with anotherbranch
-Merge made by the 'octopus' strategy.
- seven.t | 1 +
- six.t   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 seven.t
- create mode 100644 six.t
-Switched to a new branch 'tetrabranch'
-Trying simple merge with sidebranch
-Trying simple merge with anotherbranch
-Trying simple merge with yetanotherbranch
-Merge made by the 'octopus' strategy.
- eight.t | 1 +
- seven.t | 1 +
- six.t   | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 eight.t
- create mode 100644 seven.t
- create mode 100644 six.t
-Switched to branch 'main'
-ok 3 - setup roots, merges and octopuses
+ create mode 100644 unrelated_commit.t
+{"event":"data","sid":"20250130T021305.890213Z-H5c947e1c-P001d2166/20250130T021305.928021Z-H5c947e1c-P001d217c","thread":"main","time":"2025-01-30T02:13:05.956166Z","file":"fetch-pack.c","line":2228,"repo":1,"t_abs":0.028364,"t_rel":0.027541,"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 6009.4 'parse --max-parents & --min-parents': 
-	test_must_fail git rev-list --max-parents=1q HEAD 2>error &&
-	grep "not an integer" error &&
+expecting success of 5516.15 'push without wildcard': 
+	mk_empty testrepo &&
 
-	test_must_fail git rev-list --min-parents=1q HEAD 2>error &&
-	grep "not an integer" error &&
+	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
+	)
 
-	git rev-list --max-parents=1 --min-parents=1 HEAD &&
-	git rev-list --max-parents=-1 --min-parents=-1 HEAD
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   main -> origin/main
+ok 15 - push without wildcard
 
-fatal: '1q': not an integer
-fatal: '1q': not an integer
-f8636639f2719cb5d0e52902e25dd79e31d50ebf
-e29a44f7344623c1769e6ebf2a1dff468d38b78e
-090687546dcc443852244b61eee29f6d293f6447
-ecfa7709bd4782513d04d58aeadcd786b62f6f3d
-bfa07e29ea06c68a502fde1833ec867767da4e32
-7e25eedf3aa367cb6d152df2cbc457e529654b85
-8d2f284dbf2c57c34df5b16a17e4d1ed01377311
-f8636639f2719cb5d0e52902e25dd79e31d50ebf
-e29a44f7344623c1769e6ebf2a1dff468d38b78e
-04238a19571066bf2ac4ee6374c2ec92ef588e0f
-090687546dcc443852244b61eee29f6d293f6447
-ecfa7709bd4782513d04d58aeadcd786b62f6f3d
-bfa07e29ea06c68a502fde1833ec867767da4e32
-e622cead7c16d37859f0b353313a4d83b5e9a6e5
-ok 4 - parse --max-parents & --min-parents
+expecting success of 5516.16 'push with wildcard': 
+	mk_empty testrepo &&
 
-expecting success of 6009.5 'rev-list roots': 
+	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
+	)
 
-	check_revlist "--max-parents=0" one five
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   main -> origin/main
+ok 16 - push with wildcard
 
-ok 5 - rev-list roots
+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
+	)
 
-expecting success of 6009.6 'rev-list no merges': 
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+To /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo
+ * [new reference]   main -> origin/main
+ok 17 - push with insteadOf
 
-	check_revlist "--max-parents=1" one eight seven six five four three two &&
-	check_revlist "--no-merges" one eight seven six five four three two
+expecting success of 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
+	)
 
-ok 6 - rev-list no merges
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+To /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo
+ * [new reference]   main -> origin/main
+ok 18 - push with pushInsteadOf
 
-expecting success of 6009.7 'rev-list no octopuses': 
+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
+	)
 
-	check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
 
-ok 7 - rev-list no octopuses
+expecting success of 5516.20 'push with matching heads': 
 
-expecting success of 6009.8 'rev-list no roots': 
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	check_push_result testrepo $the_commit heads/main
 
-	check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
 
-ok 8 - rev-list no roots
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6009.9 'rev-list merges': 
+expecting success of 5516.21 'push with matching heads on the command line': 
 
-	check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
-	check_revlist "--merges" tetrapus tripus normalmerge
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	check_push_result testrepo $the_commit heads/main
 
-ok 9 - rev-list merges
 
-expecting success of 6009.10 'rev-list octopus': 
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	check_revlist "--min-parents=3" tetrapus tripus
+expecting success of 5516.22 'failed (non-fast-forward) push with matching heads': 
 
-ok 10 - rev-list octopus
+	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 6009.11 'rev-list ordinary commits': 
 
-	check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-ok 11 - rev-list ordinary commits
+    git push --set-upstream testrepo main
 
-expecting success of 6009.12 'rev-list --merges --no-merges yields empty set': 
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-	check_revlist "--min-parents=2 --no-merges" &&
-	check_revlist "--merges --no-merges" &&
-	check_revlist "--no-merges --merges"
+warning: unable to rmdir 'submodule': Directory not empty
+HEAD is now at 9ad36e1 second
+ok 22 - failed (non-fast-forward) push with matching heads
 
-ok 12 - rev-list --merges --no-merges yields empty set
+expecting success of 5516.23 'push --force with matching heads': 
 
-expecting success of 6009.13 'rev-list override and infinities': 
+	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
 
-	check_revlist "--min-parents=2 --max-parents=1 --max-parents=3" tripus normalmerge &&
-	check_revlist "--min-parents=1 --min-parents=2 --max-parents=7" tetrapus tripus normalmerge &&
-	check_revlist "--min-parents=2 --max-parents=8" tetrapus tripus normalmerge &&
-	check_revlist "--min-parents=2 --max-parents=-1" tetrapus tripus normalmerge &&
-	check_revlist "--min-parents=2 --no-max-parents" tetrapus tripus normalmerge &&
-	check_revlist "--max-parents=0 --min-parents=1 --no-min-parents" one five
 
-ok 13 - rev-list override and infinities
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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-01-30 02:13:11.208617702 +0000
++++ actual	2025-01-30 02:13:11.216617750 +0000
+@@ -1 +1 @@
+-9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
++935970ff2fd2257ae1a73d15652c0ac6f837cf17
+HEAD is now at 9ad36e1 second
+ok 23 - push --force with matching heads
 
-expecting success of 6009.14 'dodecapus': 
+expecting success of 5516.24 'push with matching heads and forced update': 
 
-	roots= &&
-	for i in 1 2 3 4 5 6 7 8 9 10 11
-	do
-		git checkout -b root$i five &&
-		test_commit $i &&
-		roots="$roots root$i" ||
-		return 1
-	done &&
-	git checkout main &&
-	test_tick &&
-	git merge -m dodecapus $roots &&
-	git tag dodecapus &&
+	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
 
-	check_revlist "--min-parents=4" dodecapus tetrapus &&
-	check_revlist "--min-parents=8" dodecapus &&
-	check_revlist "--min-parents=12" dodecapus &&
-	check_revlist "--min-parents=13" &&
-	check_revlist "--min-parents=4 --max-parents=11" tetrapus
 
-Switched to a new branch 'root1'
-[root1 9562ee3] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Switched to a new branch 'root2'
-[root2 1779fe6] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Switched to a new branch 'root3'
-[root3 cc9911e] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-Switched to a new branch 'root4'
-[root4 35b702f] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-Switched to a new branch 'root5'
-[root5 c532809] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-Switched to a new branch 'root6'
-[root6 f4a589f] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-Switched to a new branch 'root7'
-[root7 4f77507] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7.t
-Switched to a new branch 'root8'
-[root8 e4dbc7d] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8.t
-Switched to a new branch 'root9'
-[root9 446b36e] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9.t
-Switched to a new branch 'root10'
-[root10 120147b] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10.t
-Switched to a new branch 'root11'
-[root11 ce99f6d] 11
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+[main 935970f] assaged
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11.t
-Switched to branch 'main'
-Trying simple merge with root1
-Trying simple merge with root2
-Trying simple merge with root3
-Trying simple merge with root4
-Trying simple merge with root5
-Trying simple merge with root6
-Trying simple merge with root7
-Trying simple merge with root8
-Trying simple merge with root9
-Trying simple merge with root10
-Trying simple merge with root11
-Merge made by the 'octopus' strategy.
- 1.t  | 1 +
- 10.t | 1 +
- 11.t | 1 +
- 2.t  | 1 +
- 3.t  | 1 +
- 4.t  | 1 +
- 5.t  | 1 +
- 6.t  | 1 +
- 7.t  | 1 +
- 8.t  | 1 +
- 9.t  | 1 +
- 11 files changed, 11 insertions(+)
- create mode 100644 1.t
- create mode 100644 10.t
- create mode 100644 11.t
- create mode 100644 2.t
- create mode 100644 3.t
- create mode 100644 4.t
- create mode 100644 5.t
- create mode 100644 6.t
- create mode 100644 7.t
- create mode 100644 8.t
- create mode 100644 9.t
-ok 14 - dodecapus
-
-expecting success of 6009.15 'ancestors with the same commit time': 
+ 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-01-30 02:13:11.984622355 +0000
++++ actual	2025-01-30 02:13:11.996622427 +0000
+@@ -1 +1 @@
+-9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
++935970ff2fd2257ae1a73d15652c0ac6f837cf17
+HEAD is now at 9ad36e1 second
+ok 24 - push with matching heads and forced update
 
-	test_tick_keep=$test_tick &&
-	for i in 1 2 3 4 5 6 7 8; do
-		test_tick=$test_tick_keep &&
-		test_commit t$i || return 1
-	done &&
-	git rev-list t1^! --not t$i >result &&
-	test_must_be_empty result
+expecting success of 5516.25 'push with no ambiguity (1)': 
 
-[main 1bc0b48] t1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t1.t
-[main 145e5ab] t2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t2.t
-[main 17e63bf] t3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t3.t
-[main 47d7b66] t4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t4.t
-[main a42aaab] t5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t5.t
-[main aebfe15] t6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t6.t
-[main 7cfb595] t7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t7.t
-[main fea5200] t8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t8.t
-ok 15 - ancestors with the same commit time
+	mk_test testrepo heads/main &&
+	git push testrepo main:main &&
+	check_push_result testrepo $the_commit heads/main
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6010-merge-base.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6010-merge-base/.git/
-expecting success of 6010.1 'setup': 
-	T=$(git mktree </dev/null)
 
-ok 1 - setup
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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)
+expecting success of 5516.26 'push with no ambiguity (2)': 
 
-ok 2 - set up G and H
+	mk_test testrepo remotes/origin/main &&
+	git push testrepo main:origin/main &&
+	check_push_result testrepo $the_commit remotes/origin/main
 
-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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
 
-	MB=$(git merge-base --all G H) &&
-	git name-rev "$MB" >actual.all &&
+expecting success of 5516.27 'push with colon-less refspec, no ambiguity': 
 
-	MB=$(git show-branch --merge-base G H) &&
-	git name-rev "$MB" >actual.sb &&
+	mk_test testrepo heads/main heads/t/main &&
+	git branch -f t/main main &&
+	git push testrepo main &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit heads/t/main
 
-	test_cmp expected actual.single &&
-	test_cmp expected actual.all &&
-	test_cmp expected actual.sb
 
-ok 3 - merge-base G H
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6010.4 'merge-base/show-branch --independent': 
-	git name-rev "$H" >expected1 &&
-	git name-rev "$H" "$G" >expected2 &&
+expecting success of 5516.28 'push with weak ambiguity (1)': 
 
-	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 &&
+	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
 
-	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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
 
-ok 4 - merge-base/show-branch --independent
+expecting success of 5516.29 'push with weak ambiguity (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.
+	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
 
-	S=$(doit  0 S) &&
 
-	C0=$(doit -3 C0 $S) &&
-	C1=$(doit -2 C1 $C0) &&
-	C2=$(doit -1 C2 $C1) &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
 
-	L0=$(doit  1 L0 $S) &&
-	L1=$(doit  2 L1 $L0) &&
-	L2=$(doit  3 L2 $L1) &&
+expecting success of 5516.30 'push with ambiguity': 
 
-	R0=$(doit  1 R0 $S) &&
-	R1=$(doit  2 R1 $R0) &&
-	R2=$(doit  3 R2 $R1) &&
+	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
 
-	PL=$(doit  4 PL $L2 $C2) &&
-	PR=$(doit  4 PR $C2 $R2) &&
 
-	git name-rev $C2 >expected &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	MB=$(git merge-base PL PR) &&
-	git name-rev "$MB" >actual.single &&
+expecting success of 5516.31 'push with onelevel ref': 
+	mk_test testrepo heads/main &&
+	test_must_fail git push testrepo HEAD:refs/onelevel
 
-	MB=$(git merge-base --all PL PR) &&
-	git name-rev "$MB" >actual.all &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	test_cmp expected actual.single &&
-	test_cmp expected actual.all
+expecting success of 5516.32 'push with colon-less refspec (1)': 
 
-ok 5 - unsynchronized clocks
+	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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
 
-ok 6 - --independent with unsynchronized clocks
+expecting success of 5516.33 'push with colon-less refspec (2)': 
 
-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)
+	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
 
-	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'.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 5516.34 'push with colon-less refspec (3)': 
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	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 )
 
-  git switch -c <new-branch-name>
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
 
-Or undo this operation with:
+expecting success of 5516.35 'push with colon-less refspec (4)': 
 
-  git switch -
+	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 )
 
-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)
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6010.8 'merge-base A B C': 
-	git rev-parse --verify MM1 >expected &&
-	git rev-parse --verify MMR >expected.sb &&
+expecting success of 5516.36 'push head with non-existent, incomplete dest': 
 
-	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 &&
+	mk_test testrepo &&
+	git push testrepo main:branch &&
+	check_push_result testrepo $the_commit heads/branch
 
-	test_cmp expected actual &&
-	test_cmp expected.sb actual.common &&
-	test_cmp expected.sb actual.sb
 
-ok 8 - merge-base A B C
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6010.9 'criss-cross merge-base for octopus-step': 
-	git reset --hard MMR &&
-	test_commit CC1 &&
-	git reset --hard E &&
-	test_commit CC2 &&
-	test_tick &&
-	# E is a root commit unrelated to MMR root on which CC1 is based
-	git merge -s ours --allow-unrelated-histories CC1 &&
-	test_commit CC-o &&
-	test_commit CCB &&
-	git reset --hard CC1 &&
-	# E is a root commit unrelated to MMR root on which CC1 is based
-	git merge -s ours --allow-unrelated-histories CC2 &&
-	test_commit CCA &&
+expecting success of 5516.37 'push tag with non-existent, incomplete dest': 
 
-	git rev-parse CC1 CC2 >expected &&
-	git merge-base --all CCB CCA^^ CCA^^2 >actual &&
+	mk_test testrepo &&
+	git tag -f v1.0 &&
+	git push testrepo v1.0:tag &&
+	check_push_result testrepo $the_commit tags/tag
 
-	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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6010.10 'using reflog to find the fork point': 
-	git reset --hard &&
-	git checkout -b base $E &&
+expecting success of 5516.38 'push sha1 with non-existent, incomplete dest': 
 
-	(
-		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 &&
+	mk_test testrepo &&
+	test_must_fail git push testrepo $(git rev-parse main):foo
 
-		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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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:
 
-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
+- 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 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
+Neither worked, so we gave up. You must fully qualify the ref.
+hint: The <src> part of the refspec is a commit object.
+hint: Did you mean to create a new branch by pushing to
+hint: '9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f:refs/heads/foo'?
+error: failed to push some refs to 'testrepo'
+ok 38 - push sha1 with non-existent, incomplete dest
 
-e34970abbab4461223052769885c56a229ee9299
-ok 11 - --fork-point works with empty reflog
+expecting success of 5516.39 'push ref expression with non-existent, incomplete dest': 
 
-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
+	mk_test testrepo &&
+	test_must_fail git push testrepo main^:branch
 
-[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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6019-rev-list-ancestry-path.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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:
 
-[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
+- 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 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 &&
+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
 
-		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
+expecting success of 5516.40 'push with HEAD': 
+		mk_test testrepo heads/main &&
+		git checkout main &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/main
 	
-ok 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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-		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
+expecting success of 5516.41 'push with HEAD nonexisting at remote': 
+		mk_test testrepo heads/main &&
+		git checkout -b local main &&
+		test_when_finished "git checkout main; git branch -D local" &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local
 	
-ok 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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-		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 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 &&
 
-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 &&
+		# Without force rewinding should fail
+		git reset --hard $head^ &&
+		test_must_fail git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local &&
 
-		if test -n "G H I J L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
+		# With force rewinding should succeed
+		git push testrepo +$head &&
+		check_push_result testrepo $the_first_commit heads/local
 	
-ok 5 - log --ancestry-path=G D..M
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6019.6 'log --ancestry-path=H D..M': 
-		test_write_lines E G H I J L M >expect &&
-		git log --format=%s --ancestry-path=H D..M >raw &&
+expecting success of 5516.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
 
-		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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-		if test -n "K L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
+expecting success of 5516.44 'push with config remote.*.push = HEAD': 
+		mk_test testrepo heads/local &&
+		git checkout main &&
+		git branch -f local $the_commit &&
+		test_when_finished "git branch -D local" &&
+		(
+			cd testrepo &&
+			git checkout local &&
+			git reset --hard $the_first_commit
+		) &&
+		test_config remote.there.url testrepo &&
+		test_config remote.there.push $head &&
+		test_config branch.main.remote there &&
+		git push &&
+		check_push_result testrepo $the_commit heads/main &&
+		check_push_result testrepo $the_first_commit heads/local
 	
-ok 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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-		if test -n "E F J K L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
+expecting success of 5516.45 'push with @': 
+		mk_test testrepo heads/main &&
+		git checkout main &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/main
 	
-ok 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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 @
 
-		if test -n "M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
+expecting success of 5516.46 'push with @ nonexisting at remote': 
+		mk_test testrepo heads/main &&
+		git checkout -b local main &&
+		test_when_finished "git checkout main; git branch -D local" &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local
 	
-ok 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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-		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 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 &&
 
-expecting success of 6019.11 'log F...I': 
-		test_write_lines F G H I >expect &&
-		git log --format=%s F...I >raw &&
+		# Without force rewinding should fail
+		git reset --hard $head^ &&
+		test_must_fail git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local &&
 
-		if test -n "F G H I"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
+		# With force rewinding should succeed
+		git push testrepo +$head &&
+		check_push_result testrepo $the_first_commit heads/local
 	
-ok 11 - log F...I
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6019.12 'log --ancestry-path F...I': 
-		test_write_lines F H I >expect &&
-		git log --format=%s --ancestry-path F...I >raw &&
+expecting success of 5516.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
 
-		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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-		if test -n ""
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
+expecting success of 5516.49 'push with config remote.*.push = @': 
+		mk_test testrepo heads/local &&
+		git checkout main &&
+		git branch -f local $the_commit &&
+		test_when_finished "git branch -D local" &&
+		(
+			cd testrepo &&
+			git checkout local &&
+			git reset --hard $the_first_commit
+		) &&
+		test_config remote.there.url testrepo &&
+		test_config remote.there.push $head &&
+		test_config branch.main.remote there &&
+		git push &&
+		check_push_result testrepo $the_commit heads/main &&
+		check_push_result testrepo $the_first_commit heads/local
 	
-ok 13 - log G..M -- G.t
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 &&
+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
 
-		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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 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
+If you want to 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 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)
+  git switch -c <new-branch-name>
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+Or undo this operation with:
 
-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)
+  git switch -
 
-ok 17 - criss-cross: rev-list --ancestry-path cb..bc
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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)
+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
 
-ok 18 - criss-cross: rev-list --ancestry-path --all ^cb
+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
 
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6012-rev-list-simplify.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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
 
-	git branch other-branch &&
+expecting success of 5516.52 'push with config remote.*.pushurl': 
 
-	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 &&
+	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
 
-	echo "Hello" >file &&
-	echo "second" >lost &&
-	git add file lost &&
-	test_tick && GIT_AUTHOR_DATE=$(($test_tick + 120)) git commit -m "Modified file and lost" &&
-	note B &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	git checkout other-branch &&
+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
 
-	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.47.2/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.47.2/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.47.2/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
 
-	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.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
 
-	test_tick &&
-	test_must_fail git merge -m "merge" main &&
-	>lost && git commit -a -m "merge" &&
-	note E &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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
 
-	echo "Yet another" >elif &&
-	git add elif &&
-	test_tick && git commit -m "Irrelevant change" &&
-	note F &&
+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
 
-	git checkout main &&
-	echo "Yet another" >elif &&
-	git add elif &&
-	test_tick && git commit -m "Another irrelevant change" &&
-	note G &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	test_tick && git merge -m "merge" other-branch &&
-	note H &&
+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
 
-	echo "Final change" >file &&
-	test_tick && git commit -a -m "Final change" &&
-	note I &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	git checkout main &&
-	test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
-	note K &&
+expecting success of 5516.57 'push with dry-run': 
 
-	echo "Immaterial" >elif &&
-	git add elif &&
-	test_tick && git commit -m "Last" &&
-	note L
+	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
 
-[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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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.58 'push updates local refs': 
 
-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 &&
+	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 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.47.2/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.47.2/t/trash directory.t5516-fetch-push/testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 58 - push updates local refs
 
-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.59 'push updates up-to-date local refs': 
 
-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 &&
+	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)
+	)
 
-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.47.2/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.47.2/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 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.60 'push preserves up-to-date packed refs': 
 
-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 &&
+	mk_child testrepo child &&
+	(
+		cd child &&
+		git push &&
+		! test -f .git/refs/remotes/origin/main
+	)
 
-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.47.2/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 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 5516.61 'push does not update local refs on failure': 
 
-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
+	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)
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/t/trash directory.t5516-fetch-push/testrepo'
+ok 61 - push does not update local refs on failure
 
-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 5516.62 'allow deleting an invalid remote ref': 
 
-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
+	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)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 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
 
-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
+		cat >update.expect <<-EOF &&
+		refs/heads/main $orgmain $newmain
+		refs/heads/next $orgnext $newnext
+		EOF
 
-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
+		cat >post-receive.expect <<-EOF &&
+		$orgmain $newmain refs/heads/main
+		$orgnext $newnext refs/heads/next
+		EOF
 
-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
+		cat >post-update.expect <<-EOF &&
+		refs/heads/main
+		refs/heads/next
+		EOF
 
-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
+		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
+	)
 
-expecting success of 6012.27 'full history simplification without parent': 
-	printf "%s\n" E C B A >expect &&
-	git log --pretty="$FMT" --full-history E -- lost >out &&
-	unnote >actual <out &&
-	sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-	test_cmp expect check
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-ok 27 - full history simplification without parent
+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
 
-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
+		cat >update.expect <<-EOF &&
+		refs/heads/branch $orig $ZERO_OID
+		EOF
 
-ok 28 - --full-diff is not affected by --parents
+		cat >post-receive.expect <<-EOF &&
+		$orig $ZERO_OID refs/heads/branch
+		EOF
 
-expecting success of 6012.29 'setup rebuild repo': 
-	rm -rf .git * &&
-	git init &&
-	git switch -c topic &&
+		cat >post-update.expect <<-EOF &&
+		refs/heads/branch
+		EOF
 
-	echo base >file &&
-	git add file &&
-	test_commit I &&
+		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
+	)
 
-	echo A >file &&
-	git add file &&
-	test_commit A &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	git switch -c branchB I &&
-	echo B >file &&
-	git add file &&
-	test_commit B &&
+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/main $orgmain $newmain
+		refs/heads/nonexistent $ZERO_OID $ZERO_OID
+		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.47.2/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 a non-existent ref        
+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.47.2/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/main $orgmain $newmain
+		refs/heads/next $orgnext $newnext
+		refs/heads/seen $orgseen $newseen
+		refs/heads/nonexistent $ZERO_OID $ZERO_OID
+		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.47.2/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: updating the current branch        
+remote: warning: deleting a non-existent ref        
+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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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 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.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+Switched to branch 'second'
+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.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+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.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+Switched to branch 'second'
+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.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t5516-fetch-push/testrepo
+ ! [rejected]        testTag    -> testTag  (would clobber existing tag)
+From /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t5516-fetch-push/testrepo
+ ! [rejected]        testTag    -> testTag  (would clobber existing tag)
+From /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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/second heads/foo heads/bar &&
+	git push --prune testrepo : &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit heads/second &&
+	! check_push_result testrepo $the_first_commit heads/foo heads/bar
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 -> second
+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/second 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/second &&
+	! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/tmp/main
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/tmp/second
+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]   t/main -> refs/tmp/t/main
+notice: HEAD points to an unborn branch (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.47.2/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.47.2/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 SHA1': 
+	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.47.2/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 SHA1
+
+expecting success of 5516.97 'fetch exact SHA1 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
+	# NEEDSWORK: should this match the v0 behavior instead?
+	git -C child fetch -v ../testrepo $the_commit:refs/heads/copy
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 SHA1 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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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.47.2/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
+
+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 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 |
+		sort -k 3 >../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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
+From ../testrepo
+ * branch            main       -> FETCH_HEAD
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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.47.2/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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+
+		git config branch.main.merge refs/heads/trunk &&
+		git config branch.main.remote dst &&
+
+		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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+
+[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.47.2/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 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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+
+	# 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 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.47.2/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 &&
+
+		# 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 &&
+
+		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
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+
+	# 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)
+	) &&
+
+	# 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)
+	) &&
+
+	# 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)"
+	) &&
+
+	# (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)"
+	) &&
+
+	# Introduce a new file in the update
+	test_commit fifth path3 &&
+
+	# (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)"
+	) &&
+
+	# (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
+	) &&
+
+	# (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.47.2/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.47.2/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"
+
+	git update-index -q --refresh &&
+	git read-tree -u -m HEAD "$1" || {
+		status=$?
+		echo >&2 read-tree failed
+		exit $status
+	}
+	EOF
+
+	# 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)
+	) &&
+
+	# 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
+	) &&
+
+	# 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)
+	) &&
+
+	# 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"
+
+	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
+
+	git push void main &&
+	(
+		cd void &&
+		git diff --quiet &&
+		git diff --cached --quiet &&
+		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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
+
+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
+
+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.47.2/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.47.2/t/trash directory.t5516-fetch-push/.'
+To /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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
+
+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
+
+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
+
+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.47.2/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
+
+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.47.2/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
+
+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.47.2/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
+
+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 &&
+
+	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.47.2/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":"20250130T021440.088163Z-H5c947e1c-P001e190a","thread":"main","time":"2025-01-30T02:14:40.105733Z","file":"run-command.c","line":733,"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":"20250130T021440.327357Z-H5c947e1c-P001e199f","thread":"main","time":"2025-01-30T02:14:40.342720Z","file":"run-command.c","line":733,"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":"20250130T021440.541939Z-H5c947e1c-P001e1a4d","thread":"main","time":"2025-01-30T02:14:40.554102Z","file":"run-command.c","line":733,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q","--no-use-bitmap-index"]}
+ok 120 - push with config push.useBitmaps
+
+# passed all 120 test(s)
+1..120
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6016-rev-list-graph-simplify-history.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6016-rev-list-graph-simplify-history/.git/
+expecting success of 6016.1 'set up rev-list --graph test': 
+	# 3 commits on branch A
+	test_commit A1 foo.txt &&
+	test_commit A2 bar.txt &&
+	test_commit A3 bar.txt &&
+	git branch -m main A &&
+
+	# 2 commits on branch B, started from A1
+	git checkout -b B A1 &&
+	test_commit B1 foo.txt &&
+	test_commit B2 abc.txt &&
+
+	# 2 commits on branch C, started from A2
+	git checkout -b C A2 &&
+	test_commit C1 xyz.txt &&
+	test_commit C2 xyz.txt &&
+
+	# Octopus merge B and C into branch A
+	git checkout A &&
+	git merge B C -m A4 &&
+	git tag A4 &&
+
+	test_commit A5 bar.txt &&
+
+	# More commits on C, then merge C into A
+	git checkout C &&
+	test_commit C3 foo.txt &&
+	test_commit C4 bar.txt &&
+	git checkout A &&
+	git merge -s ours C -m A6 &&
+	git tag A6 &&
+
+	test_commit A7 bar.txt
+
+[main (root-commit) 9b00348] A1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.txt
+[main 02e4832] A2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.txt
+[main 993a1f0] A3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'B'
+[B 4accf7e] B1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[B e76ada1] B2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abc.txt
+Switched to a new branch 'C'
+[C 0c196cf] C1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 xyz.txt
+[C ea5d98c] C2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'A'
+Trying simple merge with B
+Trying simple merge with C
+Merge made by the 'octopus' strategy.
+ abc.txt | 1 +
+ foo.txt | 2 +-
+ xyz.txt | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 abc.txt
+ create mode 100644 xyz.txt
+[A 3f4a8d1] A5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'C'
+[C f01c181] C3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[C 406947e] C4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'A'
+Merge made by the 'ours' strategy.
+[A 691bdad] A7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - set up rev-list --graph test
+
+expecting success of 6016.2 '--graph --all': 
+	check_graph --all <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	| * C3
+	* | A5
+	| |
+	|  \
+	*-. | A4
+	|\ \|
+	| | * C2
+	| | * C1
+	| * | B2
+	| * | B1
+	* | | A3
+	| |/
+	|/|
+	* | A2
+	|/
+	* A1
+	EOF
+
+ok 2 - --graph --all
+
+expecting success of 6016.3 '--graph --simplify-by-decoration': 
+	git tag -d A4 &&
+	check_graph --all --simplify-by-decoration <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	| * C3
+	* | A5
+	| |
+	|  \
+	*-. | A4
+	|\ \|
+	| | * C2
+	| | * C1
+	| * | B2
+	| * | B1
+	* | | A3
+	| |/
+	|/|
+	* | A2
+	|/
+	* A1
+	EOF
+
+Deleted tag 'A4' (was c96d503)
+ok 3 - --graph --simplify-by-decoration
+
+expecting success of 6016.4 'setup: get rid of decorations on B': 
+	git tag -d B2 &&
+	git tag -d B1 &&
+	git branch -d B
+
+Deleted tag 'B2' (was e76ada1)
+Deleted tag 'B1' (was 4accf7e)
+Deleted branch B (was e76ada1).
+ok 4 - setup: get rid of decorations on B
+
+expecting success of 6016.5 '--graph --simplify-by-decoration prune branch B': 
+	check_graph --simplify-by-decoration --all <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	| * C3
+	* | A5
+	* | A4
+	|\|
+	| * C2
+	| * C1
+	* | A3
+	|/
+	* A2
+	* A1
+	EOF
+
+ok 5 - --graph --simplify-by-decoration prune branch B
+
+expecting success of 6016.6 '--graph --full-history -- bar.txt': 
+	check_graph --full-history --all -- bar.txt <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* | A5
+	* | A4
+	|\|
+	* | A3
+	|/
+	* A2
+	EOF
+
+ok 6 - --graph --full-history -- bar.txt
+
+expecting success of 6016.7 '--graph --full-history --simplify-merges -- bar.txt': 
+	check_graph --full-history --simplify-merges --all -- bar.txt <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* | A5
+	* | A3
+	|/
+	* A2
+	EOF
+
+ok 7 - --graph --full-history --simplify-merges -- bar.txt
+
+expecting success of 6016.8 '--graph -- bar.txt': 
+	check_graph --all -- bar.txt <<-\EOF
+	* A7
+	* A5
+	* A3
+	| * C4
+	|/
+	* A2
+	EOF
+
+ok 8 - --graph -- bar.txt
+
+expecting success of 6016.9 '--graph --sparse -- bar.txt': 
+	check_graph --sparse --all -- bar.txt <<-\EOF
+	* A7
+	* A6
+	* A5
+	* A4
+	* A3
+	| * C4
+	| * C3
+	| * C2
+	| * C1
+	|/
+	* A2
+	* A1
+	EOF
+
+ok 9 - --graph --sparse -- bar.txt
+
+expecting success of 6016.10 '--graph ^C4': 
+	check_graph --all ^C4 <<-\EOF
+	* A7
+	* A6
+	* A5
+	*   A4
+	|\
+	| * B2
+	| * B1
+	* A3
+	EOF
+
+ok 10 - --graph ^C4
+
+expecting success of 6016.11 '--graph ^C3': 
+	check_graph --all ^C3 <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* A5
+	*   A4
+	|\
+	| * B2
+	| * B1
+	* A3
+	EOF
+
+ok 11 - --graph ^C3
+
+expecting success of 6016.12 '--graph --boundary ^C3': 
+	check_graph --boundary --all ^C3 <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* | A5
+	| |
+	|  \
+	*-. \   A4
+	|\ \ \
+	| * | | B2
+	| * | | B1
+	* | | | A3
+	o | | | A2
+	|/ / /
+	o / / A1
+	 / /
+	| o C3
+	|/
+	o C2
+	EOF
+
+ok 12 - --graph --boundary ^C3
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6009-rev-list-parent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6009-rev-list-parent/.git/
+expecting success of 6009.1 'setup': 
+
+	touch file &&
+	git add file &&
+
+	test_commit one &&
+
+	test_tick=$(($test_tick - 2400)) &&
+
+	test_commit two &&
+	test_commit three &&
+	test_commit four &&
+
+	git log --pretty=oneline --abbrev-commit
+
+[main (root-commit) e622cea] one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 file
+ create mode 100644 one.t
+[main bfa07e2] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main ecfa770] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[main 0906875] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+0906875 four
+ecfa770 three
+bfa07e2 two
+e622cea one
+ok 1 - setup
+
+expecting success of 6009.2 'one is ancestor of others and should not be shown': 
+
+	git rev-list one --not four >result &&
+	test_must_be_empty result
+
+
+ok 2 - one is ancestor of others and should not be shown
+
+expecting success of 6009.3 'setup roots, merges and octopuses': 
+
+	git checkout --orphan newroot &&
+	test_commit five &&
+	git checkout -b sidebranch two &&
+	test_commit six &&
+	git checkout -b anotherbranch three &&
+	test_commit seven &&
+	git checkout -b yetanotherbranch four &&
+	test_commit eight &&
+	git checkout main &&
+	test_tick &&
+	git merge --allow-unrelated-histories -m normalmerge newroot &&
+	git tag normalmerge &&
+	test_tick &&
+	git merge -m tripus sidebranch anotherbranch &&
+	git tag tripus &&
+	git checkout -b tetrabranch normalmerge &&
+	test_tick &&
+	git merge -m tetrapus sidebranch anotherbranch yetanotherbranch &&
+	git tag tetrapus &&
+	git checkout main
+
+Switched to a new branch 'newroot'
+[newroot (root-commit) 04238a1] five
+ Author: A U Thor <author@example.com>
+ 6 files changed, 5 insertions(+)
+ create mode 100644 file
+ create mode 100644 five.t
+ create mode 100644 four.t
+ create mode 100644 one.t
+ create mode 100644 three.t
+ create mode 100644 two.t
+Switched to a new branch 'sidebranch'
+[sidebranch e29a44f] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+Switched to a new branch 'anotherbranch'
+[anotherbranch f863663] seven
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 seven.t
+Switched to a new branch 'yetanotherbranch'
+[yetanotherbranch 3e13a02] eight
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 eight.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ five.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+Trying simple merge with sidebranch
+Trying simple merge with anotherbranch
+Merge made by the 'octopus' strategy.
+ seven.t | 1 +
+ six.t   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 seven.t
+ create mode 100644 six.t
+Switched to a new branch 'tetrabranch'
+Trying simple merge with sidebranch
+Trying simple merge with anotherbranch
+Trying simple merge with yetanotherbranch
+Merge made by the 'octopus' strategy.
+ eight.t | 1 +
+ seven.t | 1 +
+ six.t   | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 eight.t
+ create mode 100644 seven.t
+ create mode 100644 six.t
+Switched to branch 'main'
+ok 3 - setup roots, merges and octopuses
+
+expecting success of 6009.4 'parse --max-parents & --min-parents': 
+	test_must_fail git rev-list --max-parents=1q HEAD 2>error &&
+	grep "not an integer" error &&
+
+	test_must_fail git rev-list --min-parents=1q HEAD 2>error &&
+	grep "not an integer" error &&
+
+	git rev-list --max-parents=1 --min-parents=1 HEAD &&
+	git rev-list --max-parents=-1 --min-parents=-1 HEAD
+
+fatal: '1q': not an integer
+fatal: '1q': not an integer
+f8636639f2719cb5d0e52902e25dd79e31d50ebf
+e29a44f7344623c1769e6ebf2a1dff468d38b78e
+090687546dcc443852244b61eee29f6d293f6447
+ecfa7709bd4782513d04d58aeadcd786b62f6f3d
+bfa07e29ea06c68a502fde1833ec867767da4e32
+7e25eedf3aa367cb6d152df2cbc457e529654b85
+8d2f284dbf2c57c34df5b16a17e4d1ed01377311
+f8636639f2719cb5d0e52902e25dd79e31d50ebf
+e29a44f7344623c1769e6ebf2a1dff468d38b78e
+04238a19571066bf2ac4ee6374c2ec92ef588e0f
+090687546dcc443852244b61eee29f6d293f6447
+ecfa7709bd4782513d04d58aeadcd786b62f6f3d
+bfa07e29ea06c68a502fde1833ec867767da4e32
+e622cead7c16d37859f0b353313a4d83b5e9a6e5
+ok 4 - parse --max-parents & --min-parents
+
+expecting success of 6009.5 'rev-list roots': 
+
+	check_revlist "--max-parents=0" one five
+
+ok 5 - rev-list roots
+
+expecting success of 6009.6 'rev-list no merges': 
+
+	check_revlist "--max-parents=1" one eight seven six five four three two &&
+	check_revlist "--no-merges" one eight seven six five four three two
+
+ok 6 - rev-list no merges
+
+expecting success of 6009.7 'rev-list no octopuses': 
+
+	check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
+
+ok 7 - rev-list no octopuses
+
+expecting success of 6009.8 'rev-list no roots': 
+
+	check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
+
+ok 8 - rev-list no roots
+
+expecting success of 6009.9 'rev-list merges': 
+
+	check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
+	check_revlist "--merges" tetrapus tripus normalmerge
+
+ok 9 - rev-list merges
+
+expecting success of 6009.10 'rev-list octopus': 
+
+	check_revlist "--min-parents=3" tetrapus tripus
+
+ok 10 - rev-list octopus
+
+expecting success of 6009.11 'rev-list ordinary commits': 
+
+	check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
+
+ok 11 - rev-list ordinary commits
+
+expecting success of 6009.12 'rev-list --merges --no-merges yields empty set': 
+
+	check_revlist "--min-parents=2 --no-merges" &&
+	check_revlist "--merges --no-merges" &&
+	check_revlist "--no-merges --merges"
+
+ok 12 - rev-list --merges --no-merges yields empty set
+
+expecting success of 6009.13 'rev-list override and infinities': 
+
+	check_revlist "--min-parents=2 --max-parents=1 --max-parents=3" tripus normalmerge &&
+	check_revlist "--min-parents=1 --min-parents=2 --max-parents=7" tetrapus tripus normalmerge &&
+	check_revlist "--min-parents=2 --max-parents=8" tetrapus tripus normalmerge &&
+	check_revlist "--min-parents=2 --max-parents=-1" tetrapus tripus normalmerge &&
+	check_revlist "--min-parents=2 --no-max-parents" tetrapus tripus normalmerge &&
+	check_revlist "--max-parents=0 --min-parents=1 --no-min-parents" one five
+
+ok 13 - rev-list override and infinities
+
+expecting success of 6009.14 'dodecapus': 
+
+	roots= &&
+	for i in 1 2 3 4 5 6 7 8 9 10 11
+	do
+		git checkout -b root$i five &&
+		test_commit $i &&
+		roots="$roots root$i" ||
+		return 1
+	done &&
+	git checkout main &&
+	test_tick &&
+	git merge -m dodecapus $roots &&
+	git tag dodecapus &&
+
+	check_revlist "--min-parents=4" dodecapus tetrapus &&
+	check_revlist "--min-parents=8" dodecapus &&
+	check_revlist "--min-parents=12" dodecapus &&
+	check_revlist "--min-parents=13" &&
+	check_revlist "--min-parents=4 --max-parents=11" tetrapus
+
+Switched to a new branch 'root1'
+[root1 9562ee3] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+Switched to a new branch 'root2'
+[root2 1779fe6] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+Switched to a new branch 'root3'
+[root3 cc9911e] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+Switched to a new branch 'root4'
+[root4 35b702f] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+Switched to a new branch 'root5'
+[root5 c532809] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+Switched to a new branch 'root6'
+[root6 f4a589f] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+Switched to a new branch 'root7'
+[root7 4f77507] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7.t
+Switched to a new branch 'root8'
+[root8 e4dbc7d] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8.t
+Switched to a new branch 'root9'
+[root9 446b36e] 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9.t
+Switched to a new branch 'root10'
+[root10 120147b] 10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10.t
+Switched to a new branch 'root11'
+[root11 ce99f6d] 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11.t
+Switched to branch 'main'
+Trying simple merge with root1
+Trying simple merge with root2
+Trying simple merge with root3
+Trying simple merge with root4
+Trying simple merge with root5
+Trying simple merge with root6
+Trying simple merge with root7
+Trying simple merge with root8
+Trying simple merge with root9
+Trying simple merge with root10
+Trying simple merge with root11
+Merge made by the 'octopus' strategy.
+ 1.t  | 1 +
+ 10.t | 1 +
+ 11.t | 1 +
+ 2.t  | 1 +
+ 3.t  | 1 +
+ 4.t  | 1 +
+ 5.t  | 1 +
+ 6.t  | 1 +
+ 7.t  | 1 +
+ 8.t  | 1 +
+ 9.t  | 1 +
+ 11 files changed, 11 insertions(+)
+ create mode 100644 1.t
+ create mode 100644 10.t
+ create mode 100644 11.t
+ create mode 100644 2.t
+ create mode 100644 3.t
+ create mode 100644 4.t
+ create mode 100644 5.t
+ create mode 100644 6.t
+ create mode 100644 7.t
+ create mode 100644 8.t
+ create mode 100644 9.t
+ok 14 - dodecapus
+
+expecting success of 6009.15 'ancestors with the same commit time': 
+
+	test_tick_keep=$test_tick &&
+	for i in 1 2 3 4 5 6 7 8; do
+		test_tick=$test_tick_keep &&
+		test_commit t$i || return 1
+	done &&
+	git rev-list t1^! --not t$i >result &&
+	test_must_be_empty result
+
+[main 1bc0b48] t1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 t1.t
+[main 145e5ab] t2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 t2.t
+[main 17e63bf] t3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 t3.t
+[main 47d7b66] t4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 t4.t
+[main a42aaab] t5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 t5.t
+[main aebfe15] t6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 t6.t
+[main 7cfb595] t7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 t7.t
+[main fea5200] t8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 t8.t
+ok 15 - ancestors with the same commit time
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6010-merge-base.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6019-rev-list-ancestry-path.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6012-rev-list-simplify.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
@@ -391522,972 +395007,152 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6018-rev-list-glob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6018-rev-list-glob/.git/
-expecting success of 6018.1 'setup': 
-
-	commit main &&
-	git checkout -b subspace/one main &&
-	commit one &&
-	git checkout -b subspace/two main &&
-	commit two &&
-	git checkout -b subspace-x main &&
-	commit subspace-x &&
-	git checkout -b other/three main &&
-	commit three &&
-	git checkout -b someref main &&
-	commit some &&
-	git checkout main &&
-	commit topic_2 &&
-	git tag foo/bar main &&
-	commit topic_3 &&
-	git update-ref refs/remotes/foo/baz main &&
-	commit topic_4 &&
-	git update-ref refs/remotes/upstream/one subspace/one &&
-	git update-ref refs/remotes/upstream/two subspace/two &&
-	git update-ref refs/remotes/upstream/x subspace-x &&
-	git tag qux/one subspace/one &&
-	git tag qux/two subspace/two &&
-	git tag qux/x subspace-x
+*** t6021-rev-list-exclude-hidden.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
 
-[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
+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
+---------------------------------------------------------------------
 
-expecting success of 6018.2 'rev-parse --glob=refs/heads/subspace/*': 
+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
+---------------------------------------------------------------------
 
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
+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 2 - rev-parse --glob=refs/heads/subspace/*
+ok 1 - setup
 
-expecting success of 6018.3 'rev-parse --glob=heads/subspace/*': 
+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
 
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
+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
 
-ok 3 - rev-parse --glob=heads/subspace/*
+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 6018.4 'rev-parse --glob=refs/heads/subspace/': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
-
-
-ok 4 - rev-parse --glob=refs/heads/subspace/
-
-expecting success of 6018.5 'rev-parse --glob=heads/subspace/': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
-
-
-ok 5 - rev-parse --glob=heads/subspace/
-
-expecting success of 6018.6 'rev-parse --glob=heads/subspace': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
-
-
-ok 6 - rev-parse --glob=heads/subspace
-
-checking known breakage of 6018.7 'rev-parse accepts --glob as detached option': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
-
-
-fatal: ambiguous argument 'heads/subspace': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-not ok 7 - rev-parse accepts --glob as detached option # TODO known breakage
-
-checking known breakage of 6018.8 'rev-parse is not confused by option-like glob': 
-
-	compare rev-parse "main" "--glob --symbolic main"
-
-
---- expected	2026-03-04 08:01:08.735352315 +0000
-+++ actual	2026-03-04 08:01:08.747352315 +0000
-@@ -1 +1,2 @@
--88fe3d283ae350159b6dcc1f45481c8fa40ad3d8
-+--glob
-+main
-not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
-
-expecting success of 6018.9 'rev-parse --branches=subspace/*': 
-
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
-
-
-ok 9 - rev-parse --branches=subspace/*
-
-expecting success of 6018.10 'rev-parse --branches=subspace/': 
-
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
-
-
-ok 10 - rev-parse --branches=subspace/
-
-expecting success of 6018.11 'rev-parse --branches=subspace': 
-
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
-
-
-ok 11 - rev-parse --branches=subspace
-
-expecting success of 6018.12 'rev-parse --glob=heads/subspace/* --glob=heads/other/*': 
-
-	compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
-
-
-ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
-
-expecting success of 6018.13 'rev-parse --glob=heads/someref/* main': 
-
-	compare rev-parse "main" "--glob=heads/someref/* main"
-
-
-ok 13 - rev-parse --glob=heads/someref/* main
-
-expecting success of 6018.14 'rev-parse --glob=heads/*': 
-
-	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
-
-
-ok 14 - rev-parse --glob=heads/*
-
-expecting success of 6018.15 'rev-parse --tags=foo': 
-
-	compare rev-parse "foo/bar" "--tags=foo"
-
-
-ok 15 - rev-parse --tags=foo
-
-expecting success of 6018.16 'rev-parse --remotes=foo': 
-
-	compare rev-parse "foo/baz" "--remotes=foo"
-
-
-ok 16 - rev-parse --remotes=foo
-
-expecting success of 6018.17 'rev-parse --exclude with --branches': 
-	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
-
-ok 17 - rev-parse --exclude with --branches
-
-expecting success of 6018.18 'rev-parse --exclude with --all': 
-	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
-
-ok 18 - rev-parse --exclude with --all
-
-expecting success of 6018.19 'rev-parse accumulates multiple --exclude': 
-	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
-
-ok 19 - rev-parse accumulates multiple --exclude
-
-expecting success of 6018.20 'rev-parse --branches clears --exclude': 
-	compare rev-parse "--exclude=* --branches --branches" "--branches"
-
-ok 20 - rev-parse --branches clears --exclude
-
-expecting success of 6018.21 'rev-parse --tags clears --exclude': 
-	compare rev-parse "--exclude=* --tags --tags" "--tags"
-
-ok 21 - rev-parse --tags clears --exclude
-
-expecting success of 6018.22 'rev-parse --all clears --exclude': 
-	compare rev-parse "--exclude=* --all --all" "--all"
-
-ok 22 - rev-parse --all clears --exclude
-
-expecting success of 6018.23 'rev-parse --exclude=glob with --branches=glob': 
-	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
-
-ok 23 - rev-parse --exclude=glob with --branches=glob
-
-expecting success of 6018.24 'rev-parse --exclude=glob with --tags=glob': 
-	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
-
-ok 24 - rev-parse --exclude=glob with --tags=glob
-
-expecting success of 6018.25 'rev-parse --exclude=glob with --remotes=glob': 
-	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 25 - rev-parse --exclude=glob with --remotes=glob
-
-expecting success of 6018.26 'rev-parse --exclude=ref with --branches=glob': 
-	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
-
-ok 26 - rev-parse --exclude=ref with --branches=glob
-
-expecting success of 6018.27 'rev-parse --exclude=ref with --tags=glob': 
-	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
-
-ok 27 - rev-parse --exclude=ref with --tags=glob
-
-expecting success of 6018.28 'rev-parse --exclude=ref with --remotes=glob': 
-	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 28 - rev-parse --exclude=ref with --remotes=glob
-
-expecting success of 6018.29 'rev-parse --exclude-hidden=fetch with --all': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
-	
-ok 29 - rev-parse --exclude-hidden=fetch with --all
-
-expecting success of 6018.30 'rev-parse --exclude-hidden=fetch with --all': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
-	
-ok 30 - rev-parse --exclude-hidden=fetch with --all
-
-expecting success of 6018.31 'rev-parse --exclude-hidden=fetch with --glob': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
-	
-ok 31 - rev-parse --exclude-hidden=fetch with --glob
-
-expecting success of 6018.32 'rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
-	
-ok 32 - rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref
-
-expecting success of 6018.33 'rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 33 - rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref
-
-expecting success of 6018.34 'rev-parse --exclude-hidden=fetch fails with --branches': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 34 - rev-parse --exclude-hidden=fetch fails with --branches
-
-expecting success of 6018.35 'rev-parse --exclude-hidden=fetch fails with --branches=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 35 - rev-parse --exclude-hidden=fetch fails with --branches=pattern
-
-expecting success of 6018.36 'rev-parse --exclude-hidden=fetch fails with --tags': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 36 - rev-parse --exclude-hidden=fetch fails with --tags
-
-expecting success of 6018.37 'rev-parse --exclude-hidden=fetch fails with --tags=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 37 - rev-parse --exclude-hidden=fetch fails with --tags=pattern
-
-expecting success of 6018.38 'rev-parse --exclude-hidden=fetch fails with --remotes': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 38 - rev-parse --exclude-hidden=fetch fails with --remotes
-
-expecting success of 6018.39 'rev-parse --exclude-hidden=fetch fails with --remotes=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 39 - rev-parse --exclude-hidden=fetch fails with --remotes=pattern
-
-expecting success of 6018.40 'rev-parse --exclude-hidden=receive with --all': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
-	
-ok 40 - rev-parse --exclude-hidden=receive with --all
-
-expecting success of 6018.41 'rev-parse --exclude-hidden=receive with --all': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
-	
-ok 41 - rev-parse --exclude-hidden=receive with --all
-
-expecting success of 6018.42 'rev-parse --exclude-hidden=receive with --glob': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
-	
-ok 42 - rev-parse --exclude-hidden=receive with --glob
-
-expecting success of 6018.43 'rev-parse --exclude-hidden=receive can be passed once per pseudo-ref': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
-	
-ok 43 - rev-parse --exclude-hidden=receive can be passed once per pseudo-ref
-
-expecting success of 6018.44 'rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 44 - rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref
-
-expecting success of 6018.45 'rev-parse --exclude-hidden=receive fails with --branches': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 45 - rev-parse --exclude-hidden=receive fails with --branches
-
-expecting success of 6018.46 'rev-parse --exclude-hidden=receive fails with --branches=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 46 - rev-parse --exclude-hidden=receive fails with --branches=pattern
-
-expecting success of 6018.47 'rev-parse --exclude-hidden=receive fails with --tags': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 47 - rev-parse --exclude-hidden=receive fails with --tags
-
-expecting success of 6018.48 'rev-parse --exclude-hidden=receive fails with --tags=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 48 - rev-parse --exclude-hidden=receive fails with --tags=pattern
-
-expecting success of 6018.49 'rev-parse --exclude-hidden=receive fails with --remotes': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 49 - rev-parse --exclude-hidden=receive fails with --remotes
-
-expecting success of 6018.50 'rev-parse --exclude-hidden=receive fails with --remotes=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 50 - rev-parse --exclude-hidden=receive fails with --remotes=pattern
-
-expecting success of 6018.51 'rev-parse --exclude-hidden=uploadpack with --all': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
-	
-ok 51 - rev-parse --exclude-hidden=uploadpack with --all
-
-expecting success of 6018.52 'rev-parse --exclude-hidden=uploadpack with --all': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
-	
-ok 52 - rev-parse --exclude-hidden=uploadpack with --all
-
-expecting success of 6018.53 'rev-parse --exclude-hidden=uploadpack with --glob': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
-	
-ok 53 - rev-parse --exclude-hidden=uploadpack with --glob
-
-expecting success of 6018.54 'rev-parse --exclude-hidden=uploadpack can be passed once per pseudo-ref': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
-	
-ok 54 - rev-parse --exclude-hidden=uploadpack can be passed once per pseudo-ref
-
-expecting success of 6018.55 'rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 55 - rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref
-
-expecting success of 6018.56 'rev-parse --exclude-hidden=uploadpack fails with --branches': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 56 - rev-parse --exclude-hidden=uploadpack fails with --branches
-
-expecting success of 6018.57 'rev-parse --exclude-hidden=uploadpack fails with --branches=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 57 - rev-parse --exclude-hidden=uploadpack fails with --branches=pattern
-
-expecting success of 6018.58 'rev-parse --exclude-hidden=uploadpack fails with --tags': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 58 - rev-parse --exclude-hidden=uploadpack fails with --tags
-
-expecting success of 6018.59 'rev-parse --exclude-hidden=uploadpack fails with --tags=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 59 - rev-parse --exclude-hidden=uploadpack fails with --tags=pattern
-
-expecting success of 6018.60 'rev-parse --exclude-hidden=uploadpack fails with --remotes': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 60 - rev-parse --exclude-hidden=uploadpack fails with --remotes
-
-expecting success of 6018.61 'rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 61 - rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern
-
-expecting success of 6018.62 'rev-list --exclude=glob with --branches=glob': 
-	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
-
-ok 62 - rev-list --exclude=glob with --branches=glob
-
-expecting success of 6018.63 'rev-list --exclude=glob with --tags=glob': 
-	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
-
-ok 63 - rev-list --exclude=glob with --tags=glob
-
-expecting success of 6018.64 'rev-list --exclude=glob with --remotes=glob': 
-	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 64 - rev-list --exclude=glob with --remotes=glob
-
-expecting success of 6018.65 'rev-list --exclude=ref with --branches=glob': 
-	compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
-
-ok 65 - rev-list --exclude=ref with --branches=glob
-
-expecting success of 6018.66 'rev-list --exclude=ref with --tags=glob': 
-	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
-
-ok 66 - rev-list --exclude=ref with --tags=glob
-
-expecting success of 6018.67 'rev-list --exclude=ref with --remotes=glob': 
-	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 67 - rev-list --exclude=ref with --remotes=glob
-
-expecting success of 6018.68 'rev-list --glob=refs/heads/subspace/*': 
-
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
-
-
-ok 68 - rev-list --glob=refs/heads/subspace/*
-
-expecting success of 6018.69 'rev-list --glob refs/heads/subspace/*': 
-
-	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
-
-
-ok 69 - rev-list --glob refs/heads/subspace/*
-
-expecting success of 6018.70 'rev-list not confused by option-like --glob arg': 
-
-	compare rev-list "main" "--glob -0 main"
-
-
-ok 70 - rev-list not confused by option-like --glob arg
-
-expecting success of 6018.71 'rev-list --glob=heads/subspace/*': 
-
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
-
-
-ok 71 - rev-list --glob=heads/subspace/*
-
-expecting success of 6018.72 'rev-list --glob=refs/heads/subspace/': 
-
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
-
-
-ok 72 - rev-list --glob=refs/heads/subspace/
-
-expecting success of 6018.73 'rev-list --glob=heads/subspace/': 
-
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
-
-
-ok 73 - rev-list --glob=heads/subspace/
-
-expecting success of 6018.74 'rev-list --glob=heads/subspace': 
-
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
-
-
-ok 74 - rev-list --glob=heads/subspace
-
-expecting success of 6018.75 'rev-list --branches=subspace/*': 
-
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
-
-
-ok 75 - rev-list --branches=subspace/*
-
-expecting success of 6018.76 'rev-list --branches=subspace/': 
-
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
-
-
-ok 76 - rev-list --branches=subspace/
-
-expecting success of 6018.77 'rev-list --branches=subspace': 
-
-	compare rev-list "subspace/one subspace/two" "--branches=subspace"
-
-
-ok 77 - rev-list --branches=subspace
-
-expecting success of 6018.78 'rev-list --branches': 
-
-	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
-
-
-ok 78 - rev-list --branches
-
-expecting success of 6018.79 'rev-list --glob=heads/someref/* main': 
-
-	compare rev-list "main" "--glob=heads/someref/* main"
-
-
-ok 79 - rev-list --glob=heads/someref/* main
-
-expecting success of 6018.80 'rev-list --glob=heads/subspace/* --glob=heads/other/*': 
-
-	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
-
-
-ok 80 - rev-list --glob=heads/subspace/* --glob=heads/other/*
-
-expecting success of 6018.81 'rev-list --glob=heads/*': 
-
-	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
-
-
-ok 81 - rev-list --glob=heads/*
-
-expecting success of 6018.82 'rev-list --tags=foo': 
-
-	compare rev-list "foo/bar" "--tags=foo"
-
-
-ok 82 - rev-list --tags=foo
-
-expecting success of 6018.83 'rev-list --tags': 
-
-	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
-
-
-ok 83 - rev-list --tags
-
-expecting success of 6018.84 'rev-list --remotes=foo': 
-
-	compare rev-list "foo/baz" "--remotes=foo"
-
-
-ok 84 - rev-list --remotes=foo
-
-expecting success of 6018.85 'rev-list --exclude with --branches': 
-	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
-
-ok 85 - rev-list --exclude with --branches
-
-expecting success of 6018.86 'rev-list --exclude with --all': 
-	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
-
-ok 86 - rev-list --exclude with --all
-
-expecting success of 6018.87 'rev-list accumulates multiple --exclude': 
-	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
-
-ok 87 - rev-list accumulates multiple --exclude
-
-expecting success of 6018.88 'rev-list should succeed with empty output on empty stdin': 
-	git rev-list --stdin </dev/null >actual &&
-	test_must_be_empty actual
-
-ok 88 - rev-list should succeed with empty output on empty stdin
-
-expecting success of 6018.89 'rev-list should succeed with empty output with all refs excluded': 
-	git rev-list --exclude=* --all >actual &&
-	test_must_be_empty actual
-
-ok 89 - rev-list should succeed with empty output with all refs excluded
-
-expecting success of 6018.90 'rev-list should succeed with empty output with empty --all': 
-	(
-		test_create_repo empty &&
-		cd empty &&
-		git rev-list --all >actual &&
-		test_must_be_empty actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6018-rev-list-glob/empty/.git/
-ok 90 - rev-list should succeed with empty output with empty --all
-
-expecting success of 6018.91 'rev-list should succeed with empty output with empty glob': 
-	git rev-list --glob=does-not-match-anything >actual &&
-	test_must_be_empty actual
-
-ok 91 - rev-list should succeed with empty output with empty glob
-
-expecting success of 6018.92 'rev-list should succeed with empty output when ignoring missing': 
-	git rev-list --ignore-missing $ZERO_OID >actual &&
-	test_must_be_empty actual
-
-ok 92 - rev-list should succeed with empty output when ignoring missing
-
-expecting success of 6018.93 'shortlog accepts --glob/--tags/--remotes': 
-
-	compare shortlog "subspace/one subspace/two" --branches=subspace &&
-	compare shortlog \
-	  "main subspace-x someref other/three subspace/one subspace/two" \
-	  --branches &&
-	compare shortlog main "--glob=heads/someref/* main" &&
-	compare shortlog "subspace/one subspace/two other/three" \
-	  "--glob=heads/subspace/* --glob=heads/other/*" &&
-	compare shortlog \
-	  "main other/three someref subspace-x subspace/one subspace/two" \
-	  "--glob=heads/*" &&
-	compare shortlog foo/bar --tags=foo &&
-	compare shortlog "foo/bar qux/one qux/two qux/x" --tags &&
-	compare shortlog foo/baz --remotes=foo
-
-
-ok 93 - shortlog accepts --glob/--tags/--remotes
-
-checking known breakage of 6018.94 'shortlog accepts --glob as detached option': 
-
-	compare shortlog \
-	  "main other/three someref subspace-x subspace/one subspace/two" \
-	  "--glob heads/*"
-
-
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
-
-    -c, --[no-]committer  group by committer rather than author
-    -n, --[no-]numbered   sort output according to the number of commits per author
-    -s, --[no-]summary    suppress commit descriptions, only provides commit count
-    -e, --[no-]email      show the email address of each author
-    -w[<w>[,<i1>[,<i2>]]] linewrap output
-    --[no-]group <field>  group by field
-
-not ok 94 - shortlog accepts --glob as detached option # TODO known breakage
-
-checking known breakage of 6018.95 'shortlog --glob is not confused by option-like argument': 
-
-	compare shortlog main "--glob -e main"
-
-
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
-
-    -c, --[no-]committer  group by committer rather than author
-    -n, --[no-]numbered   sort output according to the number of commits per author
-    -s, --[no-]summary    suppress commit descriptions, only provides commit count
-    -e, --[no-]email      show the email address of each author
-    -w[<w>[,<i1>[,<i2>]]] linewrap output
-    --[no-]group <field>  group by field
-
-not ok 95 - shortlog --glob is not confused by option-like argument # TODO known breakage
-
-# still have 4 known breakage(s)
-# passed all remaining 91 test(s)
-1..95
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6003-rev-list-topo-order.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6003-rev-list-topo-order/.git/
-expecting success of 6003.1 'rev-list has correct number of entries': check_output rev-list-has-correct-number-of-entries "git rev-list HEAD | wc -l | tr -d \" \""
-ok 1 - rev-list has correct number of entries
-
-expecting success of 6003.2 'simple topo order': check_output simple-topo-order "git rev-list --topo-order  HEAD"
-ok 2 - simple topo order
-
-expecting success of 6003.3 'simple date order': check_output simple-date-order "git rev-list --date-order  HEAD"
-ok 3 - simple date order
-
-expecting success of 6003.4 'simple author-date order': check_output simple-author-date-order "git rev-list --author-date-order  HEAD"
-ok 4 - simple author-date order
-
-expecting success of 6003.5 'two diamonds topo order (g6)': check_output two-diamonds-topo-order-g6 "git rev-list --topo-order  g4"
-ok 5 - two diamonds topo order (g6)
-
-expecting success of 6003.6 'multiple heads': check_output multiple-heads "git rev-list --topo-order a3 b3 c3"
-ok 6 - multiple heads
-
-expecting success of 6003.7 'multiple heads, prune at a1': check_output multiple-heads-prune-at-a1 "git rev-list --topo-order a3 b3 c3 ^a1"
-ok 7 - multiple heads, prune at a1
-
-expecting success of 6003.8 'multiple heads, prune at l1': check_output multiple-heads-prune-at-l1 "git rev-list --topo-order a3 b3 c3 ^l1"
-ok 8 - multiple heads, prune at l1
-
-expecting success of 6003.9 'cross-epoch, head at l5, prune at l1': check_output cross-epoch-head-at-l5-prune-at-l1 "git rev-list --topo-order l5 ^l1"
-ok 9 - cross-epoch, head at l5, prune at l1
-
-expecting success of 6003.10 'duplicated head arguments': check_output duplicated-head-arguments "git rev-list --topo-order l5 l5 ^l1"
-ok 10 - duplicated head arguments
-
-expecting success of 6003.11 'prune near topo': check_output prune-near-topo "git rev-list --topo-order a4 ^c3"
-ok 11 - prune near topo
-
-expecting success of 6003.12 'head has no parent': check_output head-has-no-parent "git rev-list --topo-order  root"
-ok 12 - head has no parent
-
-expecting success of 6003.13 'two nodes - one head, one base': check_output two-nodes-one-head-one-base "git rev-list --topo-order  l0"
-ok 13 - two nodes - one head, one base
-
-expecting success of 6003.14 'three nodes one head, one internal, one base': check_output three-nodes-one-head-one-internal-one-base "git rev-list --topo-order  l1"
-ok 14 - three nodes one head, one internal, one base
-
-expecting success of 6003.15 'linear prune l2 ^root': check_output linear-prune-l2-root "git rev-list --topo-order  l2 ^root"
-ok 15 - linear prune l2 ^root
-
-expecting success of 6003.16 'linear prune l2 ^l0': check_output linear-prune-l2-l0 "git rev-list --topo-order  l2 ^l0"
-ok 16 - linear prune l2 ^l0
-
-expecting success of 6003.17 'linear prune l2 ^l1': check_output linear-prune-l2-l1 "git rev-list --topo-order  l2 ^l1"
-ok 17 - linear prune l2 ^l1
-
-expecting success of 6003.18 'linear prune l5 ^a4': check_output linear-prune-l5-a4 "git rev-list --topo-order  l5 ^a4"
-ok 18 - linear prune l5 ^a4
-
-expecting success of 6003.19 'linear prune l5 ^l3': check_output linear-prune-l5-l3 "git rev-list --topo-order  l5 ^l3"
-ok 19 - linear prune l5 ^l3
-
-expecting success of 6003.20 'linear prune l5 ^l4': check_output linear-prune-l5-l4 "git rev-list --topo-order  l5 ^l4"
-ok 20 - linear prune l5 ^l4
-
-expecting success of 6003.21 'max-count 10 - topo order': check_output max-count-10-topo-order "git rev-list --topo-order  --max-count=10 l5"
-ok 21 - max-count 10 - topo order
-
-expecting success of 6003.22 'max-count 10 - non topo order': check_output max-count-10-non-topo-order "git rev-list --max-count=10 l5"
-ok 22 - max-count 10 - non topo order
-
-expecting success of 6003.23 '--max-age=c3, no --topo-order': check_output max-age-c3-no-topo-order "git rev-list --max-age=51148811 l5"
-ok 23 - --max-age=c3, no --topo-order
-
-expecting success of 6003.24 '--max-age=c3, --topo-order': check_output max-age-c3-topo-order "git rev-list --topo-order --max-age=51148811 l5"
-ok 24 - --max-age=c3, --topo-order
-
-expecting success of 6003.25 'one specified head reachable from another a4, c3, --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-topo-order "list_duplicates git rev-list --topo-order a4 c3"
-ok 25 - one specified head reachable from another a4, c3, --topo-order
-
-expecting success of 6003.26 'one specified head reachable from another c3, a4, --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-topo-order "list_duplicates git rev-list --topo-order c3 a4"
-ok 26 - one specified head reachable from another c3, a4, --topo-order
-
-expecting success of 6003.27 'one specified head reachable from another a4, c3, no --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-no-topo-order "list_duplicates git rev-list a4 c3"
-ok 27 - one specified head reachable from another a4, c3, no --topo-order
-
-expecting success of 6003.28 'one specified head reachable from another c3, a4, no --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-no-topo-order "list_duplicates git rev-list c3 a4"
-ok 28 - one specified head reachable from another c3, a4, no --topo-order
-
-expecting success of 6003.29 'graph with c3 and a4 parents of head': check_output graph-with-c3-and-a4-parents-of-head "list_duplicates git rev-list m1"
-ok 29 - graph with c3 and a4 parents of head
-
-expecting success of 6003.30 'graph with a4 and c3 parents of head': check_output graph-with-a4-and-c3-parents-of-head "list_duplicates git rev-list m2"
-ok 30 - graph with a4 and c3 parents of head
-
-expecting success of 6003.31 'head ^head --topo-order': git rev-list --topo-order  a3 ^a3
-ok 31 - head ^head --topo-order
-
-expecting success of 6003.32 'head ^head no --topo-order': git rev-list a3 ^a3
-ok 32 - head ^head no --topo-order
-
-expecting success of 6003.33 'simple topo order (l5r1)': check_output simple-topo-order-l5r1 "git rev-list --topo-order  l5r1"
-ok 33 - simple topo order (l5r1)
-
-expecting success of 6003.34 'simple topo order (r1l5)': check_output simple-topo-order-r1l5 "git rev-list --topo-order  r1l5"
-ok 34 - simple topo order (r1l5)
-
-expecting success of 6003.35 'don't print things unreachable from one branch': check_output don-t-print-things-unreachable-from-one-branch "git rev-list a3 ^b3 --topo-order"
-ok 35 - don't print things unreachable from one branch
-
-expecting success of 6003.36 '--topo-order a4 l3': check_output topo-order-a4-l3 "git rev-list --topo-order a4 l3"
-ok 36 - --topo-order a4 l3
-
-# passed all 36 test(s)
-1..36
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6021-rev-list-exclude-hidden.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.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 &&
@@ -393381,25 +396046,26 @@
 	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace3.event &&
 	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"0\" trace3.event
 
-{"event":"child_start","sid":"20260304T080048.926064Z-H8d819085-P000ac560","thread":"main","time":"2026-03-04T08:00:49.065659Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20260304T080048.926064Z-H8d819085-P000ac560/20260304T080049.082316Z-H8d819085-P000ac603","thread":"main","time":"2026-03-04T08:00:49.082885Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20260304T080048.926064Z-H8d819085-P000ac560/20260304T080049.082316Z-H8d819085-P000ac603","thread":"main","time":"2026-03-04T08:00:49.082890Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20260304T080048.926064Z-H8d819085-P000ac560/20260304T080049.082316Z-H8d819085-P000ac603/20260304T080049.130050Z-H8d819085-P000ac630","thread":"main","time":"2026-03-04T08:00:49.130337Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20260304T080048.926064Z-H8d819085-P000ac560/20260304T080049.082316Z-H8d819085-P000ac603/20260304T080049.130050Z-H8d819085-P000ac630/20260304T080049.150142Z-H8d819085-P000ac649","thread":"main","time":"2026-03-04T08:00:49.150479Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"child_start","sid":"20260304T080049.166103Z-H8d819085-P000ac65b","thread":"main","time":"2026-03-04T08:00:49.282740Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20260304T080049.166103Z-H8d819085-P000ac65b","thread":"main","time":"2026-03-04T08:00:49.166683Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20260304T080049.166103Z-H8d819085-P000ac65b/20260304T080049.258433Z-H8d819085-P000ac6bf","thread":"main","time":"2026-03-04T08:00:49.259011Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20260304T080049.166103Z-H8d819085-P000ac65b/20260304T080049.294148Z-H8d819085-P000ac6eb","thread":"main","time":"2026-03-04T08:00:49.294746Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20260304T080049.166103Z-H8d819085-P000ac65b/20260304T080049.294148Z-H8d819085-P000ac6eb","thread":"main","time":"2026-03-04T08:00:49.294755Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"child_start","sid":"20260304T080049.381717Z-H8d819085-P000ac730","thread":"main","time":"2026-03-04T08:00:49.509516Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20260304T080049.381717Z-H8d819085-P000ac730/20260304T080049.526164Z-H8d819085-P000ac7cf","thread":"main","time":"2026-03-04T08:00:49.526776Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20260304T080049.381717Z-H8d819085-P000ac730/20260304T080049.526164Z-H8d819085-P000ac7cf/20260304T080049.562069Z-H8d819085-P000ac7fd","thread":"main","time":"2026-03-04T08:00:49.562384Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20260304T080049.381717Z-H8d819085-P000ac730/20260304T080049.526164Z-H8d819085-P000ac7cf/20260304T080049.562069Z-H8d819085-P000ac7fd/20260304T080049.572611Z-H8d819085-P000ac80a","thread":"main","time":"2026-03-04T08:00:49.572955Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20260304T080049.381717Z-H8d819085-P000ac730","thread":"main","time":"2026-03-04T08:00:49.382345Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20260304T080049.381717Z-H8d819085-P000ac730/20260304T080049.490008Z-H8d819085-P000ac7ae","thread":"main","time":"2026-03-04T08:00:49.490587Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20260304T080049.381717Z-H8d819085-P000ac730/20260304T080049.526164Z-H8d819085-P000ac7cf","thread":"main","time":"2026-03-04T08:00:49.526772Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20260304T080049.381717Z-H8d819085-P000ac730/20260304T080049.526164Z-H8d819085-P000ac7cf/20260304T080049.562069Z-H8d819085-P000ac7fd","thread":"main","time":"2026-03-04T08:00:49.562380Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20260304T080049.381717Z-H8d819085-P000ac730/20260304T080049.526164Z-H8d819085-P000ac7cf/20260304T080049.562069Z-H8d819085-P000ac7fd/20260304T080049.572611Z-H8d819085-P000ac80a","thread":"main","time":"2026-03-04T08:00:49.572951Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"child_start","sid":"20250130T021415.038060Z-H5c947e1c-P001dd779","thread":"main","time":"2025-01-30T02:14:15.160616Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20250130T021415.038060Z-H5c947e1c-P001dd779/20250130T021415.178067Z-H5c947e1c-P001dd7d6","thread":"main","time":"2025-01-30T02:14:15.178579Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20250130T021415.038060Z-H5c947e1c-P001dd779/20250130T021415.178067Z-H5c947e1c-P001dd7d6/20250130T021415.208672Z-H5c947e1c-P001dd7ed","thread":"main","time":"2025-01-30T02:14:15.208993Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20250130T021415.038060Z-H5c947e1c-P001dd779/20250130T021415.178067Z-H5c947e1c-P001dd7d6","thread":"main","time":"2025-01-30T02:14:15.178584Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20250130T021415.038060Z-H5c947e1c-P001dd779/20250130T021415.178067Z-H5c947e1c-P001dd7d6/20250130T021415.208672Z-H5c947e1c-P001dd7ed","thread":"main","time":"2025-01-30T02:14:15.208998Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20250130T021415.038060Z-H5c947e1c-P001dd779/20250130T021415.178067Z-H5c947e1c-P001dd7d6/20250130T021415.208672Z-H5c947e1c-P001dd7ed/20250130T021415.232684Z-H5c947e1c-P001dd7f6","thread":"main","time":"2025-01-30T02:14:15.233035Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"child_start","sid":"20250130T021415.252733Z-H5c947e1c-P001dd807","thread":"main","time":"2025-01-30T02:14:15.361492Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20250130T021415.252733Z-H5c947e1c-P001dd807","thread":"main","time":"2025-01-30T02:14:15.253260Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20250130T021415.252733Z-H5c947e1c-P001dd807/20250130T021415.340588Z-H5c947e1c-P001dd846","thread":"main","time":"2025-01-30T02:14:15.341152Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20250130T021415.252733Z-H5c947e1c-P001dd807/20250130T021415.374162Z-H5c947e1c-P001dd865","thread":"main","time":"2025-01-30T02:14:15.374696Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20250130T021415.252733Z-H5c947e1c-P001dd807/20250130T021415.374162Z-H5c947e1c-P001dd865","thread":"main","time":"2025-01-30T02:14:15.374704Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"child_start","sid":"20250130T021415.458028Z-H5c947e1c-P001dd89d","thread":"main","time":"2025-01-30T02:14:15.592632Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20250130T021415.458028Z-H5c947e1c-P001dd89d/20250130T021415.609419Z-H5c947e1c-P001dd907","thread":"main","time":"2025-01-30T02:14:15.609949Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20250130T021415.458028Z-H5c947e1c-P001dd89d/20250130T021415.609419Z-H5c947e1c-P001dd907/20250130T021415.635809Z-H5c947e1c-P001dd920","thread":"main","time":"2025-01-30T02:14:15.636137Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20250130T021415.458028Z-H5c947e1c-P001dd89d","thread":"main","time":"2025-01-30T02:14:15.458585Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20250130T021415.458028Z-H5c947e1c-P001dd89d/20250130T021415.568611Z-H5c947e1c-P001dd8e9","thread":"main","time":"2025-01-30T02:14:15.569142Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20250130T021415.458028Z-H5c947e1c-P001dd89d/20250130T021415.609419Z-H5c947e1c-P001dd907","thread":"main","time":"2025-01-30T02:14:15.609945Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20250130T021415.458028Z-H5c947e1c-P001dd89d/20250130T021415.609419Z-H5c947e1c-P001dd907/20250130T021415.635809Z-H5c947e1c-P001dd920","thread":"main","time":"2025-01-30T02:14:15.636133Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20250130T021415.458028Z-H5c947e1c-P001dd89d/20250130T021415.609419Z-H5c947e1c-P001dd907/20250130T021415.635809Z-H5c947e1c-P001dd920/20250130T021415.648655Z-H5c947e1c-P001dd927","thread":"main","time":"2025-01-30T02:14:15.648995Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20250130T021415.458028Z-H5c947e1c-P001dd89d/20250130T021415.609419Z-H5c947e1c-P001dd907/20250130T021415.635809Z-H5c947e1c-P001dd920/20250130T021415.664639Z-H5c947e1c-P001dd932","thread":"main","time":"2025-01-30T02:14:15.664962Z","file":"trace2.c","line":437,"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': 
@@ -393458,9 +396124,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 707968 on codethink03-arm64' --promisor --fsck-objects
-trace: start_command: /build/reproducible-path/git-2.47.2/git index-pack --stdin --fix-thin '--keep=fetch-pack 707968 on codethink03-arm64' --promisor --fsck-objects
-trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 707968 on codethink03-arm64' --promisor --fsck-objects
+trace: run_command: git index-pack --stdin --fix-thin '--keep=fetch-pack 1957292 on i-capture-the-hostname' --promisor --fsck-objects
+trace: start_command: /build/reproducible-path/git-2.47.2/git index-pack --stdin --fix-thin '--keep=fetch-pack 1957292 on i-capture-the-hostname' --promisor --fsck-objects
+trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 1957292 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.47.2/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
@@ -394242,7 +396908,7 @@
 	grep "loosen_unused_packed_objects/loosened:0" trace
 
 Cloning into bare repository 'client'...
-08:01:13.255342 builtin/pack-objects.c:4048  | d1 | main                     | data         | r0  |  0.001310 |  0.000407 | pack-objects | ..loosen_unused_packed_objects/loosened:0
+02:14:44.009359 builtin/pack-objects.c:4048  | d1 | main                     | data         | r0  |  0.001326 |  0.000408 | 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': 
@@ -394347,3891 +397013,1270 @@
 1..43
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5516-fetch-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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) &&
+*** t6003-rev-list-topo-order.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6003-rev-list-topo-order/.git/
+expecting success of 6003.1 'rev-list has correct number of entries': check_output rev-list-has-correct-number-of-entries "git rev-list HEAD | wc -l | tr -d \" \""
+ok 1 - rev-list has correct number of entries
 
-	>path2 &&
-	git add path2 &&
-	test_tick &&
-	git commit -a -m second &&
-	the_commit=$(git show-ref -s --verify refs/heads/main)
+expecting success of 6003.2 'simple topo order': check_output simple-topo-order "git rev-list --topo-order  HEAD"
+ok 2 - simple topo order
 
+expecting success of 6003.3 'simple date order': check_output simple-date-order "git rev-list --date-order  HEAD"
+ok 3 - simple date order
 
-[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 6003.4 'simple author-date order': check_output simple-author-date-order "git rev-list --author-date-order  HEAD"
+ok 4 - simple author-date order
 
-expecting success of 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 6003.5 'two diamonds topo order (g6)': check_output two-diamonds-topo-order-g6 "git rev-list --topo-order  g4"
+ok 5 - two diamonds topo order (g6)
 
-expecting success of 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 6003.6 'multiple heads': check_output multiple-heads "git rev-list --topo-order a3 b3 c3"
+ok 6 - multiple heads
 
-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 6003.7 'multiple heads, prune at a1': check_output multiple-heads-prune-at-a1 "git rev-list --topo-order a3 b3 c3 ^a1"
+ok 7 - multiple heads, prune at a1
 
-expecting success of 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 6003.8 'multiple heads, prune at l1': check_output multiple-heads-prune-at-l1 "git rev-list --topo-order a3 b3 c3 ^l1"
+ok 8 - multiple heads, prune at l1
 
-expecting success of 5516.6 'fetch without wildcard': 
-	mk_empty testrepo &&
-	(
-		cd testrepo &&
-		git fetch .. refs/heads/main:refs/remotes/origin/main &&
+expecting success of 6003.9 'cross-epoch, head at l5, prune at l1': check_output cross-epoch-head-at-l5-prune-at-l1 "git rev-list --topo-order l5 ^l1"
+ok 9 - cross-epoch, head at l5, prune at l1
 
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+expecting success of 6003.10 'duplicated head arguments': check_output duplicated-head-arguments "git rev-list --topo-order l5 l5 ^l1"
+ok 10 - duplicated head arguments
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-From ..
- * [new branch]      main       -> origin/main
-ok 6 - fetch without wildcard
+expecting success of 6003.11 'prune near topo': check_output prune-near-topo "git rev-list --topo-order a4 ^c3"
+ok 11 - prune near topo
 
-expecting success of 5516.7 'fetch with wildcard': 
-	mk_empty testrepo &&
-	(
-		cd testrepo &&
-		git config remote.up.url .. &&
-		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
-		git fetch up &&
+expecting success of 6003.12 'head has no parent': check_output head-has-no-parent "git rev-list --topo-order  root"
+ok 12 - head has no parent
 
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+expecting success of 6003.13 'two nodes - one head, one base': check_output two-nodes-one-head-one-base "git rev-list --topo-order  l0"
+ok 13 - two nodes - one head, one base
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-From ..
- * [new branch]      main       -> origin/main
-ok 7 - fetch with wildcard
+expecting success of 6003.14 'three nodes one head, one internal, one base': check_output three-nodes-one-head-one-internal-one-base "git rev-list --topo-order  l1"
+ok 14 - three nodes one head, one internal, one base
 
-expecting success of 5516.8 'fetch with insteadOf': 
-	mk_empty testrepo &&
-	(
-		TRASH=$(pwd)/ &&
-		cd testrepo &&
-		git config "url.$TRASH.insteadOf" trash/ &&
-		git config remote.up.url trash/. &&
-		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
-		git fetch up &&
+expecting success of 6003.15 'linear prune l2 ^root': check_output linear-prune-l2-root "git rev-list --topo-order  l2 ^root"
+ok 15 - linear prune l2 ^root
 
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+expecting success of 6003.16 'linear prune l2 ^l0': check_output linear-prune-l2-l0 "git rev-list --topo-order  l2 ^l0"
+ok 16 - linear prune l2 ^l0
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/.
- * [new branch]      main       -> origin/main
-ok 8 - fetch with insteadOf
+expecting success of 6003.17 'linear prune l2 ^l1': check_output linear-prune-l2-l1 "git rev-list --topo-order  l2 ^l1"
+ok 17 - linear prune l2 ^l1
 
-expecting success of 5516.9 'fetch with pushInsteadOf (should not rewrite)': 
-	mk_empty testrepo &&
-	(
-		TRASH=$(pwd)/ &&
-		cd testrepo &&
-		git config "url.trash/.pushInsteadOf" "$TRASH" &&
-		git config remote.up.url "$TRASH." &&
-		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
-		git fetch up &&
+expecting success of 6003.18 'linear prune l5 ^a4': check_output linear-prune-l5-a4 "git rev-list --topo-order  l5 ^a4"
+ok 18 - linear prune l5 ^a4
 
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+expecting success of 6003.19 'linear prune l5 ^l3': check_output linear-prune-l5-l3 "git rev-list --topo-order  l5 ^l3"
+ok 19 - linear prune l5 ^l3
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/.
- * [new branch]      main       -> origin/main
-ok 9 - fetch with pushInsteadOf (should not rewrite)
+expecting success of 6003.20 'linear prune l5 ^l4': check_output linear-prune-l5-l4 "git rev-list --topo-order  l5 ^l4"
+ok 20 - linear prune l5 ^l4
 
-expecting success of 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
+expecting success of 6003.21 'max-count 10 - topo order': check_output max-count-10-topo-order "git rev-list --topo-order  --max-count=10 l5"
+ok 21 - max-count 10 - topo order
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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":"20260304T075955.092817Z-H8d819085-P0009df32/20260304T075955.126609Z-H8d819085-P0009df5f","thread":"main","time":"2026-03-04T07:59:55.153876Z","file":"builtin/pack-objects.c","line":1429,"repo":1,"t_abs":0.027454,"t_rel":0.000815,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"5"}
-ok 10 - push without negotiation
+expecting success of 6003.22 'max-count 10 - non topo order': check_output max-count-10-non-topo-order "git rev-list --max-count=10 l5"
+ok 22 - max-count 10 - non topo order
 
-expecting success of 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
+expecting success of 6003.23 '--max-age=c3, no --topo-order': check_output max-age-c3-no-topo-order "git rev-list --max-age=51148811 l5"
+ok 23 - --max-age=c3, no --topo-order
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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":"20260304T075955.611812Z-H8d819085-P0009e183/20260304T075955.654068Z-H8d819085-P0009e1ac","thread":"main","time":"2026-03-04T07:59:55.668034Z","file":"fetch-pack.c","line":2228,"repo":1,"t_abs":0.014162,"t_rel":0.013324,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
-{"event":"data","sid":"20260304T075955.611812Z-H8d819085-P0009e183/20260304T075955.675382Z-H8d819085-P0009e1d7","thread":"main","time":"2026-03-04T07:59:55.701534Z","file":"builtin/pack-objects.c","line":1429,"repo":1,"t_abs":0.026331,"t_rel":0.000442,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"2"}
-ok 11 - push with negotiation
+expecting success of 6003.24 '--max-age=c3, --topo-order': check_output max-age-c3-topo-order "git rev-list --topo-order --max-age=51148811 l5"
+ok 24 - --max-age=c3, --topo-order
 
-expecting success of 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
+expecting success of 6003.25 'one specified head reachable from another a4, c3, --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-topo-order "list_duplicates git rev-list --topo-order a4 c3"
+ok 25 - one specified head reachable from another a4, c3, --topo-order
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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":"20260304T075956.122658Z-H8d819085-P0009e3a7/20260304T075956.186097Z-H8d819085-P0009e3f3","thread":"main","time":"2026-03-04T07:59:56.208324Z","file":"builtin/pack-objects.c","line":1429,"repo":1,"t_abs":0.022426,"t_rel":0.000630,"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 6003.26 'one specified head reachable from another c3, a4, --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-topo-order "list_duplicates git rev-list --topo-order c3 a4"
+ok 26 - one specified head reachable from another c3, a4, --topo-order
 
-expecting success of 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
+expecting success of 6003.27 'one specified head reachable from another a4, c3, no --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-no-topo-order "list_duplicates git rev-list a4 c3"
+ok 27 - one specified head reachable from another a4, c3, no --topo-order
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-ok 13 - push deletion with negotiation
+expecting success of 6003.28 'one specified head reachable from another c3, a4, no --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-no-topo-order "list_duplicates git rev-list c3 a4"
+ok 28 - one specified head reachable from another c3, a4, no --topo-order
 
-expecting success of 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
+expecting success of 6003.29 'graph with c3 and a4 parents of head': check_output graph-with-c3-and-a4-parents-of-head "list_duplicates git rev-list m1"
+ok 29 - graph with c3 and a4 parents of head
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/submodule'...
-done.
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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":"20260304T075957.787816Z-H8d819085-P0009eace/20260304T075957.838233Z-H8d819085-P0009eb07","thread":"main","time":"2026-03-04T07:59:57.878289Z","file":"fetch-pack.c","line":2228,"repo":1,"t_abs":0.040268,"t_rel":0.039448,"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 6003.30 'graph with a4 and c3 parents of head': check_output graph-with-a4-and-c3-parents-of-head "list_duplicates git rev-list m2"
+ok 30 - graph with a4 and c3 parents of head
 
-expecting success of 5516.15 'push without wildcard': 
-	mk_empty testrepo &&
+expecting success of 6003.31 'head ^head --topo-order': git rev-list --topo-order  a3 ^a3
+ok 31 - head ^head --topo-order
 
-	git push testrepo refs/heads/main:refs/remotes/origin/main &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+expecting success of 6003.32 'head ^head no --topo-order': git rev-list a3 ^a3
+ok 32 - head ^head no --topo-order
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   main -> origin/main
-ok 15 - push without wildcard
+expecting success of 6003.33 'simple topo order (l5r1)': check_output simple-topo-order-l5r1 "git rev-list --topo-order  l5r1"
+ok 33 - simple topo order (l5r1)
 
-expecting success of 5516.16 'push with wildcard': 
-	mk_empty testrepo &&
+expecting success of 6003.34 'simple topo order (r1l5)': check_output simple-topo-order-r1l5 "git rev-list --topo-order  r1l5"
+ok 34 - simple topo order (r1l5)
 
-	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
-	)
+expecting success of 6003.35 'don't print things unreachable from one branch': check_output don-t-print-things-unreachable-from-one-branch "git rev-list a3 ^b3 --topo-order"
+ok 35 - don't print things unreachable from one branch
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   main -> origin/main
-ok 16 - push with wildcard
+expecting success of 6003.36 '--topo-order a4 l3': check_output topo-order-a4-l3 "git rev-list --topo-order a4 l3"
+ok 36 - --topo-order a4 l3
 
-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
-	)
+# passed all 36 test(s)
+1..36
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6018-rev-list-glob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6018-rev-list-glob/.git/
+expecting success of 6018.1 'setup': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-To /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo
- * [new reference]   main -> origin/main
-ok 17 - push with insteadOf
+	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 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
-	)
+[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.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-To /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo
- * [new reference]   main -> origin/main
-ok 18 - push with pushInsteadOf
+expecting success of 6018.2 'rev-parse --glob=refs/heads/subspace/*': 
 
-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
-	)
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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': 
+ok 2 - rev-parse --glob=refs/heads/subspace/*
 
-	mk_test testrepo heads/main &&
-	git push testrepo : &&
-	check_push_result testrepo $the_commit heads/main
+expecting success of 6018.3 'rev-parse --glob=heads/subspace/*': 
 
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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': 
+ok 3 - rev-parse --glob=heads/subspace/*
 
-	mk_test testrepo heads/main &&
-	git push testrepo : &&
-	check_push_result testrepo $the_commit heads/main
+expecting success of 6018.4 'rev-parse --glob=refs/heads/subspace/': 
 
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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': 
+ok 4 - rev-parse --glob=refs/heads/subspace/
 
-	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 6018.5 'rev-parse --glob=heads/subspace/': 
 
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+ok 5 - rev-parse --glob=heads/subspace/
 
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
+expecting success of 6018.6 'rev-parse --glob=heads/subspace': 
 
-warning: unable to rmdir 'submodule': Directory not empty
-HEAD is now at 9ad36e1 second
-ok 22 - failed (non-fast-forward) push with matching heads
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
 
-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
+ok 6 - rev-parse --glob=heads/subspace
 
+checking known breakage of 6018.7 'rev-parse accepts --glob as detached option': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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-03-04 08:00:02.083352315 +0000
-+++ actual	2026-03-04 08:00:02.099352315 +0000
-@@ -1 +1 @@
--9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
-+935970ff2fd2257ae1a73d15652c0ac6f837cf17
-HEAD is now at 9ad36e1 second
-ok 23 - push --force with matching heads
+	compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
 
-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
+fatal: ambiguous argument 'heads/subspace': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+not ok 7 - rev-parse accepts --glob as detached option # TODO known breakage
 
+checking known breakage of 6018.8 'rev-parse is not confused by option-like glob': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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-03-04 08:00:02.875352315 +0000
-+++ actual	2026-03-04 08:00:02.891352315 +0000
-@@ -1 +1 @@
--9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
-+935970ff2fd2257ae1a73d15652c0ac6f837cf17
-HEAD is now at 9ad36e1 second
-ok 24 - push with matching heads and forced update
+	compare rev-parse "main" "--glob --symbolic main"
 
-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
+--- expected	2025-01-30 02:14:41.093156758 +0000
++++ actual	2025-01-30 02:14:41.113156878 +0000
+@@ -1 +1,2 @@
+-88fe3d283ae350159b6dcc1f45481c8fa40ad3d8
++--glob
++main
+not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
 
+expecting success of 6018.9 'rev-parse --branches=subspace/*': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
 
-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
+ok 9 - rev-parse --branches=subspace/*
 
+expecting success of 6018.10 'rev-parse --branches=subspace/': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
 
-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
+ok 10 - rev-parse --branches=subspace/
 
+expecting success of 6018.11 'rev-parse --branches=subspace': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
 
-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
+ok 11 - rev-parse --branches=subspace
 
+expecting success of 6018.12 'rev-parse --glob=heads/subspace/* --glob=heads/other/*': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+	compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
 
-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
+ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
 
+expecting success of 6018.13 'rev-parse --glob=heads/someref/* main': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+	compare rev-parse "main" "--glob=heads/someref/* main"
 
-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
+ok 13 - rev-parse --glob=heads/someref/* main
 
+expecting success of 6018.14 'rev-parse --glob=heads/*': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
 
-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.47.2/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
+ok 14 - rev-parse --glob=heads/*
 
-expecting success of 5516.32 'push with colon-less refspec (1)': 
+expecting success of 6018.15 'rev-parse --tags=foo': 
 
-	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
+	compare rev-parse "foo/bar" "--tags=foo"
 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+ok 15 - rev-parse --tags=foo
 
-expecting success of 5516.33 'push with colon-less refspec (2)': 
+expecting success of 6018.16 'rev-parse --remotes=foo': 
 
-	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
+	compare rev-parse "foo/baz" "--remotes=foo"
 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+ok 16 - rev-parse --remotes=foo
 
-expecting success of 5516.34 'push with colon-less refspec (3)': 
+expecting success of 6018.17 'rev-parse --exclude with --branches': 
+	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
 
-	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 )
+ok 17 - rev-parse --exclude with --branches
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6018.18 'rev-parse --exclude with --all': 
+	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
 
-expecting success of 5516.35 'push with colon-less refspec (4)': 
+ok 18 - rev-parse --exclude with --all
 
-	mk_test testrepo &&
-	if git show-ref --verify -q refs/heads/frotz
-	then
-		git branch -D frotz
-	fi &&
-	git tag -f frotz &&
-	git push testrepo frotz &&
-	check_push_result testrepo $the_commit tags/frotz &&
-	test 1 = $( cd testrepo && git show-ref | wc -l )
+expecting success of 6018.19 'rev-parse accumulates multiple --exclude': 
+	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 
+ok 19 - rev-parse accumulates multiple --exclude
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6018.20 'rev-parse --branches clears --exclude': 
+	compare rev-parse "--exclude=* --branches --branches" "--branches"
 
-expecting success of 5516.36 'push head with non-existent, incomplete dest': 
+ok 20 - rev-parse --branches clears --exclude
 
-	mk_test testrepo &&
-	git push testrepo main:branch &&
-	check_push_result testrepo $the_commit heads/branch
+expecting success of 6018.21 'rev-parse --tags clears --exclude': 
+	compare rev-parse "--exclude=* --tags --tags" "--tags"
 
+ok 21 - rev-parse --tags clears --exclude
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6018.22 'rev-parse --all clears --exclude': 
+	compare rev-parse "--exclude=* --all --all" "--all"
 
-expecting success of 5516.37 'push tag with non-existent, incomplete dest': 
+ok 22 - rev-parse --all clears --exclude
 
-	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 6018.23 'rev-parse --exclude=glob with --branches=glob': 
+	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 
+ok 23 - rev-parse --exclude=glob with --branches=glob
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6018.24 'rev-parse --exclude=glob with --tags=glob': 
+	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 
-expecting success of 5516.38 'push sha1 with non-existent, incomplete dest': 
+ok 24 - rev-parse --exclude=glob with --tags=glob
 
-	mk_test testrepo &&
-	test_must_fail git push testrepo $(git rev-parse main):foo
+expecting success of 6018.25 'rev-parse --exclude=glob with --remotes=glob': 
+	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
 
+ok 25 - rev-parse --exclude=glob with --remotes=glob
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6018.26 'rev-parse --exclude=ref with --branches=glob': 
+	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 
-- 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.
+ok 26 - rev-parse --exclude=ref with --branches=glob
 
-Neither worked, so we gave up. You must fully qualify the ref.
-hint: The <src> part of the refspec is a commit object.
-hint: Did you mean to create a new branch by pushing to
-hint: '9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f:refs/heads/foo'?
-error: failed to push some refs to 'testrepo'
-ok 38 - push sha1 with non-existent, incomplete dest
+expecting success of 6018.27 'rev-parse --exclude=ref with --tags=glob': 
+	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 
-expecting success of 5516.39 'push ref expression with non-existent, incomplete dest': 
+ok 27 - rev-parse --exclude=ref with --tags=glob
 
-	mk_test testrepo &&
-	test_must_fail git push testrepo main^:branch
+expecting success of 6018.28 'rev-parse --exclude=ref with --remotes=glob': 
+	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 
+ok 28 - rev-parse --exclude=ref with --remotes=glob
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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
 
-- 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 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
 
-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 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.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 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"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 32 - rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref
 
-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 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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+ok 33 - rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref
 
-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 &&
+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
 
-		# Without force rewinding should fail
-		git reset --hard $head^ &&
-		test_must_fail git push testrepo $head &&
-		check_push_result testrepo $the_commit heads/local &&
+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
 
-		# 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.47.2/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 6018.36 'rev-parse --exclude-hidden=fetch fails with --tags': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 36 - rev-parse --exclude-hidden=fetch fails with --tags
 
-expecting success of 5516.43 'push HEAD with non-existent, incomplete dest': 
-		mk_test testrepo &&
-		git checkout main &&
-		git push testrepo $head:branch &&
-		check_push_result testrepo $the_commit heads/branch
+expecting success of 6018.37 'rev-parse --exclude-hidden=fetch fails with --tags=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 37 - rev-parse --exclude-hidden=fetch fails with --tags=pattern
+
+expecting success of 6018.38 'rev-parse --exclude-hidden=fetch fails with --remotes': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 38 - rev-parse --exclude-hidden=fetch fails with --remotes
+
+expecting success of 6018.39 'rev-parse --exclude-hidden=fetch fails with --remotes=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 39 - rev-parse --exclude-hidden=fetch fails with --remotes=pattern
 
+expecting success of 6018.40 'rev-parse --exclude-hidden=receive with --all': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 40 - rev-parse --exclude-hidden=receive with --all
 
-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 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"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 41 - rev-parse --exclude-hidden=receive with --all
 
-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 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.47.2/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 42 - rev-parse --exclude-hidden=receive with --glob
 
-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 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.47.2/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
+ok 43 - rev-parse --exclude-hidden=receive can be passed once per pseudo-ref
 
-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 &&
+expecting success of 6018.44 'rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 44 - rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref
 
-		# Without force rewinding should fail
-		git reset --hard $head^ &&
-		test_must_fail git push testrepo $head &&
-		check_push_result testrepo $the_commit heads/local &&
+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
 
-		# 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.47.2/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 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.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 6018.47 'rev-parse --exclude-hidden=receive fails with --tags': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 47 - rev-parse --exclude-hidden=receive fails with --tags
+
+expecting success of 6018.48 'rev-parse --exclude-hidden=receive fails with --tags=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 48 - rev-parse --exclude-hidden=receive fails with --tags=pattern
+
+expecting success of 6018.49 'rev-parse --exclude-hidden=receive fails with --remotes': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 49 - rev-parse --exclude-hidden=receive fails with --remotes
+
+expecting success of 6018.50 'rev-parse --exclude-hidden=receive fails with --remotes=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 50 - rev-parse --exclude-hidden=receive fails with --remotes=pattern
 
+expecting success of 6018.51 'rev-parse --exclude-hidden=uploadpack with --all': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 51 - rev-parse --exclude-hidden=uploadpack with --all
 
-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 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"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 52 - rev-parse --exclude-hidden=uploadpack with --all
 
-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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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 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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-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 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.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 6018.62 'rev-list --exclude=glob with --branches=glob': 
+	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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
+ok 62 - rev-list --exclude=glob with --branches=glob
 
-expecting success of 5516.52 'push with config remote.*.pushurl': 
+expecting success of 6018.63 'rev-list --exclude=glob with --tags=glob': 
+	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 
-	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
+ok 63 - rev-list --exclude=glob with --tags=glob
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6018.64 'rev-list --exclude=glob with --remotes=glob': 
+	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
 
-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
+ok 64 - rev-list --exclude=glob with --remotes=glob
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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 6018.65 'rev-list --exclude=ref with --branches=glob': 
+	compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 
-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
+ok 65 - rev-list --exclude=ref with --branches=glob
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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 6018.66 'rev-list --exclude=ref with --tags=glob': 
+	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 
-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
+ok 66 - rev-list --exclude=ref with --tags=glob
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6018.67 'rev-list --exclude=ref with --remotes=glob': 
+	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 
-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
+ok 67 - rev-list --exclude=ref with --remotes=glob
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 6018.68 'rev-list --glob=refs/heads/subspace/*': 
 
-expecting success of 5516.57 'push with dry-run': 
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
 
-	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.47.2/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
+ok 68 - rev-list --glob=refs/heads/subspace/*
 
-expecting success of 5516.58 'push updates local refs': 
+expecting success of 6018.69 'rev-list --glob refs/heads/subspace/*': 
 
-	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)
-	)
+	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 58 - push updates local refs
+ok 69 - rev-list --glob refs/heads/subspace/*
 
-expecting success of 5516.59 'push updates up-to-date local refs': 
+expecting success of 6018.70 'rev-list not confused by option-like --glob arg': 
 
-	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)
-	)
+	compare rev-list "main" "--glob -0 main"
 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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
+ok 70 - rev-list not confused by option-like --glob arg
 
-expecting success of 5516.60 'push preserves up-to-date packed refs': 
+expecting success of 6018.71 'rev-list --glob=heads/subspace/*': 
 
-	mk_test testrepo heads/main &&
-	mk_child testrepo child &&
-	(
-		cd child &&
-		git push &&
-		! test -f .git/refs/remotes/origin/main
-	)
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+ok 71 - rev-list --glob=heads/subspace/*
 
-expecting success of 5516.61 'push does not update local refs on failure': 
+expecting success of 6018.72 'rev-list --glob=refs/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)
-	)
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/t/trash directory.t5516-fetch-push/testrepo'
-ok 61 - push does not update local refs on failure
+ok 72 - rev-list --glob=refs/heads/subspace/
 
-expecting success of 5516.62 'allow deleting an invalid remote ref': 
+expecting success of 6018.73 'rev-list --glob=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)
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+ok 73 - rev-list --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
+expecting success of 6018.74 'rev-list --glob=heads/subspace': 
 
-		cat >update.expect <<-EOF &&
-		refs/heads/main $orgmain $newmain
-		refs/heads/next $orgnext $newnext
-		EOF
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
 
-		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
+ok 74 - rev-list --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
-	)
+expecting success of 6018.75 'rev-list --branches=subspace/*': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
 
-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
+ok 75 - rev-list --branches=subspace/*
 
-		cat >post-receive.expect <<-EOF &&
-		$orig $ZERO_OID refs/heads/branch
-		EOF
+expecting success of 6018.76 'rev-list --branches=subspace/': 
 
-		cat >post-update.expect <<-EOF &&
-		refs/heads/branch
-		EOF
+	compare rev-list "subspace/one subspace/two" "--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
-	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+ok 76 - rev-list --branches=subspace/
 
-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
+expecting success of 6018.77 'rev-list --branches=subspace': 
 
-		cat >update.expect <<-EOF &&
-		refs/heads/main $orgmain $newmain
-		refs/heads/nonexistent $ZERO_OID $ZERO_OID
-		EOF
+	compare rev-list "subspace/one subspace/two" "--branches=subspace"
 
-		cat >post-receive.expect <<-EOF &&
-		$orgmain $newmain refs/heads/main
-		EOF
 
-		cat >post-update.expect <<-EOF &&
-		refs/heads/main
-		EOF
+ok 77 - rev-list --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
-	)
+expecting success of 6018.78 'rev-list --branches': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 a non-existent ref        
-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
+	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
 
-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
+ok 78 - rev-list --branches
 
-		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
-	)
+expecting success of 6018.79 'rev-list --glob=heads/someref/* main': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	compare rev-list "main" "--glob=heads/someref/* main"
 
-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/main $orgmain $newmain
-		refs/heads/next $orgnext $newnext
-		refs/heads/seen $orgseen $newseen
-		refs/heads/nonexistent $ZERO_OID $ZERO_OID
-		EOF
+ok 79 - rev-list --glob=heads/someref/* main
 
-		cat >post-receive.expect <<-EOF &&
-		$orgmain $newmain refs/heads/main
-		$orgnext $newnext refs/heads/next
-		$orgseen $newseen refs/heads/seen
-		EOF
+expecting success of 6018.80 'rev-list --glob=heads/subspace/* --glob=heads/other/*': 
 
-		cat >post-update.expect <<-EOF &&
-		refs/heads/main
-		refs/heads/next
-		refs/heads/seen
-		EOF
+	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
 
-		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.47.2/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: updating the current branch        
-remote: warning: deleting a non-existent ref        
-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
+ok 80 - rev-list --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)
+expecting success of 6018.81 'rev-list --glob=heads/*': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
 
-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.47.2/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
+ok 81 - rev-list --glob=heads/*
 
-expecting success of 5516.70 'push --delete without args aborts': 
-	mk_test testrepo heads/main &&
-	test_must_fail git push testrepo --delete
+expecting success of 6018.82 'rev-list --tags=foo': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	compare rev-list "foo/bar" "--tags=foo"
 
-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.47.2/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
+ok 82 - rev-list --tags=foo
 
-expecting success of 5516.72 'push --delete refuses empty string': 
-	mk_test testrepo heads/master &&
-	test_must_fail git push testrepo --delete ""
+expecting success of 6018.83 'rev-list --tags': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
 
-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.47.2/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
+ok 83 - rev-list --tags
 
-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
+expecting success of 6018.84 'rev-list --remotes=foo': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	compare rev-list "foo/baz" "--remotes=foo"
 
-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.47.2/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
+ok 84 - rev-list --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
+expecting success of 6018.85 'rev-list --exclude with --branches': 
+	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+ok 85 - rev-list --exclude with --branches
 
-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
+expecting success of 6018.86 'rev-list --exclude with --all': 
+	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+ok 86 - rev-list --exclude with --all
 
-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
+expecting success of 6018.87 'rev-list accumulates multiple --exclude': 
+	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-Switched to branch 'second'
-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 87 - rev-list accumulates multiple --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.88 'rev-list should succeed with empty output on empty stdin': 
+	git rev-list --stdin </dev/null >actual &&
+	test_must_be_empty actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-From ..
- * [new branch]      second     -> branch2
-Already on 'main'
-ok 79 - fetch with branches containing #
+ok 88 - rev-list should succeed with empty output on empty stdin
 
-expecting success of 5516.80 'push with branches': 
-	mk_empty testrepo &&
-	git checkout second &&
+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
 
-	test_when_finished "rm -rf .git/branches" &&
-	mkdir .git/branches &&
-	echo "testrepo" > .git/branches/branch1 &&
+ok 89 - rev-list should succeed with empty output with all refs excluded
 
-	git push branch1 &&
+expecting success of 6018.90 'rev-list should succeed with empty output with empty --all': 
 	(
-		cd testrepo &&
-		echo "$the_first_commit commit	refs/heads/main" >expect &&
-		git for-each-ref refs/heads >actual &&
-		test_cmp expect actual
+		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.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-Switched to branch 'second'
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      HEAD -> main
-ok 80 - push with branches
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.81 'push with branches containing #': 
-	mk_empty testrepo &&
+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
 
-	test_when_finished "rm -rf .git/branches" &&
-	mkdir .git/branches &&
-	echo "testrepo#branch3" > .git/branches/branch2 &&
+ok 91 - rev-list should succeed with empty output with empty 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.92 'rev-list should succeed with empty output when ignoring missing': 
+	git rev-list --ignore-missing $ZERO_OID >actual &&
+	test_must_be_empty actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      HEAD -> branch3
-Switched to branch 'main'
-ok 81 - push with branches containing #
+ok 92 - rev-list should succeed with empty output when ignoring missing
 
-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.93 'shortlog accepts --glob/--tags/--remotes': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+	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.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.47.2/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)
+ok 93 - shortlog accepts --glob/--tags/--remotes
 
-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 &&
+checking known breakage of 6018.94 'shortlog accepts --glob as detached option': 
 
-			# 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/*' &&
+	compare shortlog \
+	  "main other/three someref subspace-x subspace/one subspace/two" \
+	  "--glob heads/*"
 
-			# 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/*' &&
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
 
-			# 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.47.2/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
+    -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 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 &&
+not ok 94 - shortlog accepts --glob as detached option # TODO known breakage
 
-			# 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/*' &&
+checking known breakage of 6018.95 'shortlog --glob is not confused by option-like argument': 
 
-			# Clobbering with + in refspec does not need --force
-			git tag -f testTag HEAD~ &&
-			git push ../child2 '+refs/tags/*:refs/tags/*' &&
+	compare shortlog main "--glob -e main"
 
-			# 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.47.2/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
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
 
-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.47.2/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.47.2/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.47.2/t/trash directory.t5516-fetch-push/testrepo
- ! [rejected]        testTag    -> testTag  (would clobber existing tag)
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo
- t [tag update]      testTag    -> testTag
-ok 86 - fetch will not clobber an existing lightweight tag without --force
+    -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 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.47.2/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.47.2/t/trash directory.t5516-fetch-push/testrepo
- * [new tag]         testTag    -> testTag
-[main 9770895] file1
+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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6100-rev-list-in-order.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6100-rev-list-in-order/.git/
+expecting success of 6100.1 'setup a commit history with trees, blobs': 
+	for x in one two three four
+	do
+		echo $x >$x &&
+		git add $x &&
+		git commit -m "add file $x" ||
+		return 1
+	done &&
+	for x in four three
+	do
+		git rm $x &&
+		git commit -m "remove $x" ||
+		return 1
+	done
+
+[master (root-commit) 852067c] add file one
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename path1 => file1 (100%)
-Updated tag 'testTag' (was b9c09d6)
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo
- ! [rejected]        testTag    -> testTag  (would clobber existing tag)
-From /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo
- t [tag update]      testTag    -> testTag
-ok 87 - fetch will not clobber an existing annotated tag without --force
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+[master 090ebfd] add file two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two
+[master 2101c65] add file three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three
+[master 0846a08] add file four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four
+rm 'four'
+[master 37698d1] remove four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 four
+rm 'three'
+[master 0ade3bd] remove three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 three
+ok 1 - setup a commit history with trees, blobs
 
-expecting success of 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 6100.2 'rev-list --in-commit-order': 
+	git rev-list --in-commit-order --objects HEAD >actual.raw &&
+	cut -d" " -f1 >actual <actual.raw &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-ok 88 - push --porcelain
+	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
+		HEAD^{commit}
+		HEAD^{tree}
+		HEAD^{tree}:one
+		HEAD^{tree}:two
+		HEAD~1^{commit}
+		HEAD~1^{tree}
+		HEAD~1^{tree}:three
+		HEAD~2^{commit}
+		HEAD~2^{tree}
+		HEAD~2^{tree}:four
+		HEAD~3^{commit}
+		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
+		HEAD~4^{commit}
+		# HEAD~4^{tree} skipped, same as HEAD^{tree}
+		HEAD~5^{commit}
+		HEAD~5^{tree}
+	EOF
+	grep -v "#" >expect <expect.raw &&
 
-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
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.
+ok 2 - rev-list --in-commit-order
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 89 - push --porcelain bad url
+expecting success of 6100.3 'rev-list lists blobs and trees after commits': 
+	git rev-list --objects HEAD >actual.raw &&
+	cut -d" " -f1 >actual <actual.raw &&
 
-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) &&
+	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
+		HEAD^{commit}
+		HEAD~1^{commit}
+		HEAD~2^{commit}
+		HEAD~3^{commit}
+		HEAD~4^{commit}
+		HEAD~5^{commit}
+		HEAD^{tree}
+		HEAD^{tree}:one
+		HEAD^{tree}:two
+		HEAD~1^{tree}
+		HEAD~1^{tree}:three
+		HEAD~2^{tree}
+		HEAD~2^{tree}:four
+		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
+		# HEAD~4^{tree} skipped, same as HEAD^{tree}
+		HEAD~5^{tree}
+	EOF
+	grep -v "#" >expect <expect.raw &&
 
-	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_cmp expect actual
 
-	test_must_fail git push >.git/bar --porcelain  testrepo refs/heads/main:refs/heads/main &&
-	test_cmp .git/foo .git/bar
+ok 3 - rev-list lists blobs and trees after commits
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6110-rev-list-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6110-rev-list-sparse/.git/
+expecting success of 6110.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	test_commit C &&
+	git checkout -b side HEAD^ &&
+	test_commit D &&
+	test_commit E &&
+	git merge main
 
-expecting success of 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) &&
+[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
 
-	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 6110.2 'rev-list --first-parent --boundary': 
+	git rev-list --first-parent --boundary HEAD^..
 
-	test_must_fail git push >.git/bar --porcelain  --dry-run testrepo refs/heads/main^:refs/heads/main &&
-	test_cmp .git/foo .git/bar
+e8ee201b06a2eb86519e2b246f4c082e43aa5e90
+-35a8500a6c116c9ddf35e140fa3277a7fe0b4196
+-dc25130fe5e9f5d4a18aa4e0dff022e489b22c75
+ok 2 - rev-list --first-parent --boundary
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6040-tracking-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6040-tracking-info/.git/
+expecting success of 6040.1 'setup': 
+	advance a &&
+	advance b &&
+	advance c &&
+	git clone . test &&
+	(
+		cd test &&
+		git checkout -b b1 origin &&
+		git reset --hard HEAD^ &&
+		advance d &&
+		git checkout -b b2 origin &&
+		git reset --hard b1 &&
+		git checkout -b b3 origin &&
+		git reset --hard HEAD^ &&
+		git checkout -b b4 origin &&
+		advance e &&
+		advance f &&
+		git checkout -b brokenbase origin &&
+		git checkout -b b5 --track brokenbase &&
+		advance g &&
+		git branch -d brokenbase &&
+		git checkout -b b6 origin
+	) &&
+	git checkout -b follower --track main &&
+	advance h
 
-expecting success of 5516.92 'push --prune': 
-	mk_test testrepo heads/main heads/second heads/foo heads/bar &&
-	git push --prune testrepo : &&
-	check_push_result testrepo $the_commit heads/main &&
-	check_push_result testrepo $the_first_commit heads/second &&
-	! check_push_result testrepo $the_first_commit heads/foo heads/bar
+[main (root-commit) cc33353] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[main 7e1cf2d] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+[main ac11e55] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c
+Cloning into 'test'...
+done.
+Switched to a new branch 'b1'
+branch 'b1' set up to track 'origin/main'.
+HEAD is now at 7e1cf2d b
+[b1 afc0d66] d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d
+Switched to a new branch 'b2'
+branch 'b2' set up to track 'origin/main'.
+HEAD is now at afc0d66 d
+Switched to a new branch 'b3'
+branch 'b3' set up to track 'origin/main'.
+HEAD is now at 7e1cf2d b
+Switched to a new branch 'b4'
+branch 'b4' set up to track 'origin/main'.
+[b4 ec9b031] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e
+[b4 59ecd1d] f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f
+Switched to a new branch 'brokenbase'
+branch 'brokenbase' set up to track 'origin/main'.
+Switched to a new branch 'b5'
+branch 'b5' set up to track 'brokenbase'.
+[b5 d8d0202] g
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g
+Deleted branch brokenbase (was ac11e55).
+Switched to a new branch 'b6'
+branch 'b6' set up to track 'origin/main'.
+Switched to a new branch 'follower'
+branch 'follower' set up to track 'main'.
+[follower 21abfbd] h
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 h
+ok 1 - setup
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 -> second
-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 6040.2 'branch -v': 
+	(
+		cd test &&
+		git branch -v
+	) |
+	sed -n -e "$t6040_script" >actual &&
+	test_cmp expect actual
 
-expecting success of 5516.93 'push --prune refspec': 
-	mk_test testrepo tmp/main tmp/second 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/second &&
-	! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
+ok 2 - branch -v
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/tmp/main
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> refs/tmp/second
-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]   t/main -> refs/tmp/t/main
-notice: HEAD points to an unborn branch (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 6040.3 'branch -vv': 
+	(
+		cd test &&
+		git branch -vv
+	) |
+	sed -n -e "$t6040_script" >actual &&
+	test_cmp expect actual
 
-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
-		) &&
+ok 3 - branch -vv
 
-		# push to unhidden ref succeeds normally
-		git push testrepo main:refs/heads/main &&
-		check_push_result testrepo $the_commit heads/main &&
+expecting success of 6040.4 'checkout (diverged from upstream)': 
+	(
+		cd test && git checkout b1
+	) >actual &&
+	test_grep "have 1 and 1 different" actual
 
-		# 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 &&
+Switched to branch 'b1'
+and have 1 and 1 different commits each, respectively.
+ok 4 - checkout (diverged from upstream)
 
-		# 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 6040.5 'checkout with local tracked branch': 
+	git checkout main &&
+	git checkout follower >actual &&
+	test_grep "is ahead of" actual
 
-		# 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.47.2/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
+Switched to branch 'main'
+Switched to branch 'follower'
+Your branch is ahead of 'main' by 1 commit.
+ok 5 - checkout with local tracked branch
 
-expecting success of 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
-		) &&
+expecting success of 6040.6 'checkout (upstream is gone)': 
+	(
+		cd test &&
+		git checkout b5
+	) >actual &&
+	test_grep "is based on .*, but the upstream is gone." actual
 
-		# push to unhidden ref succeeds normally
-		git push testrepo main:refs/heads/main &&
-		check_push_result testrepo $the_commit heads/main &&
+Switched to branch 'b5'
+Your branch is based on 'brokenbase', but the upstream is gone.
+ok 6 - checkout (upstream is gone)
 
-		# 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 6040.7 'checkout (up-to-date with upstream)': 
+	(
+		cd test && git checkout b6
+	) >actual &&
+	test_grep "Your branch is up to date with .origin/main" actual
 
-		# 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 &&
+Switched to branch 'b6'
+Your branch is up to date with 'origin/main'.
+ok 7 - checkout (up-to-date with upstream)
 
-		# 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.47.2/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 6040.8 'status (diverged from upstream)': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_grep "have 1 and 1 different" actual
 
-expecting success of 5516.96 'fetch exact SHA1': 
-	mk_test testrepo heads/main hidden/one &&
-	git push testrepo main:refs/hidden/one &&
+Switched to branch 'b1'
+and have 1 and 1 different commits each, respectively.
+ok 8 - status (diverged from upstream)
+
+expecting success of 6040.9 'status (upstream is gone)': 
 	(
-		cd testrepo &&
-		git config transfer.hiderefs refs/hidden
-	) &&
-	check_push_result testrepo $the_commit hidden/one &&
+		cd test &&
+		git checkout b5 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_grep "is based on .*, but the upstream is gone." actual
 
-	mk_child testrepo child &&
+Switched to branch 'b5'
+Your branch is based on 'brokenbase', but the upstream is gone.
+ok 9 - status (upstream is gone)
+
+expecting success of 6040.10 'status (up-to-date with upstream)': 
 	(
-		cd child &&
+		cd test &&
+		git checkout b6 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_grep "Your branch is up to date with .origin/main" actual
 
-		# make sure $the_commit does not exist here
-		git repack -a -d &&
-		git prune &&
-		test_must_fail git cat-file -t $the_commit &&
+Switched to branch 'b6'
+Your branch is up to date with 'origin/main'.
+ok 10 - status (up-to-date with upstream)
 
-		# Some protocol versions (e.g. 2) support fetching
-		# unadvertised objects, so restrict this test to v0.
+expecting success of 6040.11 'status -s -b (diverged from upstream)': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_cmp expect actual
 
-		# 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 &&
+Switched to branch 'b1'
+ok 11 - status -s -b (diverged from upstream)
 
-		# the server side can allow it to succeed
-		(
-			cd ../testrepo &&
-			git config uploadpack.allowtipsha1inwant true
-		) &&
+expecting success of 6040.12 'status -s -b --no-ahead-behind (diverged from upstream)': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status -s -b --no-ahead-behind | head -1
+	) >actual &&
+	test_cmp expect actual
 
-		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
-	)
+Already on 'b1'
+ok 12 - status -s -b --no-ahead-behind (diverged from upstream)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 SHA1
+expecting success of 6040.13 'status.aheadbehind=false status -s -b (diverged from upstream)': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git -c status.aheadbehind=false status -s -b | head -1
+	) >actual &&
+	test_cmp expect actual
 
-expecting success of 5516.97 'fetch exact SHA1 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 &&
+Already on 'b1'
+ok 13 - status.aheadbehind=false status -s -b (diverged from upstream)
 
-	mk_child testrepo child &&
-	git -C child config protocol.version 2 &&
+expecting success of 6040.14 'status --long --branch': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b | head -3
+	) >actual &&
+	test_cmp expect actual
 
-	# 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 &&
+Already on 'b1'
+ok 14 - status --long --branch
 
-	# fetching the hidden object succeeds by default
-	# NEEDSWORK: should this match the v0 behavior instead?
-	git -C child fetch -v ../testrepo $the_commit:refs/heads/copy
+expecting success of 6040.15 'status --long --branch': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git -c status.aheadbehind=true status --long -b | head -3
+	) >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 SHA1 in protocol v2
+Already on 'b1'
+ok 15 - status --long --branch
 
-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.47.2/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.47.2/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
+expecting success of 6040.16 'status --long --branch --no-ahead-behind': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b --no-ahead-behind | head -2
+	) >actual &&
+	test_cmp expect actual
 
-foo
-ok 98 - shallow fetch reachable SHA1 (but not a ref), allowtipsha1inwant=true
+Already on 'b1'
+ok 16 - status --long --branch --no-ahead-behind
 
-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.47.2/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
+expecting success of 6040.17 'status.aheadbehind=false status --long --branch': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git -c status.aheadbehind=false status --long -b | head -2
+	) >actual &&
+	test_cmp expect actual
 
-foo
-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-parent 0722cdcaa8018927dc8055be38d3931723602b78
-author A U Thor <author@example.com> 1112912353 -0700
-committer C O Mitter <committer@example.com> 1112912353 -0700
+Already on 'b1'
+ok 17 - status.aheadbehind=false status --long --branch
 
-xyz
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+expecting success of 6040.18 'status -s -b (upstream is gone)': 
+	(
+		cd test &&
+		git checkout b5 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_cmp expect actual
 
-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
+Switched to branch 'b5'
+ok 18 - status -s -b (upstream is gone)
 
-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 6040.19 'status -s -b (up-to-date with upstream)': 
+	(
+		cd test &&
+		git checkout b6 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_cmp expect actual
 
-expecting success of 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.47.2/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.47.2/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
+Switched to branch 'b6'
+ok 19 - status -s -b (up-to-date with upstream)
 
-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.47.2/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.47.2/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
-
-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 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 |
-		sort -k 3 >../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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
-From ../testrepo
- * branch            main       -> FETCH_HEAD
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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.47.2/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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
-
-		git config branch.main.merge refs/heads/trunk &&
-		git config branch.main.remote dst &&
-
-		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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t5516-fetch-push/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-
-[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.47.2/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 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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
-
-	# 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 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.47.2/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 &&
-
-		# 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 &&
-
-		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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
-
-	# 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)
-	) &&
-
-	# 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)
-	) &&
-
-	# 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)"
-	) &&
-
-	# (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)"
-	) &&
-
-	# Introduce a new file in the update
-	test_commit fifth path3 &&
-
-	# (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)"
-	) &&
-
-	# (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
-	) &&
-
-	# (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.47.2/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.47.2/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"
-
-	git update-index -q --refresh &&
-	git read-tree -u -m HEAD "$1" || {
-		status=$?
-		echo >&2 read-tree failed
-		exit $status
-	}
-	EOF
-
-	# 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)
-	) &&
-
-	# 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
-	) &&
-
-	# 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)
-	) &&
-
-	# 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"
-
-	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
-
-	git push void main &&
-	(
-		cd void &&
-		git diff --quiet &&
-		git diff --cached --quiet &&
-		test $(git -C .. rev-parse HEAD) = $(git rev-parse HEAD)
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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
-
-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
-
-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.47.2/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.47.2/t/trash directory.t5516-fetch-push/.'
-To /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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
-
-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
-
-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
-
-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.47.2/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
-
-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.47.2/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
-
-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.47.2/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
-
-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 &&
-
-	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.47.2/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":"20260304T080115.047078Z-H8d819085-P000b2d9e","thread":"main","time":"2026-03-04T08:01:15.079696Z","file":"run-command.c","line":733,"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":"20260304T080115.290673Z-H8d819085-P000b2e7b","thread":"main","time":"2026-03-04T08:01:15.313284Z","file":"run-command.c","line":733,"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":"20260304T080115.484345Z-H8d819085-P000b2f3c","thread":"main","time":"2026-03-04T08:01:15.517315Z","file":"run-command.c","line":733,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q","--no-use-bitmap-index"]}
-ok 120 - push with config push.useBitmaps
-
-# passed all 120 test(s)
-1..120
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6100-rev-list-in-order.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6100-rev-list-in-order/.git/
-expecting success of 6100.1 'setup a commit history with trees, blobs': 
-	for x in one two three four
-	do
-		echo $x >$x &&
-		git add $x &&
-		git commit -m "add file $x" ||
-		return 1
-	done &&
-	for x in four three
-	do
-		git rm $x &&
-		git commit -m "remove $x" ||
-		return 1
-	done
-
-[master (root-commit) 852067c] add file one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-[master 090ebfd] add file two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two
-[master 2101c65] add file three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three
-[master 0846a08] add file four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four
-rm 'four'
-[master 37698d1] remove four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 four
-rm 'three'
-[master 0ade3bd] remove three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 three
-ok 1 - setup a commit history with trees, blobs
-
-expecting success of 6100.2 'rev-list --in-commit-order': 
-	git rev-list --in-commit-order --objects HEAD >actual.raw &&
-	cut -d" " -f1 >actual <actual.raw &&
-
-	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
-		HEAD^{commit}
-		HEAD^{tree}
-		HEAD^{tree}:one
-		HEAD^{tree}:two
-		HEAD~1^{commit}
-		HEAD~1^{tree}
-		HEAD~1^{tree}:three
-		HEAD~2^{commit}
-		HEAD~2^{tree}
-		HEAD~2^{tree}:four
-		HEAD~3^{commit}
-		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
-		HEAD~4^{commit}
-		# HEAD~4^{tree} skipped, same as HEAD^{tree}
-		HEAD~5^{commit}
-		HEAD~5^{tree}
-	EOF
-	grep -v "#" >expect <expect.raw &&
-
-	test_cmp expect actual
-
-ok 2 - rev-list --in-commit-order
-
-expecting success of 6100.3 'rev-list lists blobs and trees after commits': 
-	git rev-list --objects HEAD >actual.raw &&
-	cut -d" " -f1 >actual <actual.raw &&
-
-	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
-		HEAD^{commit}
-		HEAD~1^{commit}
-		HEAD~2^{commit}
-		HEAD~3^{commit}
-		HEAD~4^{commit}
-		HEAD~5^{commit}
-		HEAD^{tree}
-		HEAD^{tree}:one
-		HEAD^{tree}:two
-		HEAD~1^{tree}
-		HEAD~1^{tree}:three
-		HEAD~2^{tree}
-		HEAD~2^{tree}:four
-		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
-		# HEAD~4^{tree} skipped, same as HEAD^{tree}
-		HEAD~5^{tree}
-	EOF
-	grep -v "#" >expect <expect.raw &&
-
-	test_cmp expect actual
-
-ok 3 - rev-list lists blobs and trees after commits
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6040-tracking-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6040-tracking-info/.git/
-expecting success of 6040.1 'setup': 
-	advance a &&
-	advance b &&
-	advance c &&
-	git clone . test &&
-	(
-		cd test &&
-		git checkout -b b1 origin &&
-		git reset --hard HEAD^ &&
-		advance d &&
-		git checkout -b b2 origin &&
-		git reset --hard b1 &&
-		git checkout -b b3 origin &&
-		git reset --hard HEAD^ &&
-		git checkout -b b4 origin &&
-		advance e &&
-		advance f &&
-		git checkout -b brokenbase origin &&
-		git checkout -b b5 --track brokenbase &&
-		advance g &&
-		git branch -d brokenbase &&
-		git checkout -b b6 origin
-	) &&
-	git checkout -b follower --track main &&
-	advance h
-
-[main (root-commit) cc33353] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[main 7e1cf2d] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-[main ac11e55] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c
-Cloning into 'test'...
-done.
-Switched to a new branch 'b1'
-branch 'b1' set up to track 'origin/main'.
-HEAD is now at 7e1cf2d b
-[b1 afc0d66] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d
-Switched to a new branch 'b2'
-branch 'b2' set up to track 'origin/main'.
-HEAD is now at afc0d66 d
-Switched to a new branch 'b3'
-branch 'b3' set up to track 'origin/main'.
-HEAD is now at 7e1cf2d b
-Switched to a new branch 'b4'
-branch 'b4' set up to track 'origin/main'.
-[b4 ec9b031] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e
-[b4 59ecd1d] f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f
-Switched to a new branch 'brokenbase'
-branch 'brokenbase' set up to track 'origin/main'.
-Switched to a new branch 'b5'
-branch 'b5' set up to track 'brokenbase'.
-[b5 d8d0202] g
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g
-Deleted branch brokenbase (was ac11e55).
-Switched to a new branch 'b6'
-branch 'b6' set up to track 'origin/main'.
-Switched to a new branch 'follower'
-branch 'follower' set up to track 'main'.
-[follower 21abfbd] h
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 h
-ok 1 - setup
-
-expecting success of 6040.2 'branch -v': 
-	(
-		cd test &&
-		git branch -v
-	) |
-	sed -n -e "$t6040_script" >actual &&
-	test_cmp expect actual
-
-ok 2 - branch -v
-
-expecting success of 6040.3 'branch -vv': 
-	(
-		cd test &&
-		git branch -vv
-	) |
-	sed -n -e "$t6040_script" >actual &&
-	test_cmp expect actual
-
-ok 3 - branch -vv
-
-expecting success of 6040.4 'checkout (diverged from upstream)': 
-	(
-		cd test && git checkout b1
-	) >actual &&
-	test_grep "have 1 and 1 different" actual
-
-Switched to branch 'b1'
-and have 1 and 1 different commits each, respectively.
-ok 4 - checkout (diverged from upstream)
-
-expecting success of 6040.5 'checkout with local tracked branch': 
-	git checkout main &&
-	git checkout follower >actual &&
-	test_grep "is ahead of" actual
-
-Switched to branch 'main'
-Switched to branch 'follower'
-Your branch is ahead of 'main' by 1 commit.
-ok 5 - checkout with local tracked branch
-
-expecting success of 6040.6 'checkout (upstream is gone)': 
-	(
-		cd test &&
-		git checkout b5
-	) >actual &&
-	test_grep "is based on .*, but the upstream is gone." actual
-
-Switched to branch 'b5'
-Your branch is based on 'brokenbase', but the upstream is gone.
-ok 6 - checkout (upstream is gone)
-
-expecting success of 6040.7 'checkout (up-to-date with upstream)': 
-	(
-		cd test && git checkout b6
-	) >actual &&
-	test_grep "Your branch is up to date with .origin/main" actual
-
-Switched to branch 'b6'
-Your branch is up to date with 'origin/main'.
-ok 7 - checkout (up-to-date with upstream)
-
-expecting success of 6040.8 'status (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_grep "have 1 and 1 different" actual
-
-Switched to branch 'b1'
-and have 1 and 1 different commits each, respectively.
-ok 8 - status (diverged from upstream)
-
-expecting success of 6040.9 'status (upstream is gone)': 
-	(
-		cd test &&
-		git checkout b5 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_grep "is based on .*, but the upstream is gone." actual
-
-Switched to branch 'b5'
-Your branch is based on 'brokenbase', but the upstream is gone.
-ok 9 - status (upstream is gone)
-
-expecting success of 6040.10 'status (up-to-date with upstream)': 
-	(
-		cd test &&
-		git checkout b6 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_grep "Your branch is up to date with .origin/main" actual
-
-Switched to branch 'b6'
-Your branch is up to date with 'origin/main'.
-ok 10 - status (up-to-date with upstream)
-
-expecting success of 6040.11 'status -s -b (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status -s -b | head -1
-	) >actual &&
-	test_cmp expect actual
-
-Switched to branch 'b1'
-ok 11 - status -s -b (diverged from upstream)
-
-expecting success of 6040.12 'status -s -b --no-ahead-behind (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status -s -b --no-ahead-behind | head -1
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 12 - status -s -b --no-ahead-behind (diverged from upstream)
-
-expecting success of 6040.13 'status.aheadbehind=false status -s -b (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git -c status.aheadbehind=false status -s -b | head -1
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 13 - status.aheadbehind=false status -s -b (diverged from upstream)
-
-expecting success of 6040.14 'status --long --branch': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status --long -b | head -3
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 14 - status --long --branch
-
-expecting success of 6040.15 'status --long --branch': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git -c status.aheadbehind=true status --long -b | head -3
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 15 - status --long --branch
-
-expecting success of 6040.16 'status --long --branch --no-ahead-behind': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status --long -b --no-ahead-behind | head -2
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 16 - status --long --branch --no-ahead-behind
-
-expecting success of 6040.17 'status.aheadbehind=false status --long --branch': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git -c status.aheadbehind=false status --long -b | head -2
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 17 - status.aheadbehind=false status --long --branch
-
-expecting success of 6040.18 'status -s -b (upstream is gone)': 
-	(
-		cd test &&
-		git checkout b5 >/dev/null &&
-		git status -s -b | head -1
-	) >actual &&
-	test_cmp expect actual
-
-Switched to branch 'b5'
-ok 18 - status -s -b (upstream is gone)
-
-expecting success of 6040.19 'status -s -b (up-to-date with upstream)': 
-	(
-		cd test &&
-		git checkout b6 >/dev/null &&
-		git status -s -b | head -1
-	) >actual &&
-	test_cmp expect actual
-
-Switched to branch 'b6'
-ok 19 - status -s -b (up-to-date with upstream)
-
-expecting success of 6040.20 'fail to track lightweight tags': 
-	git checkout main &&
-	git tag light &&
-	test_must_fail git branch --track lighttrack light >actual &&
-	test_grep ! "set up to track" actual &&
-	test_must_fail git checkout lighttrack
+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
@@ -398297,168 +398342,6 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6060-merge-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6110-rev-list-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6102-rev-list-unexpected-objects.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6102-rev-list-unexpected-objects/.git/
 expecting success of 6102.1 'setup well-formed objects': 
@@ -398635,6 +398518,118 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6060-merge-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6022-rev-list-missing.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6022-rev-list-missing/.git/
 expecting success of 6022.1 'create repository and alternate directory': 
@@ -400681,773 +400676,209 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6050-replace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 | grep "author A U Thor" &&
-	R=$(git cat-file commit $HASH2 | sed -e "s/A U/O/" | git hash-object -t commit --stdin -w) &&
-	git cat-file commit $R | grep "author O Thor" &&
-	git update-ref refs/replace/$HASH2 $R &&
-	git show HEAD~5 | grep "O Thor" &&
-	git show $HASH2 | grep "O Thor"
-
-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 | grep "author O Thor" &&
-	git --no-replace-objects cat-file commit $HASH2 | grep "author A U Thor" &&
-	git show $HASH2 | grep "O Thor" &&
-	git --no-replace-objects show $HASH2 | grep "A U Thor"
-
-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 | grep "author A U Thor" &&
-	GIT_NO_REPLACE_OBJECTS=1 git show $HASH2 | grep "A U Thor"
-
-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 | grep "author A U Thor" &&
-	git show $HASH2 | grep "A U Thor"
-
-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 | grep "A U Thor" &&
-		git show $HASH2 | grep "A U Thor" &&
-		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 | grep "O Thor" &&
-		git show $HASH2 | grep "O Thor" &&
-		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 | grep "A U Thor" &&
-	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 | grep "O Thor" &&
-	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 | grep "O Thor" &&
-	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 | grep "A U Thor" &&
-	git checkout $HASH1 &&
-	git cherry-pick $HASH2 &&
-	git show $HASH5 | git apply &&
-	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 | grep $PARA2 &&
-	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
+*** t6130-pathspec-noglob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6130-pathspec-noglob/.git/
+expecting success of 6130.1 'create commits with glob characters': 
+	test_commit unrelated bar &&
+	test_commit vanilla foo &&
+	# insert file "f*" in the commit, but in a way that avoids
+	# the name "f*" in the worktree, because it is not allowed
+	# on Windows (the tests below do not depend on the presence
+	# of the file in the worktree)
+	git config core.protectNTFS false &&
+	git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
+	test_tick &&
+	git commit -m star &&
+	test_commit bracket "f[o][o]"
 
-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
+[master (root-commit) f600089] unrelated
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[master 065b8fa] vanilla
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master 306e39a] star
  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
+ create mode 100644 f*
+[master 48b9afb] bracket
  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 | grep $PARA2
-	)
-
-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 | grep "author A U Thor" &&
-	S=$(git cat-file commit $PARA3 | sed -e "s/A U/O/" | git hash-object -t commit --stdin -w) &&
-	git cat-file commit $S | grep "author O Thor" &&
-	git replace $PARA3 $S &&
-	git show $HASH6~2 | grep "O Thor" &&
-	git show $PARA3 | grep "O Thor" &&
-	git push cloned $HASH6^:refs/heads/parallel2 &&
-	(
-		cd clone_dir &&
-		git checkout parallel2 &&
-		git log --pretty=oneline | grep $PARA3 &&
-		git show $PARA3 | grep "A U Thor"
-	)
-
-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 &&
-		! grep $PARA3 output.txt &&
-		git show $PARA3 >para3.txt &&
-		grep "A U Thor" para3.txt &&
-		git fetch origin "refs/replace/*:refs/replace/*" &&
-		git log --pretty=oneline parallel3 >output.txt &&
-		grep $PARA3 output.txt &&
-		git show $PARA3 >para3.txt &&
-		grep "O Thor" para3.txt
-	)
-
-From /build/reproducible-path/git-2.47.2/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.47.2/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:
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f[o][o]
+ok 1 - create commits with glob characters
 
-  40237c8 hello: 1 more line
-  8fc2a8e hello: 2 more lines
+expecting success of 6130.2 'vanilla pathspec matches literally': 
+	echo vanilla >expect &&
+	git log --format=%s -- foo >actual &&
+	test_cmp expect actual
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+ok 2 - vanilla pathspec matches literally
 
- git branch <new-branch-name> 40237c8
+expecting success of 6130.3 'star pathspec globs': 
+	cat >expect <<-\EOF &&
+	bracket
+	star
+	vanilla
+	EOF
+	git log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
 
-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:
+ok 3 - star pathspec globs
 
-  40237c8 hello: 1 more line
-  8fc2a8e hello: 2 more lines
+expecting success of 6130.4 'star pathspec globs': 
+	cat >expect <<-\EOF &&
+	bracket
+	star
+	vanilla
+	EOF
+	git log --format=%s -- ":(glob)f*" >actual &&
+	test_cmp expect actual
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+ok 4 - star pathspec globs
 
- git branch <new-branch-name> 40237c8
+expecting success of 6130.5 'bracket pathspec globs and matches literal brackets': 
+	cat >expect <<-\EOF &&
+	bracket
+	vanilla
+	EOF
+	git log --format=%s -- "f[o][o]" >actual &&
+	test_cmp expect actual
 
-Switched to branch 'main'
-ok 16 - bisect and replacements
+ok 5 - bracket pathspec globs and matches literal brackets
 
-expecting success of 6050.17 'index-pack and replacements': 
-	git --no-replace-objects rev-list --objects HEAD |
-	git --no-replace-objects pack-objects test- &&
-	git index-pack test-*.pack
+expecting success of 6130.6 'bracket pathspec globs and matches literal brackets': 
+	cat >expect <<-\EOF &&
+	bracket
+	vanilla
+	EOF
+	git log --format=%s -- ":(glob)f[o][o]" >actual &&
+	test_cmp expect actual
 
-d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7
-d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7
-ok 17 - index-pack and replacements
+ok 6 - bracket pathspec globs and matches literal brackets
 
-expecting success of 6050.18 'not just commits': 
-	echo replaced >file &&
-	git add file &&
-	REPLACED=$(git rev-parse :file) &&
-	mv file file.replaced &&
+expecting success of 6130.7 'no-glob option matches literally (vanilla)': 
+	echo vanilla >expect &&
+	git --literal-pathspecs log --format=%s -- foo >actual &&
+	test_cmp expect actual
 
-	echo original >file &&
-	git add file &&
-	ORIGINAL=$(git rev-parse :file) &&
-	git update-ref refs/replace/$ORIGINAL $REPLACED &&
-	mv file file.original &&
+ok 7 - no-glob option matches literally (vanilla)
 
-	git checkout file &&
-	test_cmp file.replaced file
+expecting success of 6130.8 'no-glob option matches literally (vanilla)': 
+	echo vanilla >expect &&
+	git log --format=%s -- ":(literal)foo" >actual &&
+	test_cmp expect actual
 
-Updated 1 path from the index
-ok 18 - not just commits
+ok 8 - no-glob option matches literally (vanilla)
 
-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
+expecting success of 6130.9 'no-glob option matches literally (star)': 
+	echo star >expect &&
+	git --literal-pathspecs log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
 
-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
+ok 9 - no-glob option matches literally (star)
 
-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
+expecting success of 6130.10 'no-glob option matches literally (star)': 
+	echo star >expect &&
+	git log --format=%s -- ":(literal)f*" >actual &&
+	test_cmp expect actual
 
-ok 20 - -f option bypasses the type check
+ok 10 - no-glob option matches literally (star)
 
-expecting success of 6050.21 'git cat-file --batch works on replace objects': 
-	git replace | grep $PARA3 &&
-	echo $PARA3 | git cat-file --batch
+expecting success of 6130.11 'no-glob option matches literally (bracket)': 
+	echo bracket >expect &&
+	git --literal-pathspecs log --format=%s -- "f[o][o]" >actual &&
+	test_cmp expect actual
 
-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
+ok 11 - no-glob option matches literally (bracket)
 
-hello: 2 more lines
+expecting success of 6130.12 'no-glob option matches literally (bracket)': 
+	echo bracket >expect &&
+	git log --format=%s -- ":(literal)f[o][o]" >actual &&
+	test_cmp expect actual
 
-ok 21 - git cat-file --batch works on replace objects
+ok 12 - no-glob option matches literally (bracket)
 
-expecting success of 6050.22 'test --format bogus': 
-	test_must_fail git replace --format bogus >/dev/null 2>&1
+expecting success of 6130.13 'no-glob option disables :(literal)': 
+	git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual &&
+	test_must_be_empty actual
 
-ok 22 - test --format bogus
+ok 13 - no-glob option disables :(literal)
 
-expecting success of 6050.23 'test --format short': 
-	git replace --format=short >actual &&
-	git replace >expected &&
-	test_cmp expected actual
+expecting success of 6130.14 'no-glob environment variable works': 
+	echo star >expect &&
+	GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
 
-ok 23 - test --format short
+ok 14 - no-glob environment variable works
 
-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 | sort >actual &&
-	test_cmp expected actual
+expecting success of 6130.15 'blame takes global pathspec flags': 
+	git --literal-pathspecs blame -- foo &&
+	git --icase-pathspecs   blame -- foo &&
+	git --glob-pathspecs    blame -- foo &&
+	git --noglob-pathspecs  blame -- foo
 
-ok 24 - test --format medium
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+ok 15 - blame takes global pathspec flags
 
-expecting success of 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 | sort >actual &&
-	test_cmp expected actual
+expecting success of 6130.16 'setup xxx/bar': 
+	mkdir xxx &&
+	test_commit xxx xxx/bar
 
-ok 25 - test --format long
+[master 7cd4d15] xxx
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 xxx/bar
+ok 16 - setup xxx/bar
 
-expecting success of 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
+expecting success of 6130.17 '**/ works with :(glob)': 
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
 	EOF
+	git log --format=%s -- ":(glob)**/bar" >actual &&
+	test_cmp expect actual
 
-ok 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 | grep "$PARA3" &&
-	git cat-file commit "$PARA3" | grep "A fake Thor" &&
-	git replace -d "$PARA3" &&
-	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
-	git replace -l | grep "$PARA3" &&
-	git cat-file commit "$PARA3" | grep "A fake Thor"
-
-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 | grep "$PARA3" &&
-	git cat-file commit "$PARA3" | grep "A fake Thor"
-
-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 17 - **/ works with :(glob)
 
-ok 35 # skip set up a merge commit with a mergetag (missing GPG)
+expecting success of 6130.18 '**/ does not work with --noglob-pathspecs': 
+	git --noglob-pathspecs log --format=%s -- "**/bar" >actual &&
+	test_must_be_empty actual
 
-ok 36 # skip --graft on a commit with a mergetag (missing GPG)
+ok 18 - **/ does not work with --noglob-pathspecs
 
-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 &&
+expecting success of 6130.19 '**/ works with :(glob) and --noglob-pathspecs': 
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git --noglob-pathspecs log --format=%s -- ":(glob)**/bar" >actual &&
+	test_cmp expect actual
 
-	: 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 &&
+ok 19 - **/ works with :(glob) and --noglob-pathspecs
 
-	: verify that the history is now "grafted" &&
-	git rev-list HEAD >out &&
-	test_line_count = 4 out &&
+expecting success of 6130.20 '**/ works with --glob-pathspecs': 
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git --glob-pathspecs log --format=%s -- "**/bar" >actual &&
+	test_cmp expect actual
 
-	: 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
+ok 20 - **/ works with --glob-pathspecs
 
-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
-	payload
-	stderr
-	tag.sig
-	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.idx
-	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.pack
-	test--d06bfd96e506f4513fcb3d15f2d4a0d25e23b3e7.rev
+expecting success of 6130.21 '**/ does not work with :(literal) and --glob-pathspecs': 
+	git --glob-pathspecs log --format=%s -- ":(literal)**/bar" >actual &&
+	test_must_be_empty actual
 
-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
+ok 21 - **/ does not work with :(literal) and --glob-pathspecs
 
-# passed all 37 test(s)
-1..37
+# passed all 21 test(s)
+1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6101-rev-parse-parents.sh ***
@@ -403163,211 +402594,6 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6130-pathspec-noglob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6130-pathspec-noglob/.git/
-expecting success of 6130.1 'create commits with glob characters': 
-	test_commit unrelated bar &&
-	test_commit vanilla foo &&
-	# insert file "f*" in the commit, but in a way that avoids
-	# the name "f*" in the worktree, because it is not allowed
-	# on Windows (the tests below do not depend on the presence
-	# of the file in the worktree)
-	git config core.protectNTFS false &&
-	git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
-	test_tick &&
-	git commit -m star &&
-	test_commit bracket "f[o][o]"
-
-[master (root-commit) f600089] unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[master 065b8fa] vanilla
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 306e39a] star
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f*
-[master 48b9afb] bracket
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f[o][o]
-ok 1 - create commits with glob characters
-
-expecting success of 6130.2 'vanilla pathspec matches literally': 
-	echo vanilla >expect &&
-	git log --format=%s -- foo >actual &&
-	test_cmp expect actual
-
-ok 2 - vanilla pathspec matches literally
-
-expecting success of 6130.3 'star pathspec globs': 
-	cat >expect <<-\EOF &&
-	bracket
-	star
-	vanilla
-	EOF
-	git log --format=%s -- "f*" >actual &&
-	test_cmp expect actual
-
-ok 3 - star pathspec globs
-
-expecting success of 6130.4 'star pathspec globs': 
-	cat >expect <<-\EOF &&
-	bracket
-	star
-	vanilla
-	EOF
-	git log --format=%s -- ":(glob)f*" >actual &&
-	test_cmp expect actual
-
-ok 4 - star pathspec globs
-
-expecting success of 6130.5 'bracket pathspec globs and matches literal brackets': 
-	cat >expect <<-\EOF &&
-	bracket
-	vanilla
-	EOF
-	git log --format=%s -- "f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 5 - bracket pathspec globs and matches literal brackets
-
-expecting success of 6130.6 'bracket pathspec globs and matches literal brackets': 
-	cat >expect <<-\EOF &&
-	bracket
-	vanilla
-	EOF
-	git log --format=%s -- ":(glob)f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 6 - bracket pathspec globs and matches literal brackets
-
-expecting success of 6130.7 'no-glob option matches literally (vanilla)': 
-	echo vanilla >expect &&
-	git --literal-pathspecs log --format=%s -- foo >actual &&
-	test_cmp expect actual
-
-ok 7 - no-glob option matches literally (vanilla)
-
-expecting success of 6130.8 'no-glob option matches literally (vanilla)': 
-	echo vanilla >expect &&
-	git log --format=%s -- ":(literal)foo" >actual &&
-	test_cmp expect actual
-
-ok 8 - no-glob option matches literally (vanilla)
-
-expecting success of 6130.9 'no-glob option matches literally (star)': 
-	echo star >expect &&
-	git --literal-pathspecs log --format=%s -- "f*" >actual &&
-	test_cmp expect actual
-
-ok 9 - no-glob option matches literally (star)
-
-expecting success of 6130.10 'no-glob option matches literally (star)': 
-	echo star >expect &&
-	git log --format=%s -- ":(literal)f*" >actual &&
-	test_cmp expect actual
-
-ok 10 - no-glob option matches literally (star)
-
-expecting success of 6130.11 'no-glob option matches literally (bracket)': 
-	echo bracket >expect &&
-	git --literal-pathspecs log --format=%s -- "f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 11 - no-glob option matches literally (bracket)
-
-expecting success of 6130.12 'no-glob option matches literally (bracket)': 
-	echo bracket >expect &&
-	git log --format=%s -- ":(literal)f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 12 - no-glob option matches literally (bracket)
-
-expecting success of 6130.13 'no-glob option disables :(literal)': 
-	git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual &&
-	test_must_be_empty actual
-
-ok 13 - no-glob option disables :(literal)
-
-expecting success of 6130.14 'no-glob environment variable works': 
-	echo star >expect &&
-	GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual &&
-	test_cmp expect actual
-
-ok 14 - no-glob environment variable works
-
-expecting success of 6130.15 'blame takes global pathspec flags': 
-	git --literal-pathspecs blame -- foo &&
-	git --icase-pathspecs   blame -- foo &&
-	git --glob-pathspecs    blame -- foo &&
-	git --noglob-pathspecs  blame -- foo
-
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-ok 15 - blame takes global pathspec flags
-
-expecting success of 6130.16 'setup xxx/bar': 
-	mkdir xxx &&
-	test_commit xxx xxx/bar
-
-[master 7cd4d15] xxx
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 xxx/bar
-ok 16 - setup xxx/bar
-
-expecting success of 6130.17 '**/ works with :(glob)': 
-	cat >expect <<-\EOF &&
-	xxx
-	unrelated
-	EOF
-	git log --format=%s -- ":(glob)**/bar" >actual &&
-	test_cmp expect actual
-
-ok 17 - **/ works with :(glob)
-
-expecting success of 6130.18 '**/ does not work with --noglob-pathspecs': 
-	git --noglob-pathspecs log --format=%s -- "**/bar" >actual &&
-	test_must_be_empty actual
-
-ok 18 - **/ does not work with --noglob-pathspecs
-
-expecting success of 6130.19 '**/ works with :(glob) and --noglob-pathspecs': 
-	cat >expect <<-\EOF &&
-	xxx
-	unrelated
-	EOF
-	git --noglob-pathspecs log --format=%s -- ":(glob)**/bar" >actual &&
-	test_cmp expect actual
-
-ok 19 - **/ works with :(glob) and --noglob-pathspecs
-
-expecting success of 6130.20 '**/ works with --glob-pathspecs': 
-	cat >expect <<-\EOF &&
-	xxx
-	unrelated
-	EOF
-	git --glob-pathspecs log --format=%s -- "**/bar" >actual &&
-	test_cmp expect actual
-
-ok 20 - **/ works with --glob-pathspecs
-
-expecting success of 6130.21 '**/ does not work with :(literal) and --glob-pathspecs': 
-	git --glob-pathspecs log --format=%s -- ":(literal)**/bar" >actual &&
-	test_must_be_empty actual
-
-ok 21 - **/ does not work with :(literal) and --glob-pathspecs
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6131-pathspec-icase.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6131-pathspec-icase/.git/
 checking prerequisite: CASE_INSENSITIVE_FS
@@ -403539,6 +402765,775 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6050-replace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 | grep "author A U Thor" &&
+	R=$(git cat-file commit $HASH2 | sed -e "s/A U/O/" | git hash-object -t commit --stdin -w) &&
+	git cat-file commit $R | grep "author O Thor" &&
+	git update-ref refs/replace/$HASH2 $R &&
+	git show HEAD~5 | grep "O Thor" &&
+	git show $HASH2 | grep "O Thor"
+
+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 | grep "author O Thor" &&
+	git --no-replace-objects cat-file commit $HASH2 | grep "author A U Thor" &&
+	git show $HASH2 | grep "O Thor" &&
+	git --no-replace-objects show $HASH2 | grep "A U Thor"
+
+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 | grep "author A U Thor" &&
+	GIT_NO_REPLACE_OBJECTS=1 git show $HASH2 | grep "A U Thor"
+
+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 | grep "author A U Thor" &&
+	git show $HASH2 | grep "A U Thor"
+
+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 | grep "A U Thor" &&
+		git show $HASH2 | grep "A U Thor" &&
+		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 | grep "O Thor" &&
+		git show $HASH2 | grep "O Thor" &&
+		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 | grep "A U Thor" &&
+	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 | grep "O Thor" &&
+	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 | grep "O Thor" &&
+	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 | grep "A U Thor" &&
+	git checkout $HASH1 &&
+	git cherry-pick $HASH2 &&
+	git show $HASH5 | git apply &&
+	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 | grep $PARA2 &&
+	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 | grep $PARA2
+	)
+
+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 | grep "author A U Thor" &&
+	S=$(git cat-file commit $PARA3 | sed -e "s/A U/O/" | git hash-object -t commit --stdin -w) &&
+	git cat-file commit $S | grep "author O Thor" &&
+	git replace $PARA3 $S &&
+	git show $HASH6~2 | grep "O Thor" &&
+	git show $PARA3 | grep "O Thor" &&
+	git push cloned $HASH6^:refs/heads/parallel2 &&
+	(
+		cd clone_dir &&
+		git checkout parallel2 &&
+		git log --pretty=oneline | grep $PARA3 &&
+		git show $PARA3 | grep "A U Thor"
+	)
+
+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 &&
+		! grep $PARA3 output.txt &&
+		git show $PARA3 >para3.txt &&
+		grep "A U Thor" para3.txt &&
+		git fetch origin "refs/replace/*:refs/replace/*" &&
+		git log --pretty=oneline parallel3 >output.txt &&
+		grep $PARA3 output.txt &&
+		git show $PARA3 >para3.txt &&
+		grep "O Thor" para3.txt
+	)
+
+From /build/reproducible-path/git-2.47.2/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.47.2/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 |
+	git --no-replace-objects pack-objects test- &&
+	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 | grep $PARA3 &&
+	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 | sort >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 | sort >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 | grep "$PARA3" &&
+	git cat-file commit "$PARA3" | grep "A fake Thor" &&
+	git replace -d "$PARA3" &&
+	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
+	git replace -l | grep "$PARA3" &&
+	git cat-file commit "$PARA3" | grep "A fake Thor"
+
+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 | grep "$PARA3" &&
+	git cat-file commit "$PARA3" | grep "A fake Thor"
+
+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
+	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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6133-pathspec-rev-dwim.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6133-pathspec-rev-dwim/.git/
 expecting success of 6133.1 'setup': 
@@ -403601,6 +403596,56 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6136-pathspec-in-bare.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6136-pathspec-in-bare/.git/
+expecting success of 6136.1 'setup a bare and non-bare repository': 
+	test_commit file1 &&
+	git clone --bare . bare
+
+[master (root-commit) 69af168] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.t
+Cloning into bare repository 'bare'...
+done.
+ok 1 - setup a bare and non-bare repository
+
+expecting success of 6136.2 'log and ls-files in a bare repository': 
+	(
+		cd bare &&
+		test_must_fail git log -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_grep "outside repository" err &&
+
+		test_must_fail git ls-files -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_grep "outside repository" err
+	)
+
+fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t6136-pathspec-in-bare/bare/.'
+fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t6136-pathspec-in-bare/bare/.'
+ok 2 - log and ls-files in a bare repository
+
+expecting success of 6136.3 'log and ls-files in .git directory': 
+	(
+		cd .git &&
+		test_must_fail git log -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_grep "outside repository" err &&
+
+		test_must_fail git ls-files -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_grep "outside repository" err
+	)
+
+fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t6136-pathspec-in-bare/.git/.'
+fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t6136-pathspec-in-bare/.git/.'
+ok 3 - log and ls-files in .git directory
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6111-rev-list-treesame.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6111-rev-list-treesame/.git/
 expecting success of 6111.1 'setup': 
@@ -404215,101 +404260,6 @@
 1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6136-pathspec-in-bare.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6136-pathspec-in-bare/.git/
-expecting success of 6136.1 'setup a bare and non-bare repository': 
-	test_commit file1 &&
-	git clone --bare . bare
-
-[master (root-commit) 69af168] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.t
-Cloning into bare repository 'bare'...
-done.
-ok 1 - setup a bare and non-bare repository
-
-expecting success of 6136.2 'log and ls-files in a bare repository': 
-	(
-		cd bare &&
-		test_must_fail git log -- .. >out 2>err &&
-		test_must_be_empty out &&
-		test_grep "outside repository" err &&
-
-		test_must_fail git ls-files -- .. >out 2>err &&
-		test_must_be_empty out &&
-		test_grep "outside repository" err
-	)
-
-fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t6136-pathspec-in-bare/bare/.'
-fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t6136-pathspec-in-bare/bare/.'
-ok 2 - log and ls-files in a bare repository
-
-expecting success of 6136.3 'log and ls-files in .git directory': 
-	(
-		cd .git &&
-		test_must_fail git log -- .. >out 2>err &&
-		test_must_be_empty out &&
-		test_grep "outside repository" err &&
-
-		test_must_fail git ls-files -- .. >out 2>err &&
-		test_must_be_empty out &&
-		test_grep "outside repository" err
-	)
-
-fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t6136-pathspec-in-bare/.git/.'
-fatal: ..: '..' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t6136-pathspec-in-bare/.git/.'
-ok 3 - log and ls-files in .git directory
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6134-pathspec-in-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6112-rev-list-filters-objects.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6112-rev-list-filters-objects/.git/
 expecting success of 6112.1 'setup r1': 
@@ -405146,6 +405096,51 @@
 1..55
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6134-pathspec-in-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6132-pathspec-exclude.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6132-pathspec-exclude/.git/
 expecting success of 6132.1 'setup': 
@@ -405685,6 +405680,80 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6301-for-each-ref-errors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+
+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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6020-bundle-misc.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6020-bundle-misc/.git/
 expecting success of 6020.1 'usage: git bundle create needs an argument': 
@@ -406490,7 +406559,7 @@
 		git bundle create --progress out.bundle --all 2>err &&
 	grep Writing err
 
-Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 952.00 KiB/s, done.
+Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 476.00 KiB/s, done.
 ok 22 - bundle progress includes write phase
 
 checking prerequisite: TTY
@@ -406535,7 +406604,7 @@
 
 Counting objects:   2% (1/47)
Counting objects:   4% (2/47)
Counting objects:   6% (3/47)
Counting objects:   8% (4/47)
Counting objects:  10% (5/47)
Counting objects:  12% (6/47)
Counting objects:  14% (7/47)
Counting objects:  17% (8/47)
Counting objects:  19% (9/47)
Counting objects:  21% (10/47)
Counting objects:  23% (11/47)
Counting objects:  25% (12/47)
Counting objects:  27% (13/47)
Counting objects:  29% (14/47)
Counting objects:  31% (15/47)
Counting objects:  34% (16/47)
Counting objects:  36% (17/47)
Counting objects:  38% (18/47)
Counting objects:  40% (19/47)
Counting objects:  42% (20/47)
Counting objects:  44% (21/47)
Counting objects:  46% (22/47)
Counting objects:  48% (23/47)
Counting objects:  51% (24/47)
Counting objects:  53% (25/47)
Counting objects:  55% (26/47)
Counting objects:  57% (27/47)
Counting objects:  59% (28/47)
Counting objects:  61% (29/47)
Counting objects:  63% (30/47)
Counting objects:  65% (31/47)
Counting objects:  68% (32/47)
Counting objects:  70% (33/47)
Counting objects:  72% (34/47)
Counting objects:  74% (35/47)
Counting objects:  76% (36/47)
Counting objects:  78% (37/47)
Counting objects:  80% (38/47)
Counting objects:  82% (39/47)
Counting objects:  85% (40/47)
Counting objects:  87% (41/47)
Counting objects:  89% (42/47)
Counting objects:  91% (43/47)
Counting objects:  93% (44/47)
Counting objects:  95% (45/47)
Counting objects:  97% (46/47)
Counting objects: 100% (47/47)
Counting objects: 100% (47/47), done.
 Compressing objects:   3% (1/31)
Compressing objects:   6% (2/31)
Compressing objects:   9% (3/31)
Compressing objects:  12% (4/31)
Compressing objects:  16% (5/31)
Compressing objects:  19% (6/31)
Compressing objects:  22% (7/31)
Compressing objects:  25% (8/31)
Compressing objects:  29% (9/31)
Compressing objects:  32% (10/31)
Compressing objects:  35% (11/31)
Compressing objects:  38% (12/31)
Compressing objects:  41% (13/31)
Compressing objects:  45% (14/31)
Compressing objects:  48% (15/31)
Compressing objects:  51% (16/31)
Compressing objects:  54% (17/31)
Compressing objects:  58% (18/31)
Compressing objects:  61% (19/31)
Compressing objects:  64% (20/31)
Compressing objects:  67% (21/31)
Compressing objects:  70% (22/31)
Compressing objects:  74% (23/31)
Compressing objects:  77% (24/31)
Compressing objects:  80% (25/31)
Compressing objects:  83% (26/31)
Compressing objects:  87% (27/31)
Compressing objects:  90% (28/31)
Compressing objects:  93% (29/31)
Compressing objects:  96% (30/31)
Compressing objects: 100% (31/31)
Compressing objects: 100% (31/31), done.
-Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 762.00 KiB/s, done.
+Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 293.00 KiB/s, done.
 ok 24 - bundle progress with --no-quiet
 
 expecting success of 6020.25 'read bundle over stdin': 
@@ -407218,7 +407287,6 @@
 label☺ is not a valid attribute name: .gitattributes:10
 label☺ is not a valid attribute name: .gitattributes:10
 label☺ is not a valid attribute name: .gitattributes:10
-label☺ is not a valid attribute name: .gitattributes:10
 ok 36 - pathspec with builtin_objectmode attr can be used
 
 expecting success of 6135.37 'builtin_objectmode attr can be excluded': 
@@ -407235,86 +407303,113 @@
 
 label☺ is not a valid attribute name: .gitattributes:10
 label☺ is not a valid attribute name: .gitattributes:10
-label☺ is not a valid attribute name: .gitattributes:10
-label☺ is not a valid attribute name: .gitattributes:10
 ok 37 - builtin_objectmode attr can be excluded
 
 # passed all 37 test(s)
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6301-for-each-ref-errors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t6401-merge-criss-cross.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
 
-[master (root-commit) d31adcd] Initial
- Author: A U Thor <author@example.com>
-ok 1 - setup
+	git branch A &&
+	git branch B &&
+	git checkout A &&
 
-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
+	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 &&
 
-ok 2 - Broken refs are reported correctly
+	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 &&
 
-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
+	git merge -m "pre E3 merge" A &&
 
-ok 3 - NULL_SHA1 refs are reported correctly
+	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 &&
 
-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
+	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 &&
 
-ok 4 - Missing objects are reported correctly
+	git commit -m D8 file
 
-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
+[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
 
-ok 5 - ahead-behind requires an argument
+expecting success of 6401.2 'Criss-cross merge': 
+	git merge -m "final merge" B
 
-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
+  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
 
-ok 6 - missing ahead-behind base
+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
 
-# passed all 6 test(s)
-1..6
+	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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6400-merge-df.sh ***
@@ -407588,580 +407683,171 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6401-merge-criss-cross.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+*** t6403-merge-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-	git branch A &&
-	git branch B &&
-	git checkout A &&
+	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
 
-	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 &&
+	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
 
-	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 &&
+	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
 
-	git merge -m "pre E3 merge" A &&
+	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
 
-	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 &&
+	printf "propter nomen suum." >>new4.txt &&
 
-	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 &&
+	cat >base.c <<-\EOF &&
+	int f(int x, int y)
+	{
+		if (x == 0)
+		{
+			return y;
+		}
+		return x;
+	}
 
-	git commit -m D8 file
+	int g(size_t u)
+	{
+		while (u < 30)
+		{
+			u++;
+		}
+		return u;
+	}
+	EOF
 
-[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
+	cat >ours.c <<-\EOF &&
+	int g(size_t u)
+	{
+		while (u < 30)
+		{
+			u++;
+		}
+		return u;
+	}
 
-expecting success of 6401.2 'Criss-cross merge': 
-	git merge -m "final merge" B
+	int h(int x, int y, int z)
+	{
+		if (z == 0)
+		{
+			return x;
+		}
+		return y;
+	}
+	EOF
 
-  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
+	cat >theirs.c <<-\EOF
+	int f(int x, int y)
+	{
+		if (x == 0)
+		{
+			return y;
+		}
+		return x;
+	}
 
-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
+	int g(size_t u)
+	{
+		while (u > 34)
+		{
+			u--;
+		}
+		return u;
+	}
 	EOF
 
-	test_cmp file-expect file
+ok 1 - setup
 
-ok 3 - Criss-cross merge result
+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
 
-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
+ok 2 - merge with no changes
 
-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)
+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
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6404-recursive-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6404-recursive-merge/.git/
-expecting success of 6404.1 'setup tests': 
-	GIT_TEST_COMMIT_GRAPH=0 &&
-	export GIT_TEST_COMMIT_GRAPH &&
-	echo 1 >a1 &&
-	git add a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
+ok 3 - merge with no changes with --object-id
 
-	git checkout -b A main &&
-	echo A >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
+expecting success of 6403.4 'merge without conflict': 
+	cp new1.txt test.txt &&
+	git merge-file test.txt orig.txt new2.txt
 
-	git checkout -b B main &&
-	echo B >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
+ok 4 - merge without conflict
 
-	git checkout -b D A &&
-	git rev-parse B >.git/MERGE_HEAD &&
-	echo D >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
+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
 
-	git symbolic-ref HEAD refs/heads/other &&
-	echo 2 >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
+ok 5 - merge without conflict with --object-id
 
-	git checkout -b C &&
-	echo C >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
+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
 
-	git checkout -b E C &&
-	git rev-parse B >.git/MERGE_HEAD &&
-	echo E >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
+ok 6 - can accept object ID with --object-id
 
-	git checkout -b G E &&
-	git rev-parse A >.git/MERGE_HEAD &&
-	echo G >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
+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
 
-	git checkout -b F D &&
-	git rev-parse C >.git/MERGE_HEAD &&
-	echo F >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F &&
+ok 7 - works in subdirectory
 
-	test_oid_cache <<-EOF
-	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
-	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
-	EOF
-
-[main (root-commit) 2cb59ab] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a1
-Switched to a new branch 'A'
-[A 9d821b5] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'B'
-[B 7082aa6] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'D'
-[D e1146db] D
- Author: A U Thor <author@example.com>
-[other (root-commit) 216d386] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a1
-Switched to a new branch 'C'
-[C d264643] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'E'
-[E 939285a] E
- Author: A U Thor <author@example.com>
-Switched to a new branch 'G'
-[G 26f86b6] G
- Author: A U Thor <author@example.com>
-Switched to a new branch 'F'
-[F 71b2f3d] F
- Author: A U Thor <author@example.com>
-ok 1 - setup tests
-
-expecting success of 6404.2 'combined merge conflicts': 
-	test_must_fail git merge -m final G
-
-  From inner merge:  Auto-merging a1
-  From inner merge:  CONFLICT (add/add): Merge conflict in a1
-  From inner merge:  Auto-merging a1
-  From inner merge:  CONFLICT (content): Merge conflict in a1
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - combined merge conflicts
-
-expecting success of 6404.3 'result contains a conflict': 
-	cat >expect <<-\EOF &&
-	<<<<<<< HEAD
-	F
-	=======
-	G
-	>>>>>>> G
-	EOF
-
-	test_cmp expect a1
-
-ok 3 - result contains a conflict
-
-expecting success of 6404.4 'virtual trees were processed': 
-	# TODO: fragile test, relies on ambigious merge-base resolution
-	git ls-files --stage >out &&
-
-	cat >expect <<-EOF &&
-	100644 $(test_oid idxstage1) 1	a1
-	100644 $(git rev-parse F:a1) 2	a1
-	100644 $(git rev-parse G:a1) 3	a1
-	EOF
-
-	test_cmp expect out
-
-ok 4 - virtual trees were processed
-
-expecting success of 6404.5 'refuse to merge binary files': 
-	git reset --hard &&
-	printf "\0" >binary-file &&
-	git add binary-file &&
-	git commit -m binary &&
-	git checkout G &&
-	printf "\0\0" >binary-file &&
-	git add binary-file &&
-	git commit -m binary2 &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_must_fail git merge F >merge_output
-	else
-		test_must_fail git merge F 2>merge_output
-	fi &&
-	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge_output
-
-HEAD is now at 71b2f3d F
-[F 585846d] binary
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binary-file
-Switched to branch 'G'
-[G 4e36843] binary2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binary-file
-warning: Cannot merge binary files: binary-file (HEAD vs. F)
-ok 5 - refuse to merge binary files
-
-expecting success of 6404.6 'mark rename/delete as unmerged': 
-
-	git reset --hard &&
-	git checkout -b delete &&
-	git rm a1 &&
-	test_tick &&
-	git commit -m delete &&
-	git checkout -b rename HEAD^ &&
-	git mv a1 a2 &&
-	test_tick &&
-	git commit -m rename &&
-	test_must_fail git merge delete &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test 2 = $(git ls-files --unmerged | wc -l)
-	else
-		test 1 = $(git ls-files --unmerged | wc -l)
-	fi &&
-	git rev-parse --verify :2:a2 &&
-	test_must_fail git rev-parse --verify :3:a2 &&
-	git checkout -f delete &&
-	test_must_fail git merge rename &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test 2 = $(git ls-files --unmerged | wc -l)
-	else
-		test 1 = $(git ls-files --unmerged | wc -l)
-	fi &&
-	test_must_fail git rev-parse --verify :2:a2 &&
-	git rev-parse --verify :3:a2
-
-HEAD is now at 4e36843 binary2
-Switched to a new branch 'delete'
-rm 'a1'
-[delete d263b4e] delete
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 a1
-Switched to a new branch 'rename'
-[rename be2bcbd] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a1 => a2 (100%)
-CONFLICT (rename/delete): a1 renamed to a2 in HEAD, but deleted in delete.
-Automatic merge failed; fix conflicts and then commit the result.
-fd7923529855d0b274795ae3349c5e0438333979
-fatal: Needed a single revision
-Switched to branch 'delete'
-CONFLICT (rename/delete): a1 renamed to a2 in rename, but deleted in HEAD.
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Needed a single revision
-fd7923529855d0b274795ae3349c5e0438333979
-ok 6 - mark rename/delete as unmerged
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6405-merge-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6405-merge-symlinks/.git/
-expecting success of 6405.1 'setup': 
-	git config core.symlinks false &&
-	>file &&
-	git add file &&
-	git commit -m initial &&
-	git branch b-symlink &&
-	git branch b-file &&
-	l=$(printf file | git hash-object -t blob -w --stdin) &&
-	echo "120000 $l	symlink" | git update-index --index-info &&
-	git commit -m main &&
-	git checkout b-symlink &&
-	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
-	echo "120000 $l	symlink" | git update-index --index-info &&
-	git commit -m b-symlink &&
-	git checkout b-file &&
-	echo plain-file >symlink &&
-	git add symlink &&
-	git commit -m b-file
-
-[main (root-commit) 6ce5622] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[main 5fce5e3] main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 symlink
-Switched to branch 'b-symlink'
-[b-symlink efc53db] b-symlink
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 symlink
-Switched to branch 'b-file'
-[b-file 32029ee] b-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 symlink
-ok 1 - setup
-
-expecting success of 6405.2 'merge main into b-symlink, which has a different symbolic link': 
-	git checkout b-symlink &&
-	test_must_fail git merge main
-
-Switched to branch 'b-symlink'
-CONFLICT (add/add): Merge conflict in symlink
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - merge main into b-symlink, which has a different symbolic link
-
-expecting success of 6405.3 'the merge result must be a file': 
-	test_path_is_file symlink
-
-ok 3 - the merge result must be a file
-
-expecting success of 6405.4 'merge main into b-file, which has a file instead of a symbolic link': 
-	git reset --hard &&
-	git checkout b-file &&
-	test_must_fail git merge main
-
-HEAD is now at efc53db b-symlink
-Switched to branch 'b-file'
-CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - merge main into b-file, which has a file instead of a symbolic link
-
-expecting success of 6405.5 'the merge result must be a file': 
-	test_path_is_file symlink
-
-ok 5 - the merge result must be a file
-
-expecting success of 6405.6 'merge b-file, which has a file instead of a symbolic link, into main': 
-	git reset --hard &&
-	git checkout main &&
-	test_must_fail git merge b-file
-
-HEAD is now at 32029ee b-file
-Switched to branch 'main'
-CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - merge b-file, which has a file instead of a symbolic link, into main
-
-expecting success of 6405.7 'the merge result must be a file': 
-	test_path_is_file symlink
-
-ok 7 - the merge result must be a file
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6403-merge-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+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)
 
@@ -408174,8 +407860,8 @@
 checking known breakage of 6403.10 'merge result added missing LF': 
 	test_cmp test.txt test2.txt
 
---- test.txt	2026-03-04 08:01:27.503352315 +0000
-+++ test2.txt	2026-03-04 08:01:27.563352315 +0000
+--- test.txt	2025-01-30 02:15:02.385284453 +0000
++++ test2.txt	2025-01-30 02:15:02.433284741 +0000
 @@ -3,7 +3,11 @@
  super aquam refectionis educavit me;
  animam meam convertit,
@@ -408622,6 +408308,221 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6404-recursive-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6404-recursive-merge/.git/
+expecting success of 6404.1 'setup tests': 
+	GIT_TEST_COMMIT_GRAPH=0 &&
+	export GIT_TEST_COMMIT_GRAPH &&
+	echo 1 >a1 &&
+	git add a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
+
+	git checkout -b A main &&
+	echo A >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
+
+	git checkout -b B main &&
+	echo B >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
+
+	git checkout -b D A &&
+	git rev-parse B >.git/MERGE_HEAD &&
+	echo D >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
+
+	git symbolic-ref HEAD refs/heads/other &&
+	echo 2 >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
+
+	git checkout -b C &&
+	echo C >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
+
+	git checkout -b E C &&
+	git rev-parse B >.git/MERGE_HEAD &&
+	echo E >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
+
+	git checkout -b G E &&
+	git rev-parse A >.git/MERGE_HEAD &&
+	echo G >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
+
+	git checkout -b F D &&
+	git rev-parse C >.git/MERGE_HEAD &&
+	echo F >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F &&
+
+	test_oid_cache <<-EOF
+	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
+	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
+	EOF
+
+[main (root-commit) 2cb59ab] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a1
+Switched to a new branch 'A'
+[A 9d821b5] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'B'
+[B 7082aa6] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'D'
+[D e1146db] D
+ Author: A U Thor <author@example.com>
+[other (root-commit) 216d386] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a1
+Switched to a new branch 'C'
+[C d264643] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'E'
+[E 939285a] E
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'G'
+[G 26f86b6] G
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'F'
+[F 71b2f3d] F
+ Author: A U Thor <author@example.com>
+ok 1 - setup tests
+
+expecting success of 6404.2 'combined merge conflicts': 
+	test_must_fail git merge -m final G
+
+  From inner merge:  Auto-merging a1
+  From inner merge:  CONFLICT (add/add): Merge conflict in a1
+  From inner merge:  Auto-merging a1
+  From inner merge:  CONFLICT (content): Merge conflict in a1
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - combined merge conflicts
+
+expecting success of 6404.3 'result contains a conflict': 
+	cat >expect <<-\EOF &&
+	<<<<<<< HEAD
+	F
+	=======
+	G
+	>>>>>>> G
+	EOF
+
+	test_cmp expect a1
+
+ok 3 - result contains a conflict
+
+expecting success of 6404.4 'virtual trees were processed': 
+	# TODO: fragile test, relies on ambigious merge-base resolution
+	git ls-files --stage >out &&
+
+	cat >expect <<-EOF &&
+	100644 $(test_oid idxstage1) 1	a1
+	100644 $(git rev-parse F:a1) 2	a1
+	100644 $(git rev-parse G:a1) 3	a1
+	EOF
+
+	test_cmp expect out
+
+ok 4 - virtual trees were processed
+
+expecting success of 6404.5 'refuse to merge binary files': 
+	git reset --hard &&
+	printf "\0" >binary-file &&
+	git add binary-file &&
+	git commit -m binary &&
+	git checkout G &&
+	printf "\0\0" >binary-file &&
+	git add binary-file &&
+	git commit -m binary2 &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_must_fail git merge F >merge_output
+	else
+		test_must_fail git merge F 2>merge_output
+	fi &&
+	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge_output
+
+HEAD is now at 71b2f3d F
+[F 585846d] binary
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binary-file
+Switched to branch 'G'
+[G 4e36843] binary2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binary-file
+warning: Cannot merge binary files: binary-file (HEAD vs. F)
+ok 5 - refuse to merge binary files
+
+expecting success of 6404.6 'mark rename/delete as unmerged': 
+
+	git reset --hard &&
+	git checkout -b delete &&
+	git rm a1 &&
+	test_tick &&
+	git commit -m delete &&
+	git checkout -b rename HEAD^ &&
+	git mv a1 a2 &&
+	test_tick &&
+	git commit -m rename &&
+	test_must_fail git merge delete &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test 2 = $(git ls-files --unmerged | wc -l)
+	else
+		test 1 = $(git ls-files --unmerged | wc -l)
+	fi &&
+	git rev-parse --verify :2:a2 &&
+	test_must_fail git rev-parse --verify :3:a2 &&
+	git checkout -f delete &&
+	test_must_fail git merge rename &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test 2 = $(git ls-files --unmerged | wc -l)
+	else
+		test 1 = $(git ls-files --unmerged | wc -l)
+	fi &&
+	test_must_fail git rev-parse --verify :2:a2 &&
+	git rev-parse --verify :3:a2
+
+HEAD is now at 4e36843 binary2
+Switched to a new branch 'delete'
+rm 'a1'
+[delete d263b4e] delete
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 a1
+Switched to a new branch 'rename'
+[rename be2bcbd] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a1 => a2 (100%)
+CONFLICT (rename/delete): a1 renamed to a2 in HEAD, but deleted in delete.
+Automatic merge failed; fix conflicts and then commit the result.
+fd7923529855d0b274795ae3349c5e0438333979
+fatal: Needed a single revision
+Switched to branch 'delete'
+CONFLICT (rename/delete): a1 renamed to a2 in rename, but deleted in HEAD.
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Needed a single revision
+fd7923529855d0b274795ae3349c5e0438333979
+ok 6 - mark rename/delete as unmerged
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6302-for-each-ref-filter.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6302-for-each-ref-filter/.git/
 expecting success of 6302.1 'setup some history and refs': 
@@ -409344,6 +409245,97 @@
 1..47
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6405-merge-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6405-merge-symlinks/.git/
+expecting success of 6405.1 'setup': 
+	git config core.symlinks false &&
+	>file &&
+	git add file &&
+	git commit -m initial &&
+	git branch b-symlink &&
+	git branch b-file &&
+	l=$(printf file | git hash-object -t blob -w --stdin) &&
+	echo "120000 $l	symlink" | git update-index --index-info &&
+	git commit -m main &&
+	git checkout b-symlink &&
+	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
+	echo "120000 $l	symlink" | git update-index --index-info &&
+	git commit -m b-symlink &&
+	git checkout b-file &&
+	echo plain-file >symlink &&
+	git add symlink &&
+	git commit -m b-file
+
+[main (root-commit) 6ce5622] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[main 5fce5e3] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 symlink
+Switched to branch 'b-symlink'
+[b-symlink efc53db] b-symlink
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 symlink
+Switched to branch 'b-file'
+[b-file 32029ee] b-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 symlink
+ok 1 - setup
+
+expecting success of 6405.2 'merge main into b-symlink, which has a different symbolic link': 
+	git checkout b-symlink &&
+	test_must_fail git merge main
+
+Switched to branch 'b-symlink'
+CONFLICT (add/add): Merge conflict in symlink
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - merge main into b-symlink, which has a different symbolic link
+
+expecting success of 6405.3 'the merge result must be a file': 
+	test_path_is_file symlink
+
+ok 3 - the merge result must be a file
+
+expecting success of 6405.4 'merge main into b-file, which has a file instead of a symbolic link': 
+	git reset --hard &&
+	git checkout b-file &&
+	test_must_fail git merge main
+
+HEAD is now at efc53db b-symlink
+Switched to branch 'b-file'
+CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - merge main into b-file, which has a file instead of a symbolic link
+
+expecting success of 6405.5 'the merge result must be a file': 
+	test_path_is_file symlink
+
+ok 5 - the merge result must be a file
+
+expecting success of 6405.6 'merge b-file, which has a file instead of a symbolic link, into main': 
+	git reset --hard &&
+	git checkout main &&
+	test_must_fail git merge b-file
+
+HEAD is now at 32029ee b-file
+Switched to branch 'main'
+CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - merge b-file, which has a file instead of a symbolic link, into main
+
+expecting success of 6405.7 'the merge result must be a file': 
+	test_path_is_file symlink
+
+ok 7 - the merge result must be a file
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6200-fmt-merge-msg.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6200-fmt-merge-msg/.git/
 expecting success of 6200.1 'setup': 
@@ -410321,93 +410313,6 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6407-merge-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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_lc9EUJ
-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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6408-merge-up-to-date.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6408-merge-up-to-date/.git/
 expecting success of 6408.1 'setup': 
@@ -410534,6 +410439,93 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6407-merge-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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_plOOqm
+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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6406-merge-attr.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6406-merge-attr/.git/
 expecting success of 6406.1 'setup': 
@@ -410947,64 +410939,6 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6413-merge-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6409-merge-subtree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6409-merge-subtree/.git/
 expecting success of 6409.1 'setup': 
@@ -411266,1294 +411200,62 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6120-describe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/.git/
-expecting success of 6120.1 'setup': 
-	test_commit initial file one &&
-	test_commit second file two &&
-	test_commit third file three &&
-	test_commit --annotate A file A &&
-	test_commit c file c &&
-
-	git reset --hard second &&
-	test_commit --annotate B side B &&
-
-	test_tick &&
-	git merge -m Merged c &&
-	merged=$(git rev-parse HEAD) &&
-
-	git reset --hard second &&
-	test_commit --no-tag D another D &&
-
-	test_tick &&
-	git tag -a -m R R &&
-
-	test_commit e another DD &&
-	test_commit --no-tag "yet another" another DDD &&
-
-	test_tick &&
-	git merge -m Merged $merged &&
-
-	test_commit --no-tag x file
-
-[main (root-commit) 50b0198] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 612fe8f] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main c48449d] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 4185ee1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 2ad5867] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 612fe8f second
-[main ab2da11] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 side
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 612fe8f second
-[main de803f5] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 another
-[main d7863c7] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 2976a87] yet another
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merge made by the 'ort' strategy.
- file | 2 +-
- side | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 side
-[main 8348027] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 6120.2 'describe HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 2 - describe HEAD
-
-expecting success of 6120.3 'describe HEAD^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 3 - describe HEAD^
-
-expecting success of 6120.4 'describe HEAD^^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 4 - describe HEAD^^
-
-expecting success of 6120.5 'describe HEAD^^2': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 5 - describe HEAD^^2
-
-expecting success of 6120.6 'describe HEAD^^2^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 6 - describe HEAD^^2^
-
-expecting success of 6120.7 'describe HEAD^^^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 7 - describe HEAD^^^
-
-expecting success of 6120.8 'describe --tags HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 8 - describe --tags HEAD
-
-expecting success of 6120.9 'describe --tags HEAD^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 9 - describe --tags HEAD^
-
-expecting success of 6120.10 'describe --tags HEAD^^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 10 - describe --tags HEAD^^
-
-expecting success of 6120.11 'describe --tags HEAD^^2': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 11 - describe --tags HEAD^^2
-
-expecting success of 6120.12 'describe --tags HEAD^^2^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 12 - describe --tags HEAD^^2^
-
-expecting success of 6120.13 'describe --tags HEAD^^^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 13 - describe --tags HEAD^^^
-
-expecting success of 6120.14 'describe --tags --exact-match HEAD^^^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 14 - describe --tags --exact-match HEAD^^^
-
-expecting success of 6120.15 'describe --all HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 15 - describe --all HEAD
-
-expecting success of 6120.16 'describe --all HEAD^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 16 - describe --all HEAD^
-
-expecting success of 6120.17 'describe --all HEAD^^^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 17 - describe --all HEAD^^^
-
-expecting success of 6120.18 'describe --long HEAD^^2^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 18 - describe --long HEAD^^2^
-
-expecting success of 6120.19 'describe --long HEAD^^2': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 19 - describe --long HEAD^^2
-
-expecting success of 6120.20 'describe --tags': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 20 - describe --tags
-
-expecting success of 6120.21 'describe --first-parent --tags': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 21 - describe --first-parent --tags
-
-expecting success of 6120.22 'describe --tags --no-exact-match HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 22 - describe --tags --no-exact-match HEAD
-
-expecting success of 6120.23 'describe --first-parent --tags --no-exact-match HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 23 - describe --first-parent --tags --no-exact-match HEAD
-
-expecting success of 6120.24 '--exact-match failure': 
-	test_must_fail git describe --exact-match HEAD 2>err
-
-ok 24 - --exact-match failure
-
-expecting success of 6120.25 'describe --contains defaults to HEAD without commit-ish': 
-	echo "A^0" >expect &&
-	git checkout A &&
-	test_when_finished "git checkout -" &&
-	git describe --contains >actual &&
-	test_cmp expect actual
-
-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 4185ee1 A
-Previous HEAD position was 4185ee1 A
-Switched to branch 'main'
-ok 25 - describe --contains defaults to HEAD without commit-ish
-
-expecting success of 6120.26 'describe --all A^0': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 26 - describe --all A^0
-
-expecting success of 6120.27 'renaming tag A to Q locally produces a warning': 
-	git update-ref refs/tags/Q 55df63e2ee451f5e94b616290370a7fad83fc98b &&
-	git update-ref -d refs/tags/A &&
-	git describe HEAD 2>err >out &&
-	cat >expected <<-\EOF &&
-	warning: tag 'Q' is externally known as 'A'
-	EOF
-	test_cmp expected err &&
-	grep -E '^A-8-g[0-9a-f]+$' out
-
-A-8-g8348027
-ok 27 - renaming tag A to Q locally produces a warning
-
-expecting success of 6120.28 'misnamed annotated tag forces long output': 
-	description=$(git describe --no-long Q^0) &&
-	expr "$description" : "A-0-g[0-9a-f]*$" &&
-	git rev-parse --verify "$description" >actual &&
-	git rev-parse --verify Q^0 >expect &&
-	test_cmp expect actual
-
-warning: tag 'Q' is externally known as 'A'
-12
-ok 28 - misnamed annotated tag forces long output
-
-expecting success of 6120.29 'abbrev=0 will not break misplaced tag (1)': 
-	description=$(git describe --abbrev=0 Q^0) &&
-	expr "$description" : "A-0-g[0-9a-f]*$"
-
-warning: tag 'Q' is externally known as 'A'
-45
-ok 29 - abbrev=0 will not break misplaced tag (1)
-
-expecting success of 6120.30 'abbrev=0 will not break misplaced tag (2)': 
-	description=$(git describe --abbrev=0 c^0) &&
-	expr "$description" : "A-1-g[0-9a-f]*$"
-
-warning: tag 'Q' is externally known as 'A'
-45
-ok 30 - abbrev=0 will not break misplaced tag (2)
-
-expecting success of 6120.31 'rename tag Q back to A': 
-	git update-ref refs/tags/A $(git rev-parse refs/tags/Q) &&
-	git update-ref -d refs/tags/Q
-
-ok 31 - rename tag Q back to A
-
-expecting success of 6120.32 'pack tag refs': git pack-refs
-ok 32 - pack tag refs
-
-expecting success of 6120.33 'describe HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 33 - describe HEAD
-
-expecting success of 6120.34 'describe works from outside repo using --git-dir': 
-	git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" &&
-	git --git-dir "$TRASH_DIRECTORY/bare" describe >out &&
-	grep -E "^A-8-g[0-9a-f]+$" out
-
-Cloning into bare repository '/build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/bare'...
-done.
-A-8-g8348027
-ok 34 - describe works from outside repo using --git-dir
-
-expecting success of 6120.35 'describe --dirty': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 35 - describe --dirty
-
-expecting success of 6120.36 'describe --dirty with --work-tree': 
-	(
-		cd "$TEST_DIRECTORY" &&
-		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
-	) &&
-	grep -E "^A-8-g[0-9a-f]+$" out
-
-A-8-g8348027
-ok 36 - describe --dirty with --work-tree
-
-expecting success of 6120.37 'set-up dirty work tree': 
-	echo >>file
-
-ok 37 - set-up dirty work tree
-
-expecting success of 6120.38 'describe --dirty with --work-tree (dirty)': 
-	git describe --dirty >expected &&
-	(
-		cd "$TEST_DIRECTORY" &&
-		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
-	) &&
-	grep -E "^A-8-g[0-9a-f]+-dirty$" out &&
-	test_cmp expected out
-
-A-8-g8348027-dirty
-ok 38 - describe --dirty with --work-tree (dirty)
-
-expecting success of 6120.39 'describe --dirty=.mod with --work-tree (dirty)': 
-	git describe --dirty=.mod >expected &&
-	(
-		cd "$TEST_DIRECTORY" &&
-		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out"
-	) &&
-	grep -E "^A-8-g[0-9a-f]+.mod$" out &&
-	test_cmp expected out
-
-A-8-g8348027.mod
-ok 39 - describe --dirty=.mod with --work-tree (dirty)
-
-expecting success of 6120.40 'describe --dirty HEAD': 
-	test_must_fail git describe --dirty HEAD
-
-fatal: option '--dirty' and commit-ishes cannot be used together
-ok 40 - describe --dirty HEAD
-
-expecting success of 6120.41 'set-up matching pattern tests': 
-	git tag -a -m test-annotated test-annotated &&
-	echo >>file &&
-	test_tick &&
-	git commit -a -m "one more" &&
-	git tag test1-lightweight &&
-	echo >>file &&
-	test_tick &&
-	git commit -a -m "yet another" &&
-	git tag test2-lightweight &&
-	echo >>file &&
-	test_tick &&
-	git commit -a -m "even more"
-
-
-[main 56c7540] one more
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[main 06348ff] yet another
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 481b98d] even more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 41 - set-up matching pattern tests
-
-expecting success of 6120.42 'describe --match=test-*': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 42 - describe --match=test-*
-
-expecting success of 6120.43 'describe --tags --match=test1-*': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 43 - describe --tags --match=test1-*
-
-expecting success of 6120.44 'describe --tags --match=test2-*': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 44 - describe --tags --match=test2-*
-
-expecting success of 6120.45 'describe --long --tags --match=test2-* HEAD^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 45 - describe --long --tags --match=test2-* HEAD^
-
-expecting success of 6120.46 'describe --long --tags --match=test1-* --match=test2-* HEAD^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 46 - describe --long --tags --match=test1-* --match=test2-* HEAD^
-
-expecting success of 6120.47 'describe --long --tags --match=test1-* --no-match --match=test2-* HEAD^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 47 - describe --long --tags --match=test1-* --no-match --match=test2-* HEAD^
-
-expecting success of 6120.48 'describe --long --tags --match=test1-* --match=test3-* HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 48 - describe --long --tags --match=test1-* --match=test3-* HEAD
-
-expecting success of 6120.49 'describe --long --tags --match=test3-* --match=test1-* HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 49 - describe --long --tags --match=test3-* --match=test1-* HEAD
-
-expecting success of 6120.50 'set-up branches': 
-	git branch branch_A A &&
-	git branch branch_C c &&
-	git update-ref refs/remotes/origin/remote_branch_A "A^{commit}" &&
-	git update-ref refs/remotes/origin/remote_branch_C "c^{commit}" &&
-	git update-ref refs/original/original_branch_A test-annotated~2
-
-ok 50 - set-up branches
-
-expecting success of 6120.51 'describe --all --match=branch_* --exclude=branch_C HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 51 - describe --all --match=branch_* --exclude=branch_C HEAD
-
-expecting success of 6120.52 'describe --all --match=origin/remote_branch_* --exclude=origin/remote_branch_C HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 52 - describe --all --match=origin/remote_branch_* --exclude=origin/remote_branch_C HEAD
-
-expecting success of 6120.53 'describe --all test-annotated~1': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 53 - describe --all test-annotated~1
-
-expecting success of 6120.54 '--match does not work for other types': 
-	test_must_fail git describe --all --match="*original_branch_*" test-annotated~1
-
-fatal: No names found, cannot describe anything.
-ok 54 - --match does not work for other types
-
-expecting success of 6120.55 '--exclude does not work for other types': 
-	R=$(git describe --all --exclude="any_pattern_even_not_matching" test-annotated~1) &&
-	case "$R" in
-	*original_branch_A*) echo "fail: Found unknown reference $R with --exclude"
-		false;;
-	*) echo ok: Found some known type;;
-	esac
-
-ok: Found some known type
-ok 55 - --exclude does not work for other types
-
-expecting success of 6120.56 'name-rev with exact tags': 
-	echo A >expect &&
-	tag_object=$(git rev-parse refs/tags/A) &&
-	git name-rev --tags --name-only $tag_object >actual &&
-	test_cmp expect actual &&
-
-	echo "A^0" >expect &&
-	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
-	git name-rev --tags --name-only $tagged_commit >actual &&
-	test_cmp expect actual
-
-ok 56 - name-rev with exact tags
-
-expecting success of 6120.57 'name-rev --all': 
-	>expect.unsorted &&
-	for rev in $(git rev-list --all)
-	do
-		git name-rev $rev >>expect.unsorted || return 1
-	done &&
-	sort <expect.unsorted >expect &&
-	git name-rev --all >actual.unsorted &&
-	sort <actual.unsorted >actual &&
-	test_cmp expect actual
-
-ok 57 - name-rev --all
-
-expecting success of 6120.58 'name-rev --annotate-stdin': 
-	>expect.unsorted &&
-	for rev in $(git rev-list --all)
-	do
-		name=$(git name-rev --name-only $rev) &&
-		echo "$rev ($name)" >>expect.unsorted || return 1
-	done &&
-	sort <expect.unsorted >expect &&
-	git rev-list --all | git name-rev --annotate-stdin >actual.unsorted &&
-	sort <actual.unsorted >actual &&
-	test_cmp expect actual
-
-ok 58 - name-rev --annotate-stdin
-
-expecting success of 6120.59 'name-rev --stdin deprecated': 
-	git rev-list --all | git name-rev --stdin 2>actual &&
-	grep -E 'warning: --stdin is deprecated' actual
-
-481b98dc759b7c93b0c387163557c00de8889c23 (main)
-06348ffaa4ae1477d2839b428def58f191cf82dd (tags/test2-lightweight)
-56c75406622118002f72e47fa889e63b9ce7eef5 (tags/test1-lightweight)
-834802700a921cf3a66bf0094ec2bbb84f556491 (tags/test-annotated^0)
-f543096ac7562240dea61e024b2aded42890e6e4 (tags/test-annotated~1)
-2976a872ebe86c6743c0b22cc2effc6b6690d35d (tags/test-annotated~2)
-d7863c725e80ded9952135c05aa8e5d6f3c7d5eb (tags/e)
-de803f50907ae7b3a6f342dc5237b17cf363824e (tags/R^0)
-d761ce166f3234debb123d4ccd0429d0122850c8 (tags/test-annotated~1^2)
-ab2da115f9a280ba80846007dce6cde8c8becad6 (tags/B^0)
-2ad58678aa2bf02a72a408d80a6166d995d1108d (tags/c)
-4185ee1c25ca8fa52bf846677e8fb33c39a38326 (tags/A^0)
-c48449d08f67c820485130658d6d4199237173e6 (tags/third)
-612fe8f0dd0c85a77a1743b12ad30b34d52c638a (tags/second)
-50b0198675f2d86e1a5851d6a22cb3f904980f03 (tags/initial)
-warning: --stdin is deprecated. Please use --annotate-stdin instead, which is functionally equivalent.
-ok 59 - name-rev --stdin deprecated
-
-expecting success of 6120.60 'describe --contains with the exact tags': 
-	echo "A^0" >expect &&
-	tag_object=$(git rev-parse refs/tags/A) &&
-	git describe --contains $tag_object >actual &&
-	test_cmp expect actual &&
-
-	echo "A^0" >expect &&
-	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
-	git describe --contains $tagged_commit >actual &&
-	test_cmp expect actual
-
-ok 60 - describe --contains with the exact tags
-
-expecting success of 6120.61 'describe --contains and --match': 
-	echo "A^0" >expect &&
-	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
-	test_must_fail git describe --contains --match="B" $tagged_commit &&
-	git describe --contains --match="B" --match="A" $tagged_commit >actual &&
-	test_cmp expect actual
-
-fatal: cannot describe '4185ee1c25ca8fa52bf846677e8fb33c39a38326'
-ok 61 - describe --contains and --match
-
-expecting success of 6120.62 'describe --exclude': 
-	echo "c~1" >expect &&
-	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
-	test_must_fail git describe --contains --match="B" $tagged_commit &&
-	git describe --contains --match="?" --exclude="A" $tagged_commit >actual &&
-	test_cmp expect actual
-
-fatal: cannot describe '4185ee1c25ca8fa52bf846677e8fb33c39a38326'
-ok 62 - describe --exclude
-
-expecting success of 6120.63 'describe --contains and --no-match': 
-	echo "A^0" >expect &&
-	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
-	git describe --contains --match="B" --no-match $tagged_commit >actual &&
-	test_cmp expect actual
-
-ok 63 - describe --contains and --no-match
-
-expecting success of 6120.64 'setup and absorb a submodule': 
-	test_create_repo sub1 &&
-	test_commit -C sub1 initial &&
-	git submodule add ./sub1 &&
-	git submodule absorbgitdirs &&
-	git commit -a -m "add submodule" &&
-	git describe --dirty >expect &&
-	git describe --broken >out &&
-	test_cmp expect out
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/sub1/.git/
-[main (root-commit) d8072fd] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Adding existing repo at 'sub1' to the index
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/sub1/.git' to
-'/build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/.git/modules/sub1'
-[main b120bfb] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
-ok 64 - setup and absorb a submodule
-
-expecting success of 6120.65 'describe chokes on severely broken submodules': 
-	mv .git/modules/sub1/ .git/modules/sub_moved &&
-	test_must_fail git describe --dirty
-
-fatal: not a git repository: sub1/../.git/modules/sub1
-ok 65 - describe chokes on severely broken submodules
-
-expecting success of 6120.66 'describe ignoring a broken submodule': 
-	git describe --broken >out &&
-	grep broken out
-
-fatal: not a git repository: sub1/../.git/modules/sub1
-test-annotated-4-gb120bfb-broken
-ok 66 - describe ignoring a broken submodule
-
-expecting success of 6120.67 'describe with --work-tree ignoring a broken submodule': 
-	(
-		cd "$TEST_DIRECTORY" &&
-		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --broken >"$TRASH_DIRECTORY/out"
-	) &&
-	test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&
-	grep broken out
-
-fatal: not a git repository: sub1/../.git/modules/sub1
-test-annotated-4-gb120bfb-broken
-ok 67 - describe with --work-tree ignoring a broken submodule
-
-expecting success of 6120.68 'describe a blob at a directly tagged commit': 
-	echo "make it a unique blob" >file &&
-	git add file && git commit -m "content in file" &&
-	git tag -a -m "latest annotated tag" unique-file &&
-	git describe HEAD:file >actual &&
-	echo "unique-file:file" >expect &&
-	test_cmp expect actual
-
-[main 0327ce2] content in file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 5 deletions(-)
-ok 68 - describe a blob at a directly tagged commit
-
-expecting success of 6120.69 'describe a blob with its first introduction': 
-	git commit --allow-empty -m "empty commit" &&
-	git rm file &&
-	git commit -m "delete blob" &&
-	git revert HEAD &&
-	git commit --allow-empty -m "empty commit" &&
-	git describe HEAD:file >actual &&
-	echo "unique-file:file" >expect &&
-	test_cmp expect actual
-
-[main d56ff78] empty commit
- Author: A U Thor <author@example.com>
-rm 'file'
-[main c9d39a6] delete blob
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file
-[main 3aa223e] Revert "delete blob"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:31:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 5b2edfd] empty commit
- Author: A U Thor <author@example.com>
-ok 69 - describe a blob with its first introduction
-
-expecting success of 6120.70 'describe directly tagged blob': 
-	git tag test-blob unique-file:file &&
-	git describe test-blob >actual &&
-	echo "unique-file:file" >expect &&
-	# suboptimal: we rather want to see "test-blob"
-	test_cmp expect actual
-
-ok 70 - describe directly tagged blob
-
-expecting success of 6120.71 'describe tag object': 
-	git tag test-blob-1 -a -m msg unique-file:file &&
-	test_must_fail git describe test-blob-1 2>actual &&
-	test_grep "fatal: test-blob-1 is neither a commit nor blob" actual
-
-fatal: test-blob-1 is neither a commit nor blob
-ok 71 - describe tag object
-
-checking prerequisite: ULIMIT_STACK_SIZE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_STACK_SIZE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_STACK_SIZE" &&
-	test_have_prereq !HPPA,!MINGW,!CYGWIN &&
-	run_with_limited_stack true
-
-)
-prerequisite ULIMIT_STACK_SIZE ok
-expecting success of 6120.72 'name-rev works in a deep repo': 
-	i=1 &&
-	while test $i -lt 8000
-	do
-		echo "commit refs/heads/main
-committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
-data <<EOF
-commit #$i
-EOF" &&
-		if test $i = 1
-		then
-			echo "from refs/heads/main^0"
-		fi &&
-		i=$(($i + 1)) || return 1
-	done | git fast-import &&
-	git checkout main &&
-	git tag far-far-away HEAD^ &&
-	echo "HEAD~4000 tags/far-far-away~3999" >expect &&
-	git name-rev HEAD~4000 >actual &&
-	test_cmp expect actual &&
-	run_with_limited_stack git name-rev HEAD~4000 >actual &&
-	test_cmp expect actual
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:      10000
-Total objects:         7999 (         0 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:         7999 (         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:              5
-Memory total:          2844 KiB
-       pools:          2141 KiB
-     objects:           703 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =       8000
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =    1172067 /    1172067
----------------------------------------------------------------------
-
-Already on 'main'
-ok 72 - name-rev works in a deep repo
-
-expecting success of 6120.73 'describe works in a deep repo': 
-	git tag -f far-far-away HEAD~7999 &&
-	echo "far-far-away" >expect &&
-	git describe --tags --abbrev=0 HEAD~4000 >actual &&
-	test_cmp expect actual &&
-	run_with_limited_stack git describe --tags --abbrev=0 HEAD~4000 >actual &&
-	test_cmp expect actual
-
-Updated tag 'far-far-away' (was 92d391b)
-ok 73 - describe works in a deep repo
-
-expecting success of 6120.74 'describe --all A': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 74 - describe --all A
-
-expecting success of 6120.75 'describe --all c': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 75 - describe --all c
-
-expecting success of 6120.76 'describe --all --match=branch_* branch_A': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 76 - describe --all --match=branch_* branch_A
-
-expecting success of 6120.77 'describe complains about tree object': 
-	test_must_fail git describe HEAD^{tree}
-
-fatal: HEAD^{tree} is neither a commit nor blob
-ok 77 - describe complains about tree object
-
-expecting success of 6120.78 'describe complains about missing object': 
-	test_must_fail git describe $ZERO_OID
-
-fatal: 0000000000000000000000000000000000000000 is neither a commit nor blob
-ok 78 - describe complains about missing object
-
-expecting success of 6120.79 'name-rev a rev shortly after epoch': 
-	test_when_finished "git checkout main" &&
-
-	git checkout --orphan no-timestamp-underflow &&
-	# Any date closer to epoch than the CUTOFF_DATE_SLOP constant
-	# in builtin/name-rev.c.
-	GIT_COMMITTER_DATE="@1234 +0000" \
-	git commit -m "committer date shortly after epoch" &&
-	old_commit_oid=$(git rev-parse HEAD) &&
-
-	echo "$old_commit_oid no-timestamp-underflow" >expect &&
-	git name-rev $old_commit_oid >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'no-timestamp-underflow'
-[no-timestamp-underflow (root-commit) c282cde] committer date shortly after epoch
- Author: A U Thor <author@example.com>
- 5 files changed, 7 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 another
- create mode 100644 file
- create mode 100644 side
- create mode 160000 sub1
-Switched to branch 'main'
-ok 79 - name-rev a rev shortly after epoch
-
-expecting success of 6120.80 'name-rev covers all conditions while looking at parents': 
-	git init repo &&
-	(
-		cd repo &&
-
-		echo A >file &&
-		git add file &&
-		git commit -m A &&
-		A=$(git rev-parse HEAD) &&
-
-		git checkout --detach &&
-		echo B >file &&
-		git commit -m B file &&
-		B=$(git rev-parse HEAD) &&
-
-		git checkout $A &&
-		git merge --no-ff $B &&  # M1
-
-		echo C >file &&
-		git commit -m C file &&
-
-		git checkout $A &&
-		git merge --no-ff HEAD@{1} && # M2
-
-		git checkout main &&
-		git merge --no-ff HEAD@{1} &&
-
-		echo "$B main^2^2~1^2" >expect &&
-		git name-rev $B >actual &&
-
-		test_cmp expect actual
-	)
+*** t6413-merge-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/repo/.git/
-[main (root-commit) 78654cc] A
+[main (root-commit) e0f7379] Initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-HEAD is now at 78654cc A
-[detached HEAD 6b45b22] B
+[main 8798c05] add line from a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6b45b22 B
-
-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> 6b45b22
-
-HEAD is now at 78654cc A
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD ea0b3e9] C
+Switched to branch 'side'
+[side 5296996] add line from b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  ea0b3e9 C
-  212ac67 Merge commit '6b45b22f510f60512eeb67085e7ac91c21fef10c' into HEAD
-  6b45b22 B
-
-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> ea0b3e9
-
-HEAD is now at 78654cc A
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: you are leaving 4 commits behind, not connected to
-any of your branches:
-
-  d9d7e13 Merge commit 'HEAD@{1}' into HEAD
-  ea0b3e9 C
-  212ac67 Merge commit '6b45b22f510f60512eeb67085e7ac91c21fef10c' into HEAD
-  6b45b22 B
-
-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> d9d7e13
-
 Switched to branch 'main'
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 80 - name-rev covers all conditions while looking at parents
-
-expecting success of 6120.81 'non-monotonic commit dates setup': 
-	UNIX_EPOCH_ZERO="@0 +0000" &&
-	git init non-monotonic &&
-	test_commit -C non-monotonic A &&
-	test_commit -C non-monotonic --no-tag B &&
-	test_commit -C non-monotonic --no-tag --date "$UNIX_EPOCH_ZERO" C &&
-	test_commit -C non-monotonic D &&
-	test_commit -C non-monotonic E
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/non-monotonic/.git/
-[main (root-commit) 818c4b4] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main 350dc83] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main f348e82] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[main cc61a00] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[main 4bc3eeb] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-ok 81 - non-monotonic commit dates setup
-
-expecting success of 6120.82 'name-rev with commitGraph handles non-monotonic timestamps': 
-	test_config -C non-monotonic core.commitGraph true &&
-	(
-		cd non-monotonic &&
-
-		git commit-graph write --reachable &&
-
-		echo "main~3 tags/D~2" >expect &&
-		git name-rev --tags main~3 >actual &&
-
-		test_cmp expect actual
-	)
-
-ok 82 - name-rev with commitGraph handles non-monotonic timestamps
-
-expecting success of 6120.83 'name-rev --all works with non-monotonic timestamps': 
-	test_config -C non-monotonic core.commitGraph false &&
-	(
-		cd non-monotonic &&
-
-		rm -rf .git/info/commit-graph* &&
-
-		cat >tags <<-\EOF &&
-		tags/E
-		tags/D
-		tags/D~1
-		tags/D~2
-		tags/A
-		EOF
-
-		git log --pretty=%H >revs &&
-
-		paste -d" " revs tags | sort >expect &&
-
-		git name-rev --tags --all | sort >actual &&
-		test_cmp expect actual
-	)
-
-ok 83 - name-rev --all works with non-monotonic timestamps
-
-expecting success of 6120.84 'name-rev --annotate-stdin works with non-monotonic timestamps': 
-	test_config -C non-monotonic core.commitGraph false &&
-	(
-		cd non-monotonic &&
-
-		rm -rf .git/info/commit-graph* &&
-
-		cat >expect <<-\EOF &&
-		E
-		D
-		D~1
-		D~2
-		A
-		EOF
-
-		git log --pretty=%H >revs &&
-		git name-rev --tags --annotate-stdin --name-only <revs >actual &&
-		test_cmp expect actual
-	)
-
-ok 84 - name-rev --annotate-stdin works with non-monotonic timestamps
-
-expecting success of 6120.85 'name-rev --all works with commitGraph': 
-	test_config -C non-monotonic core.commitGraph true &&
-	(
-		cd non-monotonic &&
-
-		git commit-graph write --reachable &&
-
-		cat >tags <<-\EOF &&
-		tags/E
-		tags/D
-		tags/D~1
-		tags/D~2
-		tags/A
-		EOF
-
-		git log --pretty=%H >revs &&
-
-		paste -d" " revs tags | sort >expect &&
-
-		git name-rev --tags --all | sort >actual &&
-		test_cmp expect actual
-	)
-
-ok 85 - name-rev --all works with commitGraph
-
-expecting success of 6120.86 'name-rev --annotate-stdin works with commitGraph': 
-	test_config -C non-monotonic core.commitGraph true &&
-	(
-		cd non-monotonic &&
-
-		git commit-graph write --reachable &&
-
-		cat >expect <<-\EOF &&
-		E
-		D
-		D~1
-		D~2
-		A
-		EOF
-
-		git log --pretty=%H >revs &&
-		git name-rev --tags --annotate-stdin --name-only <revs >actual &&
-		test_cmp expect actual
-	)
-
-ok 86 - name-rev --annotate-stdin works with commitGraph
-
-expecting success of 6120.87 'setup: describe commits with disjoint bases': 
-	git init disjoint1 &&
-	(
-		cd disjoint1 &&
-
-		echo o >> file && git add file && git commit -m o &&
-		echo A >> file && git add file && git commit -m A &&
-		git tag A -a -m A &&
-		echo o >> file && git add file && git commit -m o &&
-
-		git checkout --orphan branch && rm file &&
-		echo B > file2 && git add file2 && git commit -m B &&
-		git tag B -a -m B &&
-		git merge --no-ff --allow-unrelated-histories main -m x
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/disjoint1/.git/
-[main (root-commit) b0940a9] o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 5301387] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 04035f9] o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'branch'
-[branch (root-commit) 38a9f24] B
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 file
- create mode 100644 file2
-Merge made by the 'ort' strategy.
-ok 87 - setup: describe commits with disjoint bases
-
-expecting success of 6120.88 'describe HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 88 - describe HEAD
-
-expecting success of 6120.89 'setup: describe commits with disjoint bases 2': 
-	git init disjoint2 &&
-	(
-		cd disjoint2 &&
-
-		echo A >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:00" git commit -m A &&
-		git tag A -a -m A &&
-		echo o >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:01" git commit -m o &&
-
-		git checkout --orphan branch &&
-		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:00" git commit -m o &&
-		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:01" git commit -m o &&
-		echo B >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:02" git commit -m B &&
-		git tag B -a -m B &&
-		git merge --no-ff --allow-unrelated-histories main -m x
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/disjoint2/.git/
-[main (root-commit) baf66fb] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 36e11f3] o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'branch'
-[branch (root-commit) 191fdf7] o
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
- create mode 100644 file
- create mode 100644 file2
-[branch f10239c] o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[branch 7ece6d3] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Merge made by the 'ort' strategy.
-ok 89 - setup: describe commits with disjoint bases 2
-
-expecting success of 6120.90 'describe HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 90 - describe HEAD
-
-expecting success of 6120.91 'setup misleading taggerdates': 
-	GIT_COMMITTER_DATE="2006-12-12 12:31" git tag -a -m "another tag" newer-tag-older-commit unique-file~1
-
-ok 91 - setup misleading taggerdates
-
-expecting success of 6120.92 'describe --contains unique-file~2': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 92 - describe --contains unique-file~2
-
-expecting success of 6120.93 'describe --dirty with a file with changed stat': 
-	test_when_finished "rm -fr stat-dirty" &&
-	git init stat-dirty &&
-	(
-		cd stat-dirty &&
-
-		echo A >file &&
-		git add file &&
-		git commit -m A &&
-		git tag A -a -m A &&
-		echo "A" >expect &&
-
-		test-tool chmtime -10 file &&
-		git describe --dirty >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/stat-dirty/.git/
-[main (root-commit) 6147324] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 93 - describe --dirty with a file with changed stat
+ok 1 - setup
 
-expecting success of 6120.94 'describe --broken --dirty with a file with changed stat': 
-	test_when_finished "rm -fr stat-dirty" &&
-	git init stat-dirty &&
-	(
-		cd stat-dirty &&
+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
 
-		echo A >file &&
-		git add file &&
-		git commit -m A &&
-		git tag A -a -m A &&
-		echo "A" >expect &&
+HEAD is now at e0f7379 Initial
+Merge made by the 'ours' strategy.
+ok 2 - Check "ours" is CRLF
 
-		test-tool chmtime -10 file &&
-		git describe --dirty --broken >actual &&
-		test_cmp expect actual
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/stat-dirty/.git/
-[main (root-commit) 6147324] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 94 - describe --broken --dirty with a file with changed stat
+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 94 test(s)
-1..94
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6414-merge-rename-nocruft.sh ***
@@ -413360,8 +412062,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'
@@ -413400,8 +412102,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'
@@ -414940,6 +413642,1296 @@
 1..0 # SKIP skipping case insensitive tests - case sensitive file system
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6120-describe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/.git/
+expecting success of 6120.1 'setup': 
+	test_commit initial file one &&
+	test_commit second file two &&
+	test_commit third file three &&
+	test_commit --annotate A file A &&
+	test_commit c file c &&
+
+	git reset --hard second &&
+	test_commit --annotate B side B &&
+
+	test_tick &&
+	git merge -m Merged c &&
+	merged=$(git rev-parse HEAD) &&
+
+	git reset --hard second &&
+	test_commit --no-tag D another D &&
+
+	test_tick &&
+	git tag -a -m R R &&
+
+	test_commit e another DD &&
+	test_commit --no-tag "yet another" another DDD &&
+
+	test_tick &&
+	git merge -m Merged $merged &&
+
+	test_commit --no-tag x file
+
+[main (root-commit) 50b0198] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 612fe8f] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main c48449d] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 4185ee1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2ad5867] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 612fe8f second
+[main ab2da11] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 612fe8f second
+[main de803f5] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 another
+[main d7863c7] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2976a87] yet another
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ side | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 side
+[main 8348027] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6120.2 'describe HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 2 - describe HEAD
+
+expecting success of 6120.3 'describe HEAD^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 3 - describe HEAD^
+
+expecting success of 6120.4 'describe HEAD^^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 4 - describe HEAD^^
+
+expecting success of 6120.5 'describe HEAD^^2': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 5 - describe HEAD^^2
+
+expecting success of 6120.6 'describe HEAD^^2^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 6 - describe HEAD^^2^
+
+expecting success of 6120.7 'describe HEAD^^^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 7 - describe HEAD^^^
+
+expecting success of 6120.8 'describe --tags HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 8 - describe --tags HEAD
+
+expecting success of 6120.9 'describe --tags HEAD^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 9 - describe --tags HEAD^
+
+expecting success of 6120.10 'describe --tags HEAD^^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 10 - describe --tags HEAD^^
+
+expecting success of 6120.11 'describe --tags HEAD^^2': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 11 - describe --tags HEAD^^2
+
+expecting success of 6120.12 'describe --tags HEAD^^2^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 12 - describe --tags HEAD^^2^
+
+expecting success of 6120.13 'describe --tags HEAD^^^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 13 - describe --tags HEAD^^^
+
+expecting success of 6120.14 'describe --tags --exact-match HEAD^^^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 14 - describe --tags --exact-match HEAD^^^
+
+expecting success of 6120.15 'describe --all HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 15 - describe --all HEAD
+
+expecting success of 6120.16 'describe --all HEAD^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 16 - describe --all HEAD^
+
+expecting success of 6120.17 'describe --all HEAD^^^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 17 - describe --all HEAD^^^
+
+expecting success of 6120.18 'describe --long HEAD^^2^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 18 - describe --long HEAD^^2^
+
+expecting success of 6120.19 'describe --long HEAD^^2': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 19 - describe --long HEAD^^2
+
+expecting success of 6120.20 'describe --tags': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 20 - describe --tags
+
+expecting success of 6120.21 'describe --first-parent --tags': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 21 - describe --first-parent --tags
+
+expecting success of 6120.22 'describe --tags --no-exact-match HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 22 - describe --tags --no-exact-match HEAD
+
+expecting success of 6120.23 'describe --first-parent --tags --no-exact-match HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 23 - describe --first-parent --tags --no-exact-match HEAD
+
+expecting success of 6120.24 '--exact-match failure': 
+	test_must_fail git describe --exact-match HEAD 2>err
+
+ok 24 - --exact-match failure
+
+expecting success of 6120.25 'describe --contains defaults to HEAD without commit-ish': 
+	echo "A^0" >expect &&
+	git checkout A &&
+	test_when_finished "git checkout -" &&
+	git describe --contains >actual &&
+	test_cmp expect actual
+
+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 4185ee1 A
+Previous HEAD position was 4185ee1 A
+Switched to branch 'main'
+ok 25 - describe --contains defaults to HEAD without commit-ish
+
+expecting success of 6120.26 'describe --all A^0': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 26 - describe --all A^0
+
+expecting success of 6120.27 'renaming tag A to Q locally produces a warning': 
+	git update-ref refs/tags/Q 55df63e2ee451f5e94b616290370a7fad83fc98b &&
+	git update-ref -d refs/tags/A &&
+	git describe HEAD 2>err >out &&
+	cat >expected <<-\EOF &&
+	warning: tag 'Q' is externally known as 'A'
+	EOF
+	test_cmp expected err &&
+	grep -E '^A-8-g[0-9a-f]+$' out
+
+A-8-g8348027
+ok 27 - renaming tag A to Q locally produces a warning
+
+expecting success of 6120.28 'misnamed annotated tag forces long output': 
+	description=$(git describe --no-long Q^0) &&
+	expr "$description" : "A-0-g[0-9a-f]*$" &&
+	git rev-parse --verify "$description" >actual &&
+	git rev-parse --verify Q^0 >expect &&
+	test_cmp expect actual
+
+warning: tag 'Q' is externally known as 'A'
+12
+ok 28 - misnamed annotated tag forces long output
+
+expecting success of 6120.29 'abbrev=0 will not break misplaced tag (1)': 
+	description=$(git describe --abbrev=0 Q^0) &&
+	expr "$description" : "A-0-g[0-9a-f]*$"
+
+warning: tag 'Q' is externally known as 'A'
+45
+ok 29 - abbrev=0 will not break misplaced tag (1)
+
+expecting success of 6120.30 'abbrev=0 will not break misplaced tag (2)': 
+	description=$(git describe --abbrev=0 c^0) &&
+	expr "$description" : "A-1-g[0-9a-f]*$"
+
+warning: tag 'Q' is externally known as 'A'
+45
+ok 30 - abbrev=0 will not break misplaced tag (2)
+
+expecting success of 6120.31 'rename tag Q back to A': 
+	git update-ref refs/tags/A $(git rev-parse refs/tags/Q) &&
+	git update-ref -d refs/tags/Q
+
+ok 31 - rename tag Q back to A
+
+expecting success of 6120.32 'pack tag refs': git pack-refs
+ok 32 - pack tag refs
+
+expecting success of 6120.33 'describe HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 33 - describe HEAD
+
+expecting success of 6120.34 'describe works from outside repo using --git-dir': 
+	git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" &&
+	git --git-dir "$TRASH_DIRECTORY/bare" describe >out &&
+	grep -E "^A-8-g[0-9a-f]+$" out
+
+Cloning into bare repository '/build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/bare'...
+done.
+A-8-g8348027
+ok 34 - describe works from outside repo using --git-dir
+
+expecting success of 6120.35 'describe --dirty': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 35 - describe --dirty
+
+expecting success of 6120.36 'describe --dirty with --work-tree': 
+	(
+		cd "$TEST_DIRECTORY" &&
+		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
+	) &&
+	grep -E "^A-8-g[0-9a-f]+$" out
+
+A-8-g8348027
+ok 36 - describe --dirty with --work-tree
+
+expecting success of 6120.37 'set-up dirty work tree': 
+	echo >>file
+
+ok 37 - set-up dirty work tree
+
+expecting success of 6120.38 'describe --dirty with --work-tree (dirty)': 
+	git describe --dirty >expected &&
+	(
+		cd "$TEST_DIRECTORY" &&
+		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
+	) &&
+	grep -E "^A-8-g[0-9a-f]+-dirty$" out &&
+	test_cmp expected out
+
+A-8-g8348027-dirty
+ok 38 - describe --dirty with --work-tree (dirty)
+
+expecting success of 6120.39 'describe --dirty=.mod with --work-tree (dirty)': 
+	git describe --dirty=.mod >expected &&
+	(
+		cd "$TEST_DIRECTORY" &&
+		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out"
+	) &&
+	grep -E "^A-8-g[0-9a-f]+.mod$" out &&
+	test_cmp expected out
+
+A-8-g8348027.mod
+ok 39 - describe --dirty=.mod with --work-tree (dirty)
+
+expecting success of 6120.40 'describe --dirty HEAD': 
+	test_must_fail git describe --dirty HEAD
+
+fatal: option '--dirty' and commit-ishes cannot be used together
+ok 40 - describe --dirty HEAD
+
+expecting success of 6120.41 'set-up matching pattern tests': 
+	git tag -a -m test-annotated test-annotated &&
+	echo >>file &&
+	test_tick &&
+	git commit -a -m "one more" &&
+	git tag test1-lightweight &&
+	echo >>file &&
+	test_tick &&
+	git commit -a -m "yet another" &&
+	git tag test2-lightweight &&
+	echo >>file &&
+	test_tick &&
+	git commit -a -m "even more"
+
+
+[main 56c7540] one more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[main 06348ff] yet another
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 481b98d] even more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 41 - set-up matching pattern tests
+
+expecting success of 6120.42 'describe --match=test-*': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 42 - describe --match=test-*
+
+expecting success of 6120.43 'describe --tags --match=test1-*': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 43 - describe --tags --match=test1-*
+
+expecting success of 6120.44 'describe --tags --match=test2-*': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 44 - describe --tags --match=test2-*
+
+expecting success of 6120.45 'describe --long --tags --match=test2-* HEAD^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 45 - describe --long --tags --match=test2-* HEAD^
+
+expecting success of 6120.46 'describe --long --tags --match=test1-* --match=test2-* HEAD^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 46 - describe --long --tags --match=test1-* --match=test2-* HEAD^
+
+expecting success of 6120.47 'describe --long --tags --match=test1-* --no-match --match=test2-* HEAD^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 47 - describe --long --tags --match=test1-* --no-match --match=test2-* HEAD^
+
+expecting success of 6120.48 'describe --long --tags --match=test1-* --match=test3-* HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 48 - describe --long --tags --match=test1-* --match=test3-* HEAD
+
+expecting success of 6120.49 'describe --long --tags --match=test3-* --match=test1-* HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 49 - describe --long --tags --match=test3-* --match=test1-* HEAD
+
+expecting success of 6120.50 'set-up branches': 
+	git branch branch_A A &&
+	git branch branch_C c &&
+	git update-ref refs/remotes/origin/remote_branch_A "A^{commit}" &&
+	git update-ref refs/remotes/origin/remote_branch_C "c^{commit}" &&
+	git update-ref refs/original/original_branch_A test-annotated~2
+
+ok 50 - set-up branches
+
+expecting success of 6120.51 'describe --all --match=branch_* --exclude=branch_C HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 51 - describe --all --match=branch_* --exclude=branch_C HEAD
+
+expecting success of 6120.52 'describe --all --match=origin/remote_branch_* --exclude=origin/remote_branch_C HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 52 - describe --all --match=origin/remote_branch_* --exclude=origin/remote_branch_C HEAD
+
+expecting success of 6120.53 'describe --all test-annotated~1': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 53 - describe --all test-annotated~1
+
+expecting success of 6120.54 '--match does not work for other types': 
+	test_must_fail git describe --all --match="*original_branch_*" test-annotated~1
+
+fatal: No names found, cannot describe anything.
+ok 54 - --match does not work for other types
+
+expecting success of 6120.55 '--exclude does not work for other types': 
+	R=$(git describe --all --exclude="any_pattern_even_not_matching" test-annotated~1) &&
+	case "$R" in
+	*original_branch_A*) echo "fail: Found unknown reference $R with --exclude"
+		false;;
+	*) echo ok: Found some known type;;
+	esac
+
+ok: Found some known type
+ok 55 - --exclude does not work for other types
+
+expecting success of 6120.56 'name-rev with exact tags': 
+	echo A >expect &&
+	tag_object=$(git rev-parse refs/tags/A) &&
+	git name-rev --tags --name-only $tag_object >actual &&
+	test_cmp expect actual &&
+
+	echo "A^0" >expect &&
+	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
+	git name-rev --tags --name-only $tagged_commit >actual &&
+	test_cmp expect actual
+
+ok 56 - name-rev with exact tags
+
+expecting success of 6120.57 'name-rev --all': 
+	>expect.unsorted &&
+	for rev in $(git rev-list --all)
+	do
+		git name-rev $rev >>expect.unsorted || return 1
+	done &&
+	sort <expect.unsorted >expect &&
+	git name-rev --all >actual.unsorted &&
+	sort <actual.unsorted >actual &&
+	test_cmp expect actual
+
+ok 57 - name-rev --all
+
+expecting success of 6120.58 'name-rev --annotate-stdin': 
+	>expect.unsorted &&
+	for rev in $(git rev-list --all)
+	do
+		name=$(git name-rev --name-only $rev) &&
+		echo "$rev ($name)" >>expect.unsorted || return 1
+	done &&
+	sort <expect.unsorted >expect &&
+	git rev-list --all | git name-rev --annotate-stdin >actual.unsorted &&
+	sort <actual.unsorted >actual &&
+	test_cmp expect actual
+
+ok 58 - name-rev --annotate-stdin
+
+expecting success of 6120.59 'name-rev --stdin deprecated': 
+	git rev-list --all | git name-rev --stdin 2>actual &&
+	grep -E 'warning: --stdin is deprecated' actual
+
+481b98dc759b7c93b0c387163557c00de8889c23 (main)
+06348ffaa4ae1477d2839b428def58f191cf82dd (tags/test2-lightweight)
+56c75406622118002f72e47fa889e63b9ce7eef5 (tags/test1-lightweight)
+834802700a921cf3a66bf0094ec2bbb84f556491 (tags/test-annotated^0)
+f543096ac7562240dea61e024b2aded42890e6e4 (tags/test-annotated~1)
+2976a872ebe86c6743c0b22cc2effc6b6690d35d (tags/test-annotated~2)
+d7863c725e80ded9952135c05aa8e5d6f3c7d5eb (tags/e)
+de803f50907ae7b3a6f342dc5237b17cf363824e (tags/R^0)
+d761ce166f3234debb123d4ccd0429d0122850c8 (tags/test-annotated~1^2)
+ab2da115f9a280ba80846007dce6cde8c8becad6 (tags/B^0)
+2ad58678aa2bf02a72a408d80a6166d995d1108d (tags/c)
+4185ee1c25ca8fa52bf846677e8fb33c39a38326 (tags/A^0)
+c48449d08f67c820485130658d6d4199237173e6 (tags/third)
+612fe8f0dd0c85a77a1743b12ad30b34d52c638a (tags/second)
+50b0198675f2d86e1a5851d6a22cb3f904980f03 (tags/initial)
+warning: --stdin is deprecated. Please use --annotate-stdin instead, which is functionally equivalent.
+ok 59 - name-rev --stdin deprecated
+
+expecting success of 6120.60 'describe --contains with the exact tags': 
+	echo "A^0" >expect &&
+	tag_object=$(git rev-parse refs/tags/A) &&
+	git describe --contains $tag_object >actual &&
+	test_cmp expect actual &&
+
+	echo "A^0" >expect &&
+	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
+	git describe --contains $tagged_commit >actual &&
+	test_cmp expect actual
+
+ok 60 - describe --contains with the exact tags
+
+expecting success of 6120.61 'describe --contains and --match': 
+	echo "A^0" >expect &&
+	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
+	test_must_fail git describe --contains --match="B" $tagged_commit &&
+	git describe --contains --match="B" --match="A" $tagged_commit >actual &&
+	test_cmp expect actual
+
+fatal: cannot describe '4185ee1c25ca8fa52bf846677e8fb33c39a38326'
+ok 61 - describe --contains and --match
+
+expecting success of 6120.62 'describe --exclude': 
+	echo "c~1" >expect &&
+	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
+	test_must_fail git describe --contains --match="B" $tagged_commit &&
+	git describe --contains --match="?" --exclude="A" $tagged_commit >actual &&
+	test_cmp expect actual
+
+fatal: cannot describe '4185ee1c25ca8fa52bf846677e8fb33c39a38326'
+ok 62 - describe --exclude
+
+expecting success of 6120.63 'describe --contains and --no-match': 
+	echo "A^0" >expect &&
+	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
+	git describe --contains --match="B" --no-match $tagged_commit >actual &&
+	test_cmp expect actual
+
+ok 63 - describe --contains and --no-match
+
+expecting success of 6120.64 'setup and absorb a submodule': 
+	test_create_repo sub1 &&
+	test_commit -C sub1 initial &&
+	git submodule add ./sub1 &&
+	git submodule absorbgitdirs &&
+	git commit -a -m "add submodule" &&
+	git describe --dirty >expect &&
+	git describe --broken >out &&
+	test_cmp expect out
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/sub1/.git/
+[main (root-commit) d8072fd] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Adding existing repo at 'sub1' to the index
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/sub1/.git' to
+'/build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/.git/modules/sub1'
+[main b120bfb] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub1
+ok 64 - setup and absorb a submodule
+
+expecting success of 6120.65 'describe chokes on severely broken submodules': 
+	mv .git/modules/sub1/ .git/modules/sub_moved &&
+	test_must_fail git describe --dirty
+
+fatal: not a git repository: sub1/../.git/modules/sub1
+ok 65 - describe chokes on severely broken submodules
+
+expecting success of 6120.66 'describe ignoring a broken submodule': 
+	git describe --broken >out &&
+	grep broken out
+
+fatal: not a git repository: sub1/../.git/modules/sub1
+test-annotated-4-gb120bfb-broken
+ok 66 - describe ignoring a broken submodule
+
+expecting success of 6120.67 'describe with --work-tree ignoring a broken submodule': 
+	(
+		cd "$TEST_DIRECTORY" &&
+		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --broken >"$TRASH_DIRECTORY/out"
+	) &&
+	test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&
+	grep broken out
+
+fatal: not a git repository: sub1/../.git/modules/sub1
+test-annotated-4-gb120bfb-broken
+ok 67 - describe with --work-tree ignoring a broken submodule
+
+expecting success of 6120.68 'describe a blob at a directly tagged commit': 
+	echo "make it a unique blob" >file &&
+	git add file && git commit -m "content in file" &&
+	git tag -a -m "latest annotated tag" unique-file &&
+	git describe HEAD:file >actual &&
+	echo "unique-file:file" >expect &&
+	test_cmp expect actual
+
+[main 0327ce2] content in file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+ok 68 - describe a blob at a directly tagged commit
+
+expecting success of 6120.69 'describe a blob with its first introduction': 
+	git commit --allow-empty -m "empty commit" &&
+	git rm file &&
+	git commit -m "delete blob" &&
+	git revert HEAD &&
+	git commit --allow-empty -m "empty commit" &&
+	git describe HEAD:file >actual &&
+	echo "unique-file:file" >expect &&
+	test_cmp expect actual
+
+[main d56ff78] empty commit
+ Author: A U Thor <author@example.com>
+rm 'file'
+[main c9d39a6] delete blob
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file
+[main 3aa223e] Revert "delete blob"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:31:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 5b2edfd] empty commit
+ Author: A U Thor <author@example.com>
+ok 69 - describe a blob with its first introduction
+
+expecting success of 6120.70 'describe directly tagged blob': 
+	git tag test-blob unique-file:file &&
+	git describe test-blob >actual &&
+	echo "unique-file:file" >expect &&
+	# suboptimal: we rather want to see "test-blob"
+	test_cmp expect actual
+
+ok 70 - describe directly tagged blob
+
+expecting success of 6120.71 'describe tag object': 
+	git tag test-blob-1 -a -m msg unique-file:file &&
+	test_must_fail git describe test-blob-1 2>actual &&
+	test_grep "fatal: test-blob-1 is neither a commit nor blob" actual
+
+fatal: test-blob-1 is neither a commit nor blob
+ok 71 - describe tag object
+
+checking prerequisite: ULIMIT_STACK_SIZE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_STACK_SIZE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_STACK_SIZE" &&
+	test_have_prereq !HPPA,!MINGW,!CYGWIN &&
+	run_with_limited_stack true
+
+)
+prerequisite ULIMIT_STACK_SIZE ok
+expecting success of 6120.72 'name-rev works in a deep repo': 
+	i=1 &&
+	while test $i -lt 8000
+	do
+		echo "commit refs/heads/main
+committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
+data <<EOF
+commit #$i
+EOF" &&
+		if test $i = 1
+		then
+			echo "from refs/heads/main^0"
+		fi &&
+		i=$(($i + 1)) || return 1
+	done | git fast-import &&
+	git checkout main &&
+	git tag far-far-away HEAD^ &&
+	echo "HEAD~4000 tags/far-far-away~3999" >expect &&
+	git name-rev HEAD~4000 >actual &&
+	test_cmp expect actual &&
+	run_with_limited_stack git name-rev HEAD~4000 >actual &&
+	test_cmp expect actual
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:      10000
+Total objects:         7999 (         0 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:         7999 (         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:              5
+Memory total:          2844 KiB
+       pools:          2141 KiB
+     objects:           703 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =       8000
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =    1172067 /    1172067
+---------------------------------------------------------------------
+
+Already on 'main'
+ok 72 - name-rev works in a deep repo
+
+expecting success of 6120.73 'describe works in a deep repo': 
+	git tag -f far-far-away HEAD~7999 &&
+	echo "far-far-away" >expect &&
+	git describe --tags --abbrev=0 HEAD~4000 >actual &&
+	test_cmp expect actual &&
+	run_with_limited_stack git describe --tags --abbrev=0 HEAD~4000 >actual &&
+	test_cmp expect actual
+
+Updated tag 'far-far-away' (was 92d391b)
+ok 73 - describe works in a deep repo
+
+expecting success of 6120.74 'describe --all A': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 74 - describe --all A
+
+expecting success of 6120.75 'describe --all c': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 75 - describe --all c
+
+expecting success of 6120.76 'describe --all --match=branch_* branch_A': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 76 - describe --all --match=branch_* branch_A
+
+expecting success of 6120.77 'describe complains about tree object': 
+	test_must_fail git describe HEAD^{tree}
+
+fatal: HEAD^{tree} is neither a commit nor blob
+ok 77 - describe complains about tree object
+
+expecting success of 6120.78 'describe complains about missing object': 
+	test_must_fail git describe $ZERO_OID
+
+fatal: 0000000000000000000000000000000000000000 is neither a commit nor blob
+ok 78 - describe complains about missing object
+
+expecting success of 6120.79 'name-rev a rev shortly after epoch': 
+	test_when_finished "git checkout main" &&
+
+	git checkout --orphan no-timestamp-underflow &&
+	# Any date closer to epoch than the CUTOFF_DATE_SLOP constant
+	# in builtin/name-rev.c.
+	GIT_COMMITTER_DATE="@1234 +0000" \
+	git commit -m "committer date shortly after epoch" &&
+	old_commit_oid=$(git rev-parse HEAD) &&
+
+	echo "$old_commit_oid no-timestamp-underflow" >expect &&
+	git name-rev $old_commit_oid >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'no-timestamp-underflow'
+[no-timestamp-underflow (root-commit) c282cde] committer date shortly after epoch
+ Author: A U Thor <author@example.com>
+ 5 files changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 another
+ create mode 100644 file
+ create mode 100644 side
+ create mode 160000 sub1
+Switched to branch 'main'
+ok 79 - name-rev a rev shortly after epoch
+
+expecting success of 6120.80 'name-rev covers all conditions while looking at parents': 
+	git init repo &&
+	(
+		cd repo &&
+
+		echo A >file &&
+		git add file &&
+		git commit -m A &&
+		A=$(git rev-parse HEAD) &&
+
+		git checkout --detach &&
+		echo B >file &&
+		git commit -m B file &&
+		B=$(git rev-parse HEAD) &&
+
+		git checkout $A &&
+		git merge --no-ff $B &&  # M1
+
+		echo C >file &&
+		git commit -m C file &&
+
+		git checkout $A &&
+		git merge --no-ff HEAD@{1} && # M2
+
+		git checkout main &&
+		git merge --no-ff HEAD@{1} &&
+
+		echo "$B main^2^2~1^2" >expect &&
+		git name-rev $B >actual &&
+
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/repo/.git/
+[main (root-commit) 78654cc] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+HEAD is now at 78654cc A
+[detached HEAD 6b45b22] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  6b45b22 B
+
+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> 6b45b22
+
+HEAD is now at 78654cc A
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD ea0b3e9] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  ea0b3e9 C
+  212ac67 Merge commit '6b45b22f510f60512eeb67085e7ac91c21fef10c' into HEAD
+  6b45b22 B
+
+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> ea0b3e9
+
+HEAD is now at 78654cc A
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Warning: you are leaving 4 commits behind, not connected to
+any of your branches:
+
+  d9d7e13 Merge commit 'HEAD@{1}' into HEAD
+  ea0b3e9 C
+  212ac67 Merge commit '6b45b22f510f60512eeb67085e7ac91c21fef10c' into HEAD
+  6b45b22 B
+
+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> d9d7e13
+
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 80 - name-rev covers all conditions while looking at parents
+
+expecting success of 6120.81 'non-monotonic commit dates setup': 
+	UNIX_EPOCH_ZERO="@0 +0000" &&
+	git init non-monotonic &&
+	test_commit -C non-monotonic A &&
+	test_commit -C non-monotonic --no-tag B &&
+	test_commit -C non-monotonic --no-tag --date "$UNIX_EPOCH_ZERO" C &&
+	test_commit -C non-monotonic D &&
+	test_commit -C non-monotonic E
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/non-monotonic/.git/
+[main (root-commit) 818c4b4] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main 350dc83] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main f348e82] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[main cc61a00] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[main 4bc3eeb] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+ok 81 - non-monotonic commit dates setup
+
+expecting success of 6120.82 'name-rev with commitGraph handles non-monotonic timestamps': 
+	test_config -C non-monotonic core.commitGraph true &&
+	(
+		cd non-monotonic &&
+
+		git commit-graph write --reachable &&
+
+		echo "main~3 tags/D~2" >expect &&
+		git name-rev --tags main~3 >actual &&
+
+		test_cmp expect actual
+	)
+
+ok 82 - name-rev with commitGraph handles non-monotonic timestamps
+
+expecting success of 6120.83 'name-rev --all works with non-monotonic timestamps': 
+	test_config -C non-monotonic core.commitGraph false &&
+	(
+		cd non-monotonic &&
+
+		rm -rf .git/info/commit-graph* &&
+
+		cat >tags <<-\EOF &&
+		tags/E
+		tags/D
+		tags/D~1
+		tags/D~2
+		tags/A
+		EOF
+
+		git log --pretty=%H >revs &&
+
+		paste -d" " revs tags | sort >expect &&
+
+		git name-rev --tags --all | sort >actual &&
+		test_cmp expect actual
+	)
+
+ok 83 - name-rev --all works with non-monotonic timestamps
+
+expecting success of 6120.84 'name-rev --annotate-stdin works with non-monotonic timestamps': 
+	test_config -C non-monotonic core.commitGraph false &&
+	(
+		cd non-monotonic &&
+
+		rm -rf .git/info/commit-graph* &&
+
+		cat >expect <<-\EOF &&
+		E
+		D
+		D~1
+		D~2
+		A
+		EOF
+
+		git log --pretty=%H >revs &&
+		git name-rev --tags --annotate-stdin --name-only <revs >actual &&
+		test_cmp expect actual
+	)
+
+ok 84 - name-rev --annotate-stdin works with non-monotonic timestamps
+
+expecting success of 6120.85 'name-rev --all works with commitGraph': 
+	test_config -C non-monotonic core.commitGraph true &&
+	(
+		cd non-monotonic &&
+
+		git commit-graph write --reachable &&
+
+		cat >tags <<-\EOF &&
+		tags/E
+		tags/D
+		tags/D~1
+		tags/D~2
+		tags/A
+		EOF
+
+		git log --pretty=%H >revs &&
+
+		paste -d" " revs tags | sort >expect &&
+
+		git name-rev --tags --all | sort >actual &&
+		test_cmp expect actual
+	)
+
+ok 85 - name-rev --all works with commitGraph
+
+expecting success of 6120.86 'name-rev --annotate-stdin works with commitGraph': 
+	test_config -C non-monotonic core.commitGraph true &&
+	(
+		cd non-monotonic &&
+
+		git commit-graph write --reachable &&
+
+		cat >expect <<-\EOF &&
+		E
+		D
+		D~1
+		D~2
+		A
+		EOF
+
+		git log --pretty=%H >revs &&
+		git name-rev --tags --annotate-stdin --name-only <revs >actual &&
+		test_cmp expect actual
+	)
+
+ok 86 - name-rev --annotate-stdin works with commitGraph
+
+expecting success of 6120.87 'setup: describe commits with disjoint bases': 
+	git init disjoint1 &&
+	(
+		cd disjoint1 &&
+
+		echo o >> file && git add file && git commit -m o &&
+		echo A >> file && git add file && git commit -m A &&
+		git tag A -a -m A &&
+		echo o >> file && git add file && git commit -m o &&
+
+		git checkout --orphan branch && rm file &&
+		echo B > file2 && git add file2 && git commit -m B &&
+		git tag B -a -m B &&
+		git merge --no-ff --allow-unrelated-histories main -m x
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/disjoint1/.git/
+[main (root-commit) b0940a9] o
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 5301387] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 04035f9] o
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'branch'
+[branch (root-commit) 38a9f24] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 file
+ create mode 100644 file2
+Merge made by the 'ort' strategy.
+ok 87 - setup: describe commits with disjoint bases
+
+expecting success of 6120.88 'describe HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 88 - describe HEAD
+
+expecting success of 6120.89 'setup: describe commits with disjoint bases 2': 
+	git init disjoint2 &&
+	(
+		cd disjoint2 &&
+
+		echo A >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:00" git commit -m A &&
+		git tag A -a -m A &&
+		echo o >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:01" git commit -m o &&
+
+		git checkout --orphan branch &&
+		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:00" git commit -m o &&
+		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:01" git commit -m o &&
+		echo B >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:02" git commit -m B &&
+		git tag B -a -m B &&
+		git merge --no-ff --allow-unrelated-histories main -m x
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/disjoint2/.git/
+[main (root-commit) baf66fb] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 36e11f3] o
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'branch'
+[branch (root-commit) 191fdf7] o
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ create mode 100644 file
+ create mode 100644 file2
+[branch f10239c] o
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[branch 7ece6d3] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Merge made by the 'ort' strategy.
+ok 89 - setup: describe commits with disjoint bases 2
+
+expecting success of 6120.90 'describe HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 90 - describe HEAD
+
+expecting success of 6120.91 'setup misleading taggerdates': 
+	GIT_COMMITTER_DATE="2006-12-12 12:31" git tag -a -m "another tag" newer-tag-older-commit unique-file~1
+
+ok 91 - setup misleading taggerdates
+
+expecting success of 6120.92 'describe --contains unique-file~2': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 92 - describe --contains unique-file~2
+
+expecting success of 6120.93 'describe --dirty with a file with changed stat': 
+	test_when_finished "rm -fr stat-dirty" &&
+	git init stat-dirty &&
+	(
+		cd stat-dirty &&
+
+		echo A >file &&
+		git add file &&
+		git commit -m A &&
+		git tag A -a -m A &&
+		echo "A" >expect &&
+
+		test-tool chmtime -10 file &&
+		git describe --dirty >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/stat-dirty/.git/
+[main (root-commit) 6147324] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 93 - describe --dirty with a file with changed stat
+
+expecting success of 6120.94 'describe --broken --dirty with a file with changed stat': 
+	test_when_finished "rm -fr stat-dirty" &&
+	git init stat-dirty &&
+	(
+		cd stat-dirty &&
+
+		echo A >file &&
+		git add file &&
+		git commit -m A &&
+		git tag A -a -m A &&
+		echo "A" >expect &&
+
+		test-tool chmtime -10 file &&
+		git describe --dirty --broken >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6120-describe/stat-dirty/.git/
+[main (root-commit) 6147324] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 94 - describe --broken --dirty with a file with changed stat
+
+# passed all 94 test(s)
+1..94
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6417-merge-ours-theirs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6417-merge-ours-theirs/.git/
 expecting success of 6417.1 'setup': 
@@ -415567,1066 +415559,227 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6421-merge-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-	)
+*** t6412-merge-large-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6412-merge-large-rename/.git/
+expecting success of 6412.1 'setup (initial)': 
+	touch file &&
+	git add . &&
+	git commit -m initial &&
+	git tag initial
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+[main (root-commit) 6ce5622] initial
  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
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+ok 1 - setup (initial)
+
+expecting success of 6412.2 'rename (5, ok)': 
+	n=5 &&
+	expect=ok &&
+	git checkout -f main &&
+	test_might_fail git branch -D test$n &&
+	git reset --hard initial &&
+	for i in $(count $n); do
+		make_text $i initial initial >$i || return 1
+	done &&
+	git add . &&
+	git commit -m add=$n &&
+	for i in $(count $n); do
+		make_text $i changed initial >$i || return 1
+	done &&
+	git commit -a -m change=$n &&
+	git checkout -b test$n HEAD^ &&
+	for i in $(count $n); do
+		git rm $i &&
+		make_text $i initial changed >$i.moved || return 1
+	done &&
+	git add . &&
+	git commit -m change+rename=$n &&
+	case "$expect" in
+		ok) git merge main ;;
+		 *) test_must_fail git merge main ;;
+	esac
+	
+Already on 'main'
+error: branch 'test5' not found
+HEAD is now at 6ce5622 initial
+[main c717f7b] add=5
  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
+ 5 files changed, 110 insertions(+)
+ create mode 100644 1
+ create mode 100644 2
+ create mode 100644 3
+ create mode 100644 4
+ create mode 100644 5
+[main c9ccf89] change=5
  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
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+Switched to a new branch 'test5'
+rm '1'
+rm '2'
+rm '3'
+rm '4'
+rm '5'
+[test5 2d6f47f] change+rename=5
  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
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+ rename 1 => 1.moved (91%)
+ rename 2 => 2.moved (91%)
+ rename 3 => 3.moved (91%)
+ rename 4 => 4.moved (91%)
+ rename 5 => 5.moved (91%)
+Auto-merging 1.moved
+Auto-merging 2.moved
+Auto-merging 3.moved
+Auto-merging 4.moved
+Auto-merging 5.moved
 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 &&
+ 1.moved | 2 +-
+ 2.moved | 2 +-
+ 3.moved | 2 +-
+ 4.moved | 2 +-
+ 5.moved | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+ok 2 - rename (5, ok)
 
-		# 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 &&
+expecting success of 6412.3 'set diff.renamelimit to 4': 
+	git config diff.renamelimit 4
 
-		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
-	)
+ok 3 - set diff.renamelimit to 4
 
-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.
+expecting success of 6412.4 'rename (4, ok)': 
+	n=4 &&
+	expect=ok &&
+	git checkout -f main &&
+	test_might_fail git branch -D test$n &&
+	git reset --hard initial &&
+	for i in $(count $n); do
+		make_text $i initial initial >$i || return 1
+	done &&
+	git add . &&
+	git commit -m add=$n &&
+	for i in $(count $n); do
+		make_text $i changed initial >$i || return 1
+	done &&
+	git commit -a -m change=$n &&
+	git checkout -b test$n HEAD^ &&
+	for i in $(count $n); do
+		git rm $i &&
+		make_text $i initial changed >$i.moved || return 1
+	done &&
+	git add . &&
+	git commit -m change+rename=$n &&
+	case "$expect" in
+		ok) git merge main ;;
+		 *) test_must_fail git merge main ;;
+	esac
+	
+Switched to branch 'main'
+error: branch 'test4' not found
+HEAD is now at 6ce5622 initial
+[main afd3780] add=4
+ Author: A U Thor <author@example.com>
+ 4 files changed, 88 insertions(+)
+ create mode 100644 1
+ create mode 100644 2
+ create mode 100644 3
+ create mode 100644 4
+[main 3b454a4] change=4
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+Switched to a new branch 'test4'
+rm '1'
+rm '2'
+rm '3'
+rm '4'
+[test4 39a2161] change+rename=4
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+ rename 1 => 1.moved (91%)
+ rename 2 => 2.moved (91%)
+ rename 3 => 3.moved (91%)
+ rename 4 => 4.moved (91%)
+Auto-merging 1.moved
+Auto-merging 2.moved
+Auto-merging 3.moved
+Auto-merging 4.moved
 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 &&
+ 1.moved | 2 +-
+ 2.moved | 2 +-
+ 3.moved | 2 +-
+ 4.moved | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+ok 4 - rename (4, ok)
 
-		git checkout -q origin/A &&
+expecting success of 6412.5 'rename (5, fail)': 
+	n=5 &&
+	expect=fail &&
+	git checkout -f main &&
+	test_might_fail git branch -D test$n &&
+	git reset --hard initial &&
+	for i in $(count $n); do
+		make_text $i initial initial >$i || return 1
+	done &&
+	git add . &&
+	git commit -m add=$n &&
+	for i in $(count $n); do
+		make_text $i changed initial >$i || return 1
+	done &&
+	git commit -a -m change=$n &&
+	git checkout -b test$n HEAD^ &&
+	for i in $(count $n); do
+		git rm $i &&
+		make_text $i initial changed >$i.moved || return 1
+	done &&
+	git add . &&
+	git commit -m change+rename=$n &&
+	case "$expect" in
+		ok) git merge main ;;
+		 *) test_must_fail git merge main ;;
+	esac
+	
+Switched to branch 'main'
+Deleted branch test5 (was 4b646a2).
+HEAD is now at 6ce5622 initial
+[main c717f7b] add=5
+ Author: A U Thor <author@example.com>
+ 5 files changed, 110 insertions(+)
+ create mode 100644 1
+ create mode 100644 2
+ create mode 100644 3
+ create mode 100644 4
+ create mode 100644 5
+[main c9ccf89] change=5
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+Switched to a new branch 'test5'
+rm '1'
+rm '2'
+rm '3'
+rm '4'
+rm '5'
+[test5 2d6f47f] change+rename=5
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+ rename 1 => 1.moved (91%)
+ rename 2 => 2.moved (91%)
+ rename 3 => 3.moved (91%)
+ rename 4 => 4.moved (91%)
+ rename 5 => 5.moved (91%)
+CONFLICT (modify/delete): 1 deleted in HEAD and modified in main.  Version main of 1 left in tree.
+CONFLICT (modify/delete): 2 deleted in HEAD and modified in main.  Version main of 2 left in tree.
+CONFLICT (modify/delete): 3 deleted in HEAD and modified in main.  Version main of 3 left in tree.
+CONFLICT (modify/delete): 4 deleted in HEAD and modified in main.  Version main of 4 left in tree.
+CONFLICT (modify/delete): 5 deleted in HEAD and modified in main.  Version main of 5 left in tree.
+warning: exhaustive rename detection was skipped due to too many files.
+warning: you may want to set your merge.renamelimit variable to at least 5 and retry the command.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 5 - rename (5, fail)
 
-		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
-			-c merge.directoryRenames=true merge --no-stat \
-			--no-progress origin/B-many &&
+expecting success of 6412.6 'set merge.renamelimit to 5': 
+	git config merge.renamelimit 5
 
-		# 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6415-merge-dir-to-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6415-merge-dir-to-symlink/.git/
-expecting success of 6415.1 'create a commit where dir a/b changed to symlink': 
-	mkdir -p a/b/c a/b-2/c &&
-	> a/b/c/d &&
-	> a/b-2/c/d &&
-	> a/x &&
-	git add -A &&
-	git commit -m base &&
-	git tag start &&
-	rm -rf a/b &&
-	git add -A &&
-	test_ln_s_add b-2 a/b &&
-	git commit -m "dir to symlink"
-
-[main (root-commit) d2c335b] base
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/b-2/c/d
- create mode 100644 a/b/c/d
- create mode 100644 a/x
-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 1750beb] dir to symlink
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 a/b
- delete mode 100644 a/b/c/d
-ok 1 - create a commit where dir a/b changed to symlink
-
-expecting success of 6415.2 'checkout does not clobber untracked symlink': 
-	git checkout HEAD^0 &&
-	git reset --hard main &&
-	git rm --cached a/b &&
-	git commit -m "untracked symlink remains" &&
-	test_must_fail git checkout start^0 &&
-	git clean -fd    # Do not leave the untracked symlink in the way
-
-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 1750beb dir to symlink
-HEAD is now at 1750beb dir to symlink
-rm 'a/b'
-[detached HEAD 87dcb4b] untracked symlink remains
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 120000 a/b
-error: The following untracked working tree files would be overwritten by checkout:
-	a/b
-Please move or remove them before you switch branches.
-Aborting
-Removing a/b
-ok 2 - checkout does not clobber untracked symlink
-
-expecting success of 6415.3 'a/b-2/c/d is kept when clobbering symlink b': 
-	git checkout HEAD^0 &&
-	git reset --hard main &&
-	git rm --cached a/b &&
-	git commit -m "untracked symlink remains" &&
-	git checkout -f start^0 &&
-	test_path_is_file a/b-2/c/d &&
-	git clean -fd    # Do not leave the untracked symlink in the way
-
-HEAD is now at 87dcb4b untracked symlink remains
-HEAD is now at 1750beb dir to symlink
-rm 'a/b'
-[detached HEAD 87dcb4b] untracked symlink remains
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 120000 a/b
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  87dcb4b untracked symlink remains
-
-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> 87dcb4b
-
-HEAD is now at d2c335b base
-ok 3 - a/b-2/c/d is kept when clobbering symlink b
-
-expecting success of 6415.4 'checkout should not have deleted a/b-2/c/d': 
-	git checkout HEAD^0 &&
-	git reset --hard main &&
-	 git checkout start^0 &&
-	 test_path_is_file a/b-2/c/d
-
-HEAD is now at d2c335b base
-HEAD is now at 1750beb dir to symlink
-Previous HEAD position was 1750beb dir to symlink
-HEAD is now at d2c335b base
-ok 4 - checkout should not have deleted a/b-2/c/d
-
-expecting success of 6415.5 'setup for merge test': 
-	git reset --hard &&
-	test_path_is_file a/b-2/c/d &&
-	echo x > a/x &&
-	git add a/x &&
-	git commit -m x &&
-	git tag baseline
-
-HEAD is now at d2c335b base
-[detached HEAD d35741f] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 5 - setup for merge test
-
-expecting success of 6415.6 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)': 
-	git reset --hard &&
-	git checkout baseline^0 &&
-	git merge -s resolve main &&
-	test_path_is_file a/b-2/c/d
-
-HEAD is now at d35741f x
-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
-ok 6 - Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)
-
-expecting success of 6415.7 'a/b was resolved as symlink': 
-	test -h a/b
-
-ok 7 - a/b was resolved as symlink
-
-expecting success of 6415.8 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)': 
-	git reset --hard &&
-	git checkout baseline^0 &&
-	git merge -s recursive main &&
-	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
-Merge made by the 'ort' 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
-ok 8 - Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)
-
-expecting success of 6415.9 'a/b was resolved as symlink': 
-	test -h a/b
-
-ok 9 - a/b was resolved as symlink
-
-expecting success of 6415.10 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)': 
-	git reset --hard &&
-	git checkout main^0 &&
-	git merge -s resolve baseline^0 &&
-	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 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 'ort' 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 ort 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 ort 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 'ort' 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 'ort' 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6412-merge-large-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6412-merge-large-rename/.git/
-expecting success of 6412.1 'setup (initial)': 
-	touch file &&
-	git add . &&
-	git commit -m initial &&
-	git tag initial
-
-[main (root-commit) 6ce5622] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-ok 1 - setup (initial)
-
-expecting success of 6412.2 'rename (5, ok)': 
-	n=5 &&
-	expect=ok &&
-	git checkout -f main &&
-	test_might_fail git branch -D test$n &&
-	git reset --hard initial &&
-	for i in $(count $n); do
-		make_text $i initial initial >$i || return 1
-	done &&
-	git add . &&
-	git commit -m add=$n &&
-	for i in $(count $n); do
-		make_text $i changed initial >$i || return 1
-	done &&
-	git commit -a -m change=$n &&
-	git checkout -b test$n HEAD^ &&
-	for i in $(count $n); do
-		git rm $i &&
-		make_text $i initial changed >$i.moved || return 1
-	done &&
-	git add . &&
-	git commit -m change+rename=$n &&
-	case "$expect" in
-		ok) git merge main ;;
-		 *) test_must_fail git merge main ;;
-	esac
-	
-Already on 'main'
-error: branch 'test5' not found
-HEAD is now at 6ce5622 initial
-[main c717f7b] add=5
- Author: A U Thor <author@example.com>
- 5 files changed, 110 insertions(+)
- create mode 100644 1
- create mode 100644 2
- create mode 100644 3
- create mode 100644 4
- create mode 100644 5
-[main c9ccf89] change=5
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+), 5 deletions(-)
-Switched to a new branch 'test5'
-rm '1'
-rm '2'
-rm '3'
-rm '4'
-rm '5'
-[test5 2d6f47f] change+rename=5
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+), 5 deletions(-)
- rename 1 => 1.moved (91%)
- rename 2 => 2.moved (91%)
- rename 3 => 3.moved (91%)
- rename 4 => 4.moved (91%)
- rename 5 => 5.moved (91%)
-Auto-merging 1.moved
-Auto-merging 2.moved
-Auto-merging 3.moved
-Auto-merging 4.moved
-Auto-merging 5.moved
-Merge made by the 'ort' strategy.
- 1.moved | 2 +-
- 2.moved | 2 +-
- 3.moved | 2 +-
- 4.moved | 2 +-
- 5.moved | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-ok 2 - rename (5, ok)
-
-expecting success of 6412.3 'set diff.renamelimit to 4': 
-	git config diff.renamelimit 4
-
-ok 3 - set diff.renamelimit to 4
-
-expecting success of 6412.4 'rename (4, ok)': 
-	n=4 &&
-	expect=ok &&
-	git checkout -f main &&
-	test_might_fail git branch -D test$n &&
-	git reset --hard initial &&
-	for i in $(count $n); do
-		make_text $i initial initial >$i || return 1
-	done &&
-	git add . &&
-	git commit -m add=$n &&
-	for i in $(count $n); do
-		make_text $i changed initial >$i || return 1
-	done &&
-	git commit -a -m change=$n &&
-	git checkout -b test$n HEAD^ &&
-	for i in $(count $n); do
-		git rm $i &&
-		make_text $i initial changed >$i.moved || return 1
-	done &&
-	git add . &&
-	git commit -m change+rename=$n &&
-	case "$expect" in
-		ok) git merge main ;;
-		 *) test_must_fail git merge main ;;
-	esac
-	
-Switched to branch 'main'
-error: branch 'test4' not found
-HEAD is now at 6ce5622 initial
-[main afd3780] add=4
- Author: A U Thor <author@example.com>
- 4 files changed, 88 insertions(+)
- create mode 100644 1
- create mode 100644 2
- create mode 100644 3
- create mode 100644 4
-[main 3b454a4] change=4
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+), 4 deletions(-)
-Switched to a new branch 'test4'
-rm '1'
-rm '2'
-rm '3'
-rm '4'
-[test4 39a2161] change+rename=4
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+), 4 deletions(-)
- rename 1 => 1.moved (91%)
- rename 2 => 2.moved (91%)
- rename 3 => 3.moved (91%)
- rename 4 => 4.moved (91%)
-Auto-merging 1.moved
-Auto-merging 2.moved
-Auto-merging 3.moved
-Auto-merging 4.moved
-Merge made by the 'ort' strategy.
- 1.moved | 2 +-
- 2.moved | 2 +-
- 3.moved | 2 +-
- 4.moved | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-ok 4 - rename (4, ok)
-
-expecting success of 6412.5 'rename (5, fail)': 
-	n=5 &&
-	expect=fail &&
-	git checkout -f main &&
-	test_might_fail git branch -D test$n &&
-	git reset --hard initial &&
-	for i in $(count $n); do
-		make_text $i initial initial >$i || return 1
-	done &&
-	git add . &&
-	git commit -m add=$n &&
-	for i in $(count $n); do
-		make_text $i changed initial >$i || return 1
-	done &&
-	git commit -a -m change=$n &&
-	git checkout -b test$n HEAD^ &&
-	for i in $(count $n); do
-		git rm $i &&
-		make_text $i initial changed >$i.moved || return 1
-	done &&
-	git add . &&
-	git commit -m change+rename=$n &&
-	case "$expect" in
-		ok) git merge main ;;
-		 *) test_must_fail git merge main ;;
-	esac
-	
-Switched to branch 'main'
-Deleted branch test5 (was 4b646a2).
-HEAD is now at 6ce5622 initial
-[main c717f7b] add=5
- Author: A U Thor <author@example.com>
- 5 files changed, 110 insertions(+)
- create mode 100644 1
- create mode 100644 2
- create mode 100644 3
- create mode 100644 4
- create mode 100644 5
-[main c9ccf89] change=5
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+), 5 deletions(-)
-Switched to a new branch 'test5'
-rm '1'
-rm '2'
-rm '3'
-rm '4'
-rm '5'
-[test5 2d6f47f] change+rename=5
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+), 5 deletions(-)
- rename 1 => 1.moved (91%)
- rename 2 => 2.moved (91%)
- rename 3 => 3.moved (91%)
- rename 4 => 4.moved (91%)
- rename 5 => 5.moved (91%)
-CONFLICT (modify/delete): 1 deleted in HEAD and modified in main.  Version main of 1 left in tree.
-CONFLICT (modify/delete): 2 deleted in HEAD and modified in main.  Version main of 2 left in tree.
-CONFLICT (modify/delete): 3 deleted in HEAD and modified in main.  Version main of 3 left in tree.
-CONFLICT (modify/delete): 4 deleted in HEAD and modified in main.  Version main of 4 left in tree.
-CONFLICT (modify/delete): 5 deleted in HEAD and modified in main.  Version main of 5 left in tree.
-warning: exhaustive rename detection was skipped due to too many files.
-warning: you may want to set your merge.renamelimit variable to at least 5 and retry the command.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 5 - rename (5, fail)
-
-expecting success of 6412.6 'set merge.renamelimit to 5': 
-	git config merge.renamelimit 5
-
-ok 6 - set merge.renamelimit to 5
+ok 6 - set merge.renamelimit to 5
 
 expecting success of 6412.7 'rename (5, ok)': 
 	n=5 &&
@@ -417215,6 +416368,391 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6421-merge-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6425-merge-rename-delete.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6425-merge-rename-delete/.git/
 expecting success of 6425.1 'rename/delete': 
@@ -417257,6 +416795,1212 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6415-merge-dir-to-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6415-merge-dir-to-symlink/.git/
+expecting success of 6415.1 'create a commit where dir a/b changed to symlink': 
+	mkdir -p a/b/c a/b-2/c &&
+	> a/b/c/d &&
+	> a/b-2/c/d &&
+	> a/x &&
+	git add -A &&
+	git commit -m base &&
+	git tag start &&
+	rm -rf a/b &&
+	git add -A &&
+	test_ln_s_add b-2 a/b &&
+	git commit -m "dir to symlink"
+
+[main (root-commit) d2c335b] base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/b-2/c/d
+ create mode 100644 a/b/c/d
+ create mode 100644 a/x
+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 1750beb] dir to symlink
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 120000 a/b
+ delete mode 100644 a/b/c/d
+ok 1 - create a commit where dir a/b changed to symlink
+
+expecting success of 6415.2 'checkout does not clobber untracked symlink': 
+	git checkout HEAD^0 &&
+	git reset --hard main &&
+	git rm --cached a/b &&
+	git commit -m "untracked symlink remains" &&
+	test_must_fail git checkout start^0 &&
+	git clean -fd    # Do not leave the untracked symlink in the way
+
+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 1750beb dir to symlink
+HEAD is now at 1750beb dir to symlink
+rm 'a/b'
+[detached HEAD 87dcb4b] untracked symlink remains
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 120000 a/b
+error: The following untracked working tree files would be overwritten by checkout:
+	a/b
+Please move or remove them before you switch branches.
+Aborting
+Removing a/b
+ok 2 - checkout does not clobber untracked symlink
+
+expecting success of 6415.3 'a/b-2/c/d is kept when clobbering symlink b': 
+	git checkout HEAD^0 &&
+	git reset --hard main &&
+	git rm --cached a/b &&
+	git commit -m "untracked symlink remains" &&
+	git checkout -f start^0 &&
+	test_path_is_file a/b-2/c/d &&
+	git clean -fd    # Do not leave the untracked symlink in the way
+
+HEAD is now at 87dcb4b untracked symlink remains
+HEAD is now at 1750beb dir to symlink
+rm 'a/b'
+[detached HEAD 87dcb4b] untracked symlink remains
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 120000 a/b
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  87dcb4b untracked symlink remains
+
+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> 87dcb4b
+
+HEAD is now at d2c335b base
+ok 3 - a/b-2/c/d is kept when clobbering symlink b
+
+expecting success of 6415.4 'checkout should not have deleted a/b-2/c/d': 
+	git checkout HEAD^0 &&
+	git reset --hard main &&
+	 git checkout start^0 &&
+	 test_path_is_file a/b-2/c/d
+
+HEAD is now at d2c335b base
+HEAD is now at 1750beb dir to symlink
+Previous HEAD position was 1750beb dir to symlink
+HEAD is now at d2c335b base
+ok 4 - checkout should not have deleted a/b-2/c/d
+
+expecting success of 6415.5 'setup for merge test': 
+	git reset --hard &&
+	test_path_is_file a/b-2/c/d &&
+	echo x > a/x &&
+	git add a/x &&
+	git commit -m x &&
+	git tag baseline
+
+HEAD is now at d2c335b base
+[detached HEAD d35741f] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 5 - setup for merge test
+
+expecting success of 6415.6 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)': 
+	git reset --hard &&
+	git checkout baseline^0 &&
+	git merge -s resolve main &&
+	test_path_is_file a/b-2/c/d
+
+HEAD is now at d35741f x
+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
+ok 6 - Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)
+
+expecting success of 6415.7 'a/b was resolved as symlink': 
+	test -h a/b
+
+ok 7 - a/b was resolved as symlink
+
+expecting success of 6415.8 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)': 
+	git reset --hard &&
+	git checkout baseline^0 &&
+	git merge -s recursive main &&
+	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
+Merge made by the 'ort' 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
+ok 8 - Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)
+
+expecting success of 6415.9 'a/b was resolved as symlink': 
+	test -h a/b
+
+ok 9 - a/b was resolved as symlink
+
+expecting success of 6415.10 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)': 
+	git reset --hard &&
+	git checkout main^0 &&
+	git merge -s resolve baseline^0 &&
+	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 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 'ort' 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 ort 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 ort 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 'ort' 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 'ort' 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6041-bisect-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/.git/
+expecting success of 6041.1 'git_bisect: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+[add_sub1 3f6af83] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 27611a5 Base
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[09bcf53b0522b9fb95c5988105da6608927c3e4b] Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_bisect: added submodule creates empty directory
+
+expecting success of 6041.2 'git_bisect: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+[add_sub1 3f6af83] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 27611a5 Base
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[09bcf53b0522b9fb95c5988105da6608927c3e4b] Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - git_bisect: added submodule leaves existing empty directory alone
+
+expecting success of 6041.3 'git_bisect: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Switched to branch 'replace_file_with_sub1'
+Your branch is up to date with 'origin/replace_file_with_sub1'.
+[replace_file_with_sub1 3ac086b] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 2364f5a Replace sub1 with file
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[8b6fdfce32c1964fe2bd8ab0e22d81c1a2bb0726] Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - git_bisect: replace tracked file with submodule creates empty directory
+
+expecting success of 6041.4 'git_bisect: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Switched to branch 'replace_directory_with_sub1'
+Your branch is up to date with 'origin/replace_directory_with_sub1'.
+[replace_directory_with_sub1 d02a28b] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at cb28587 Replace sub1 with directory
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[a2e65d520c4d6151077c503b94e88a2b0fc27137] Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - git_bisect: replace directory with submodule
+
+expecting success of 6041.5 'git_bisect: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+[remove_sub1 62c9c0e] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 09bcf53 Add sub1
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+warning: unable to rmdir 'sub1': Directory not empty
+[d6ba72308524467d7c42cc82695a9efb51c0c608] Revert "Add sub1"
+ok 5 - git_bisect: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 6041.6 'git_bisect: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+[remove_sub1 62c9c0e] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 09bcf53 Add sub1
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+warning: unable to rmdir 'sub1': Directory not empty
+[d6ba72308524467d7c42cc82695a9efb51c0c608] Revert "Add sub1"
+ok 6 - git_bisect: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 6041.7 'git_bisect: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you switch branches.
+Aborting
+ok 7 - git_bisect: replace submodule with a directory must fail
+
+expecting success of 6041.8 'git_bisect: 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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you switch branches.
+Aborting
+ok 8 - git_bisect: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 6041.9 'git_bisect: 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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git checkout replace_sub1_with_file
+not ok 9 - git_bisect: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 6041.10 'git_bisect: 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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git checkout replace_sub1_with_file
+not ok 10 - git_bisect: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 6041.11 'git_bisect: 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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Switched to branch 'modify_sub1'
+Your branch is up to date with 'origin/modify_sub1'.
+[modify_sub1 bff37bb] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 09bcf53 Add sub1
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[cb2bda782feaa487c31d26515559b87318263154] Modify sub1
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - git_bisect: modified submodule does not update submodule work tree
+
+expecting success of 6041.12 'git_bisect: 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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Switched to branch 'invalid_sub1'
+Your branch is up to date with 'origin/invalid_sub1'.
+[invalid_sub1 78d784c] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 09bcf53 Add sub1
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[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.
+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': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Switched to branch 'valid_sub1'
+Your branch is up to date with 'origin/valid_sub1'.
+[valid_sub1 f880729] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at e6169bf Invalid sub1 commit
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[3036e4e7a6b640ae42492f70ab2e4608d629980b] Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - git_bisect: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 6041.14 'git_bisect: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1
+Please move or remove them before you switch branches.
+Aborting
+ok 14 - git_bisect: added submodule doesn't remove untracked unignored file with same name
+
+# still have 2 known breakage(s)
+# passed all remaining 12 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6428-merge-conflicts-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6428-merge-conflicts-sparse/.git/
+expecting success of 6428.1 'conflicting entries written to worktree even if sparse': 
+	test_setup_numerals plain &&
+	(
+		cd numerals_plain &&
+
+		git checkout A^0 &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		git sparse-checkout init &&
+		git sparse-checkout set --no-cone README &&
+
+		test_path_is_file README &&
+		test_path_is_missing numerals &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		git ls-files -t >index_files &&
+		test_cmp expected-index index_files &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		test_cmp expected-merge numerals &&
+
+		# 4 other files:
+		#   * expected-merge
+		#   * expected-index
+		#   * index_files
+		#   * others
+		git ls-files -o >others &&
+		test_line_count = 4 others
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6428-merge-conflicts-sparse/numerals_plain/.git/
+[master (root-commit) e14c99c] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ create mode 100644 README
+ create mode 100644 numerals
+Switched to branch 'A'
+[A 016e05e] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 5ca8904] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 016e05e A
+warning: pass a leading slash before paths such as 'README' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+Auto-merging numerals
+CONFLICT (content): Merge conflict in numerals
+Automatic merge failed; fix conflicts and then commit the result.
+ok 1 - conflicting entries written to worktree even if sparse
+
+expecting success of 6428.2 'present-despite-SKIP_WORKTREE handled reasonably': 
+	test_setup_numerals in_the_way &&
+	(
+		cd numerals_in_the_way &&
+
+		git checkout A^0 &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		git sparse-checkout init &&
+		git sparse-checkout set --no-cone README &&
+
+		test_path_is_file README &&
+		test_path_is_missing numerals &&
+
+		echo foobar >numerals &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		test_path_is_missing .git/MERGE_HEAD &&
+
+		test_path_is_file numerals &&
+
+		# numerals should still have "foobar" in it
+		echo foobar >expect &&
+		test_cmp expect numerals
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6428-merge-conflicts-sparse/numerals_in_the_way/.git/
+[master (root-commit) e14c99c] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ create mode 100644 README
+ create mode 100644 numerals
+Switched to branch 'A'
+[A 016e05e] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 5ca8904] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 016e05e A
+warning: pass a leading slash before paths such as 'README' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+error: Your local changes to the following files would be overwritten by merge:
+	numerals
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 2 - present-despite-SKIP_WORKTREE handled reasonably
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6402-merge-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6402-merge-rename/.git/
 expecting success of 6402.1 'setup': 
@@ -418891,758 +419635,6 @@
 1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6428-merge-conflicts-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6428-merge-conflicts-sparse/.git/
-expecting success of 6428.1 'conflicting entries written to worktree even if sparse': 
-	test_setup_numerals plain &&
-	(
-		cd numerals_plain &&
-
-		git checkout A^0 &&
-
-		test_path_is_file README &&
-		test_path_is_file numerals &&
-
-		git sparse-checkout init &&
-		git sparse-checkout set --no-cone README &&
-
-		test_path_is_file README &&
-		test_path_is_missing numerals &&
-
-		test_must_fail git merge -s recursive B^0 &&
-
-		git ls-files -t >index_files &&
-		test_cmp expected-index index_files &&
-
-		test_path_is_file README &&
-		test_path_is_file numerals &&
-
-		test_cmp expected-merge numerals &&
-
-		# 4 other files:
-		#   * expected-merge
-		#   * expected-index
-		#   * index_files
-		#   * others
-		git ls-files -o >others &&
-		test_line_count = 4 others
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6428-merge-conflicts-sparse/numerals_plain/.git/
-[master (root-commit) e14c99c] O
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
- create mode 100644 README
- create mode 100644 numerals
-Switched to branch 'A'
-[A 016e05e] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 5ca8904] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 016e05e A
-warning: pass a leading slash before paths such as 'README' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-Auto-merging numerals
-CONFLICT (content): Merge conflict in numerals
-Automatic merge failed; fix conflicts and then commit the result.
-ok 1 - conflicting entries written to worktree even if sparse
-
-expecting success of 6428.2 'present-despite-SKIP_WORKTREE handled reasonably': 
-	test_setup_numerals in_the_way &&
-	(
-		cd numerals_in_the_way &&
-
-		git checkout A^0 &&
-
-		test_path_is_file README &&
-		test_path_is_file numerals &&
-
-		git sparse-checkout init &&
-		git sparse-checkout set --no-cone README &&
-
-		test_path_is_file README &&
-		test_path_is_missing numerals &&
-
-		echo foobar >numerals &&
-
-		test_must_fail git merge -s recursive B^0 &&
-
-		test_path_is_missing .git/MERGE_HEAD &&
-
-		test_path_is_file numerals &&
-
-		# numerals should still have "foobar" in it
-		echo foobar >expect &&
-		test_cmp expect numerals
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6428-merge-conflicts-sparse/numerals_in_the_way/.git/
-[master (root-commit) e14c99c] O
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
- create mode 100644 README
- create mode 100644 numerals
-Switched to branch 'A'
-[A 016e05e] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 5ca8904] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 016e05e A
-warning: pass a leading slash before paths such as 'README' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-error: Your local changes to the following files would be overwritten by merge:
-	numerals
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 2 - present-despite-SKIP_WORKTREE handled reasonably
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6041-bisect-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/.git/
-expecting success of 6041.1 'git_bisect: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-[add_sub1 3f6af83] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 27611a5 Base
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[09bcf53b0522b9fb95c5988105da6608927c3e4b] Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_bisect: added submodule creates empty directory
-
-expecting success of 6041.2 'git_bisect: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-[add_sub1 3f6af83] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 27611a5 Base
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[09bcf53b0522b9fb95c5988105da6608927c3e4b] Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_bisect: added submodule leaves existing empty directory alone
-
-expecting success of 6041.3 'git_bisect: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Switched to branch 'replace_file_with_sub1'
-Your branch is up to date with 'origin/replace_file_with_sub1'.
-[replace_file_with_sub1 3ac086b] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 2364f5a Replace sub1 with file
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[8b6fdfce32c1964fe2bd8ab0e22d81c1a2bb0726] Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_bisect: replace tracked file with submodule creates empty directory
-
-expecting success of 6041.4 'git_bisect: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Switched to branch 'replace_directory_with_sub1'
-Your branch is up to date with 'origin/replace_directory_with_sub1'.
-[replace_directory_with_sub1 d02a28b] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at cb28587 Replace sub1 with directory
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[a2e65d520c4d6151077c503b94e88a2b0fc27137] Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_bisect: replace directory with submodule
-
-expecting success of 6041.5 'git_bisect: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-[remove_sub1 62c9c0e] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 09bcf53 Add sub1
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-warning: unable to rmdir 'sub1': Directory not empty
-[d6ba72308524467d7c42cc82695a9efb51c0c608] Revert "Add sub1"
-ok 5 - git_bisect: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 6041.6 'git_bisect: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-[remove_sub1 62c9c0e] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 09bcf53 Add sub1
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-warning: unable to rmdir 'sub1': Directory not empty
-[d6ba72308524467d7c42cc82695a9efb51c0c608] Revert "Add sub1"
-ok 6 - git_bisect: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 6041.7 'git_bisect: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you switch branches.
-Aborting
-ok 7 - git_bisect: replace submodule with a directory must fail
-
-expecting success of 6041.8 'git_bisect: 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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you switch branches.
-Aborting
-ok 8 - git_bisect: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 6041.9 'git_bisect: 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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Switched to branch 'replace_sub1_with_file'
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git checkout replace_sub1_with_file
-not ok 9 - git_bisect: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 6041.10 'git_bisect: 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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Switched to branch 'replace_sub1_with_file'
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git checkout replace_sub1_with_file
-not ok 10 - git_bisect: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 6041.11 'git_bisect: 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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Switched to branch 'modify_sub1'
-Your branch is up to date with 'origin/modify_sub1'.
-[modify_sub1 bff37bb] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 09bcf53 Add sub1
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[cb2bda782feaa487c31d26515559b87318263154] Modify sub1
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_bisect: modified submodule does not update submodule work tree
-
-expecting success of 6041.12 'git_bisect: 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.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Switched to branch 'invalid_sub1'
-Your branch is up to date with 'origin/invalid_sub1'.
-[invalid_sub1 78d784c] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 09bcf53 Add sub1
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[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.
-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': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Switched to branch 'valid_sub1'
-Your branch is up to date with 'origin/valid_sub1'.
-[valid_sub1 f880729] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at e6169bf Invalid sub1 commit
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[3036e4e7a6b640ae42492f70ab2e4608d629980b] Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_bisect: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 6041.14 'git_bisect: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1
-Please move or remove them before you switch branches.
-Aborting
-ok 14 - git_bisect: added submodule doesn't remove untracked unignored file with same name
-
-# still have 2 known breakage(s)
-# passed all remaining 12 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6427-diff3-conflict-markers.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6427-diff3-conflict-markers/.git/
 expecting success of 6427.1 'setup no merge base': 
@@ -422702,6 +422694,356 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6436-merge-overwrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6436-merge-overwrite/.git/
+expecting success of 6436.1 'setup': 
+	test_commit c0 c0.c &&
+	test_commit c1 c1.c &&
+	test_commit c1a c1.c "c1 a" &&
+	git reset --hard c0 &&
+	test_commit c2 c2.c &&
+	git reset --hard c0 &&
+	mkdir sub &&
+	echo "sub/f" > sub/f &&
+	mkdir sub2 &&
+	echo "sub2/f" > sub2/f &&
+	git add sub/f sub2/f &&
+	git commit -m sub &&
+	git tag sub &&
+	echo "VERY IMPORTANT CHANGES" > important
+
+[main (root-commit) 934056f] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[main 7b51d7c] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+[main 4e7fedb] c1a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 934056f c0
+[main 48f99e1] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+HEAD is now at 934056f c0
+[main 55608b7] sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 sub/f
+ create mode 100644 sub2/f
+ok 1 - setup
+
+expecting success of 6436.2 'will not overwrite untracked file': 
+	git reset --hard c1 &&
+	cp important c2.c &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c2.c
+
+HEAD is now at 7b51d7c c1
+error: The following untracked working tree files would be overwritten by merge:
+	c2.c
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 2 - will not overwrite untracked file
+
+expecting success of 6436.3 'will overwrite tracked file': 
+	git reset --hard c1 &&
+	cp important c2.c &&
+	git add c2.c &&
+	git commit -m important &&
+	git checkout c2
+
+HEAD is now at 7b51d7c c1
+[main b7e8e56] important
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+Note: switching to 'c2'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 48f99e1 c2
+ok 3 - will overwrite tracked file
+
+expecting success of 6436.4 'will not overwrite new file': 
+	git reset --hard c1 &&
+	cp important c2.c &&
+	git add c2.c &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c2.c
+
+HEAD is now at 7b51d7c c1
+error: Your local changes to the following files would be overwritten by merge:
+  c2.c
+Merge with strategy ort failed.
+ok 4 - will not overwrite new file
+
+expecting success of 6436.5 'will not overwrite staged changes': 
+	git reset --hard c1 &&
+	cp important c2.c &&
+	git add c2.c &&
+	rm c2.c &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	git checkout c2.c &&
+	test_cmp important c2.c
+
+HEAD is now at 7b51d7c c1
+error: Your local changes to the following files would be overwritten by merge:
+  c2.c
+Merge with strategy ort failed.
+Updated 0 paths from the index
+ok 5 - will not overwrite staged changes
+
+expecting success of 6436.6 'will not overwrite removed file': 
+	git reset --hard c1 &&
+	git rm c1.c &&
+	git commit -m "rm c1.c" &&
+	cp important c1.c &&
+	test_must_fail git merge c1a &&
+	test_cmp important c1.c &&
+	rm c1.c  # Do not leave untracked file in way of future tests
+
+HEAD is now at 7b51d7c c1
+rm 'c1.c'
+[detached HEAD 86e44d1] rm c1.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 c1.c
+error: The following untracked working tree files would be overwritten by merge:
+	c1.c
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 6 - will not overwrite removed file
+
+expecting success of 6436.7 'will not overwrite re-added file': 
+	git reset --hard c1 &&
+	git rm c1.c &&
+	git commit -m "rm c1.c" &&
+	cp important c1.c &&
+	git add c1.c &&
+	test_must_fail git merge c1a &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c1.c
+
+HEAD is now at 7b51d7c c1
+rm 'c1.c'
+[detached HEAD 86e44d1] rm c1.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 c1.c
+error: Your local changes to the following files would be overwritten by merge:
+  c1.c
+Merge with strategy ort failed.
+ok 7 - will not overwrite re-added file
+
+expecting success of 6436.8 'will not overwrite removed file with staged changes': 
+	git reset --hard c1 &&
+	git rm c1.c &&
+	git commit -m "rm c1.c" &&
+	cp important c1.c &&
+	git add c1.c &&
+	rm c1.c &&
+	test_must_fail git merge c1a &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	git checkout c1.c &&
+	test_cmp important c1.c
+
+HEAD is now at 7b51d7c c1
+rm 'c1.c'
+[detached HEAD 86e44d1] rm c1.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 c1.c
+error: Your local changes to the following files would be overwritten by merge:
+  c1.c
+Merge with strategy ort failed.
+Updated 0 paths from the index
+ok 8 - will not overwrite removed file with staged changes
+
+expecting success of 6436.9 'will not overwrite unstaged changes in renamed file': 
+	git reset --hard c1 &&
+	git mv c1.c other.c &&
+	git commit -m rename &&
+	cp important other.c &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_must_fail git merge c1a >out 2>err &&
+		test_grep "would be overwritten by merge" err &&
+		test_cmp important other.c &&
+		test_path_is_missing .git/MERGE_HEAD
+	else
+		test_must_fail git merge c1a >out &&
+		test_grep "Refusing to lose dirty file at other.c" out &&
+		test_path_is_file other.c~HEAD &&
+		test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
+		test_cmp important other.c
+	fi
+
+HEAD is now at 7b51d7c c1
+[detached HEAD 891a741] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename c1.c => other.c (100%)
+error: Your local changes to the following files would be overwritten by merge:
+ok 9 - will not overwrite unstaged changes in renamed file
+
+expecting success of 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6430-merge-recursive.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6430-merge-recursive/.git/
 expecting success of 6430.1 'setup 1': 
@@ -423714,7 +424056,7 @@
 hint:
 hint: See "git help submodule" for more information.
 hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[topic 0f185c4] base
+[topic c65a98b] base
  Author: A U Thor <author@example.com>
  22 files changed, 42 insertions(+), 2 deletions(-)
  delete mode 120000 a
@@ -423740,12 +424082,12 @@
  create mode 100644 theirs-has-rename-index
  rename {d => theirs-has-rename-work}/e (100%)
 Switched to a new branch 'other'
-[other 39f2828] changesimplefile
+[other 2fda0fe] changesimplefile
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'topic'
 rm 'sub1'
-[topic 82343b6] changefiletodir
+[topic 0ac3422] changefiletodir
  Author: A U Thor <author@example.com>
  4 files changed, 1 deletion(-)
  delete mode 100644 sub1
@@ -423783,7 +424125,7 @@
 
 	git clean -fd
 
-HEAD is now at f4a19ab Merge branch 'other' into topic
+HEAD is now at ec57f0d Merge branch 'other' into topic
 CONFLICT (rename/rename): Rename e->a in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Rename a~Temporary merge branch 2_0->a in 918ade1d06dd1c0da47b644356c64b1b2122e705
 Removing actual
 Removing actual-err
@@ -423854,18 +424196,18 @@
 
 	git merge $B
 
-HEAD is now at f4a19ab Merge branch 'other' into topic
-[topic bac8ef0] O0
+HEAD is now at ec57f0d Merge branch 'other' into topic
+[topic 89a247c] O0
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-[topic 9f674dd] O1
+[topic 130a17c] O1
  Author: A U Thor <author@example.com>
-HEAD is now at bac8ef0 O0
-[topic 35c02a6] O2
+HEAD is now at 89a247c O0
+[topic d61aa29] O2
  Author: A U Thor <author@example.com>
 Merge made by the 'ours' strategy.
-HEAD is now at 9f674dd O1
+HEAD is now at 130a17c O1
 Merge made by the 'ours' strategy.
 Merge made by the 'ort' strategy.
 ok 37 - merge-recursive internal merge resolves to the sameness
@@ -424014,357 +424356,841 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6436-merge-overwrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t6434-merge-recursive-rename-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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) 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
+[main (root-commit) f9f9b59] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 934056f c0
-[main 48f99e1] c2
+ 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(+)
- create mode 100644 c2.c
-HEAD is now at 934056f c0
-[main 55608b7] sub
+ 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>
- 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
+ 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
 
-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 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%"
 
-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
+ok 2 - setup thresholds
 
-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'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 - assumption for tests: rename detection with diff
 
-If you want to 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.4 'default similarity threshold is 50%': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive $tail &&
+	$check_50
 
-  git switch -c <new-branch-name>
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+ok 4 - default similarity threshold is 50%
 
-Or undo this operation with:
+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
 
-  git switch -
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 0-old deleted in main and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
+ok 5 - low rename threshold
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 48f99e1 c2
-ok 3 - will overwrite tracked file
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+ok 6 - medium rename threshold
 
-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
+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
 
-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
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+ok 7 - high rename threshold
 
-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
+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
 
-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
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+ok 8 - exact renames only
 
-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
+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
 
-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
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+ok 9 - rename threshold is truncated
 
-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
+expecting success of 6434.10 'disabled rename detection': 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --no-renames $tail &&
+	check_no_renames
 
-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
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+ok 10 - disabled rename detection
 
-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
+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
 
-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
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+ok 11 - last wins in --find-renames=<m> --find-renames=<n>
 
-expecting success of 6436.9 'will not overwrite unstaged changes in renamed file': 
-	git reset --hard c1 &&
-	git mv c1.c other.c &&
-	git commit -m rename &&
-	cp important other.c &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_must_fail git merge c1a >out 2>err &&
-		test_grep "would be overwritten by merge" err &&
-		test_cmp important other.c &&
-		test_path_is_missing .git/MERGE_HEAD
-	else
-		test_must_fail git merge c1a >out &&
-		test_grep "Refusing to lose dirty file at other.c" out &&
-		test_path_is_file other.c~HEAD &&
-		test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
-		test_cmp important other.c
-	fi
+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
 
-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
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+ok 12 - --find-renames resets threshold
 
-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 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 934056f c0
-error: Updating the following directories would lose untracked files in them:
-	sub/f
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+ok 13 - last wins in --no-renames --find-renames
 
-Aborting
-Updating 934056f..55608b7
-ok 10 - will not overwrite untracked subtree
+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
 
-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
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+ok 14 - last wins in --find-renames --no-renames
 
-HEAD is now at 934056f c0
-Updating 934056f..55608b7
-ok 11 - will not overwrite untracked file in leading path
+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
 
-checking prerequisite: SYMLINKS
+Merging HEAD with HEAD
+Merging:
+056f2c0 rename
+056f2c0 rename
+found 1 common ancestor:
+056f2c0 rename
+Already up to date.
+Merging HEAD with HEAD
+Merging:
+056f2c0 rename
+056f2c0 rename
+found 1 common ancestor:
+056f2c0 rename
+Already up to date.
+Merging HEAD with HEAD
+Merging:
+056f2c0 rename
+056f2c0 rename
+found 1 common ancestor:
+056f2c0 rename
+Already up to date.
+Merging HEAD with HEAD
+Merging:
+056f2c0 rename
+056f2c0 rename
+found 1 common ancestor:
+056f2c0 rename
+Already up to date.
+Merging HEAD with HEAD
+Merging:
+056f2c0 rename
+056f2c0 rename
+found 1 common ancestor:
+056f2c0 rename
+Already up to date.
+ok 15 - assumption for further tests: trivial merge succeeds
 
-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 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
 
-)
-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
+fatal: unknown option --find-renames=-25
+ok 16 - --find-renames rejects negative argument
 
-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 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
 
-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
+fatal: unknown option --find-renames=0xf
+ok 17 - --find-renames rejects non-numbers
 
-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:
+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
 
-  6d387d8 ln
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 0-old deleted in main and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
+ok 18 - rename-threshold=<n> is a synonym for find-renames=<n>
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> 6d387d8
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 0-old deleted in main and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
+ok 19 - last wins in --no-renames --rename-threshold=<n>
 
-HEAD is now at 55608b7 sub
-ok 13 - will not be confused by symlink in leading path
+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
 
-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
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+ok 20 - last wins in --rename-threshold=<n> --no-renames
 
-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 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
 
-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
+fatal: unknown option --rename-threshold=-25
+ok 21 - --rename-threshold=<n> rejects negative argument
 
-ok 15 - will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.
+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 6436.16 'failed merge leaves unborn branch in the womb': 
-	test_must_fail git rev-parse --verify HEAD
+fatal: unknown option --rename-threshold=0xf
+ok 22 - --rename-threshold=<n> rejects non-numbers
 
-fatal: Needed a single revision
-ok 16 - failed merge leaves unborn branch in the womb
+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
 
-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
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+ok 23 - last wins in --rename-threshold=<m> --find-renames=<n>
 
-ok 17 - set up unborn branch and content
+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
 
-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
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 0-old deleted in main and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
+ok 24 - last wins in --find-renames=<m> --rename-threshold=<n>
 
-foo
-foo
-bar
-ok 18 - will not clobber WT/index when merging into unborn
+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
 
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6422-merge-rename-corner-cases.sh ***
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+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
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+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
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+ok 27 - merge.renames overrides diff.renames
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6433-merge-toplevel.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6422-merge-rename-corner-cases.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6422-merge-rename-corner-cases/.git/
 expecting success of 6422.1 'Does git preserve Gollum's precious artifact?': 
 	test_setup_rename_delete_untracked &&
@@ -426166,840 +426992,6 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6434-merge-recursive-rename-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 0-old deleted in main and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-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:
-056f2c0 rename
-056f2c0 rename
-found 1 common ancestor:
-056f2c0 rename
-Already up to date.
-Merging HEAD with HEAD
-Merging:
-056f2c0 rename
-056f2c0 rename
-found 1 common ancestor:
-056f2c0 rename
-Already up to date.
-Merging HEAD with HEAD
-Merging:
-056f2c0 rename
-056f2c0 rename
-found 1 common ancestor:
-056f2c0 rename
-Already up to date.
-Merging HEAD with HEAD
-Merging:
-056f2c0 rename
-056f2c0 rename
-found 1 common ancestor:
-056f2c0 rename
-Already up to date.
-Merging HEAD with HEAD
-Merging:
-056f2c0 rename
-056f2c0 rename
-found 1 common ancestor:
-056f2c0 rename
-Already up to date.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 0-old deleted in main and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 0-old deleted in main and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 0-old deleted in main and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-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
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-CONFLICT (rename/delete): 3-old deleted in main and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in main and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in main and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-ok 27 - merge.renames overrides diff.renames
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6433-merge-toplevel.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6700-tree-depth.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6700-tree-depth/.git/
 expecting success of 6700.1 'create small tree': 
@@ -429517,952 +429509,6 @@
 1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t6437-submodule-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/.git/
-expecting success of 6437.1 'setup': 
-
-	mkdir sub &&
-	(cd sub &&
-	 git init &&
-	 echo original > file &&
-	 git add file &&
-	 test_tick &&
-	 git commit -m sub-root) &&
-	git add sub &&
-	test_tick &&
-	git commit -m root &&
-
-	git checkout -b a main &&
-	(cd sub &&
-	 echo A > file &&
-	 git add file &&
-	 test_tick &&
-	 git commit -m sub-a) &&
-	git add sub &&
-	test_tick &&
-	git commit -m a &&
-
-	git checkout -b b main &&
-	(cd sub &&
-	 echo B > file &&
-	 git add file &&
-	 test_tick &&
-	 git commit -m sub-b) &&
-	git add sub &&
-	test_tick &&
-	git commit -m b &&
-
-	git checkout -b c a &&
-	git merge -s ours b &&
-
-	git checkout -b d b &&
-	git merge -s ours a
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/sub/.git/
-[main (root-commit) 0998b33] sub-root
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[main (root-commit) 5c9ada4] root
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-Switched to a new branch 'a'
-[main d98dfef] sub-a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[a 6102a2a] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'b'
-M	sub
-[main ce35c37] sub-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[b 0405d8c] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'c'
-M	sub
-Merge made by the 'ours' strategy.
-Switched to a new branch 'd'
-Merge made by the 'ours' strategy.
-ok 1 - setup
-
-expecting success of 6437.2 'setup for merge search': 
-	mkdir merge-search &&
-	(cd merge-search &&
-	git init &&
-	mkdir sub &&
-	(cd sub &&
-	 git init &&
-	 echo "file-a" > file-a &&
-	 git add file-a &&
-	 git commit -m "sub-a" &&
-	 git branch sub-a) &&
-	git commit --allow-empty -m init &&
-	git branch init &&
-	git add sub &&
-	git commit -m "a" &&
-	git branch a &&
-
-	git checkout -b b &&
-	(cd sub &&
-	 git checkout -b sub-b &&
-	 echo "file-b" > file-b &&
-	 git add file-b &&
-	 git commit -m "sub-b") &&
-	git commit -a -m "b" &&
-
-	git checkout -b c a &&
-	(cd sub &&
-	 git checkout -b sub-c sub-a &&
-	 echo "file-c" > file-c &&
-	 git add file-c &&
-	 git commit -m "sub-c") &&
-	git commit -a -m "c")
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/merge-search/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/merge-search/sub/.git/
-[main (root-commit) 9c64145] sub-a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-a
-[main (root-commit) edb5fba] init
- Author: A U Thor <author@example.com>
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[main ea59e10] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-Switched to a new branch 'b'
-Switched to a new branch 'sub-b'
-[sub-b 1e4c5d4] sub-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-b
-[b 65d3c25] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'c'
-M	sub
-Switched to a new branch 'sub-c'
-[sub-c 18cac7c] sub-c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-c
-[c 00fd913] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - setup for merge search
-
-expecting success of 6437.3 'merging should conflict for non fast-forward': 
-	test_when_finished "git -C merge-search reset --hard" &&
-	(cd merge-search &&
-	 git checkout -b test-nonforward-a b &&
-	  if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	  then
-		test_must_fail git merge c 2>actual &&
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
-		grep "$sub_expect" actual
-	  else
-		test_must_fail git merge c 2> actual
-	  fi)
-
-Switched to a new branch 'test-nonforward-a'
-M	sub
-Failed to merge submodule sub
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-hint:  - go to submodule (sub), and either merge commit 18cac7c
-HEAD is now at 65d3c25 b
-ok 3 - merging should conflict for non fast-forward
-
-expecting success of 6437.4 'finish setup for merge-search': 
-	(cd merge-search &&
-	git checkout -b d a &&
-	(cd sub &&
-	 git checkout -b sub-d sub-b &&
-	 git merge sub-c) &&
-	git commit -a -m "d" &&
-	git branch test b &&
-
-	git checkout -b g init &&
-	(cd sub &&
-	 git checkout -b sub-g sub-c) &&
-	git add sub &&
-	git commit -a -m "g")
-
-Switched to a new branch 'd'
-M	sub
-Switched to a new branch 'sub-d'
-Merge made by the 'ort' strategy.
- file-c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file-c
-[d 40eded3] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-warning: unable to rmdir 'sub': Directory not empty
-Switched to a new branch 'g'
-Switched to a new branch 'sub-g'
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[g 61ce3a9] g
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-ok 4 - finish setup for merge-search
-
-expecting success of 6437.5 'merge with one side as a fast-forward of the other': 
-	(cd merge-search &&
-	 git checkout -b test-forward b &&
-	 git merge d &&
-	 git ls-tree test-forward sub | cut -f1 | cut -f3 -d" " > actual &&
-	 (cd sub &&
-	  git rev-parse sub-d > ../expect) &&
-	 test_cmp expect actual)
-
-Switched to a new branch 'test-forward'
-M	sub
-Note: Fast-forwarding submodule sub to aafcfa2a62764282ab848d5d6bea86ba217c1b24
-Merge made by the 'ort' strategy.
- sub | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - merge with one side as a fast-forward of the other
-
-expecting success of 6437.6 'merging should conflict for non fast-forward (resolution exists)': 
-	(cd merge-search &&
-	 git checkout -b test-nonforward-b b &&
-	 (cd sub &&
-	  git rev-parse --short sub-d > ../expect) &&
-	  if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	  then
-		test_must_fail git merge c >actual 2>sub-actual &&
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
-		grep "$sub_expect" sub-actual
-	  else
-		test_must_fail git merge c 2> actual
-	  fi &&
-	 grep $(cat expect) actual > /dev/null &&
-	 git reset --hard)
-
-Switched to a new branch 'test-nonforward-b'
-M	sub
-hint:  - go to submodule (sub), and either merge commit 18cac7c
-HEAD is now at 65d3c25 b
-ok 6 - merging should conflict for non fast-forward (resolution exists)
-
-expecting success of 6437.7 'merging should fail for ambiguous common parent': 
-	(cd merge-search &&
-	git checkout -b test-ambiguous b &&
-	(cd sub &&
-	 git checkout -b ambiguous sub-b &&
-	 git merge sub-c &&
-	 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	 then
-		git rev-parse --short sub-d >../expect1 &&
-		git rev-parse --short ambiguous >../expect2
-	 else
-		git rev-parse sub-d > ../expect1 &&
-		git rev-parse ambiguous > ../expect2
-	 fi
-	 ) &&
-	 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	 then
-		test_must_fail git merge c >actual 2>sub-actual &&
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
-		grep "$sub_expect" sub-actual
-	 else
-		test_must_fail git merge c 2> actual
-	 fi &&
-	grep $(cat expect1) actual > /dev/null &&
-	grep $(cat expect2) actual > /dev/null &&
-	git reset --hard)
-
-Switched to a new branch 'test-ambiguous'
-M	sub
-Switched to a new branch 'ambiguous'
-Merge made by the 'ort' strategy.
- file-c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file-c
-hint:  - go to submodule (sub), and either merge commit 18cac7c
-HEAD is now at 65d3c25 b
-ok 7 - merging should fail for ambiguous common parent
-
-expecting success of 6437.8 'merging should fail for changes that are backwards': 
-	(cd merge-search &&
-	git checkout -b bb a &&
-	(cd sub &&
-	 git checkout sub-b) &&
-	git commit -a -m "bb" &&
-
-	git checkout -b e bb &&
-	(cd sub &&
-	 git checkout sub-a) &&
-	git commit -a -m "e" &&
-
-	git checkout -b f bb &&
-	(cd sub &&
-	 git checkout sub-d) &&
-	git commit -a -m "f" &&
-
-	git checkout -b test-backward e &&
-	test_must_fail git merge f 2>actual &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-    then
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-d)" &&
-		grep "$sub_expect" actual
-	fi)
-
-Switched to a new branch 'bb'
-M	sub
-Switched to branch 'sub-b'
-[bb 41fd2a8] bb
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'e'
-Switched to branch 'sub-a'
-[e 49e8960] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'f'
-M	sub
-Switched to branch 'sub-d'
-[f ceec2f6] f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'test-backward'
-M	sub
-Failed to merge submodule sub (commits don't follow merge-base)
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-hint:  - go to submodule (sub), and either merge commit aafcfa2
-ok 8 - merging should fail for changes that are backwards
-
-expecting success of 6437.9 'git submodule status should display the merge conflict properly with merge base': 
-       (cd merge-search &&
-       cat >.gitmodules <<EOF &&
-[submodule "sub"]
-       path = sub
-       url = $TRASH_DIRECTORY/sub
-EOF
-       cat >expect <<EOF &&
-U$ZERO_OID sub
-EOF
-       git submodule status > actual &&
-       test_cmp expect actual &&
-	git reset --hard)
-
-HEAD is now at 49e8960 e
-ok 9 - git submodule status should display the merge conflict properly with merge base
-
-expecting success of 6437.10 'git submodule status should display the merge conflict properly without merge-base': 
-       (cd merge-search &&
-	git checkout -b test-no-merge-base g &&
-	test_must_fail git merge b &&
-       cat >.gitmodules <<EOF &&
-[submodule "sub"]
-       path = sub
-       url = $TRASH_DIRECTORY/sub
-EOF
-       cat >expect <<EOF &&
-U$ZERO_OID sub
-EOF
-       git submodule status > actual &&
-       test_cmp expect actual &&
-       git reset --hard)
-
-Switched to a new branch 'test-no-merge-base'
-M	sub
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (sub), and either merge commit 1e4c5d4
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add sub
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config advice.submoduleMergeConflict false"
-Failed to merge submodule sub (no merge base)
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 61ce3a9 g
-ok 10 - git submodule status should display the merge conflict properly without merge-base
-
-expecting success of 6437.11 'merging with a modify/modify conflict between merge bases': 
-	git reset --hard HEAD &&
-	git checkout -b test2 c &&
-	git merge d
-
-HEAD is now at f35b3af Merge branch 'a' into d
-Switched to a new branch 'test2'
-M	sub
-  From inner merge:  Note: Fast-forwarding submodule sub to ce35c37b7ac232e25ec1e4224f220de1cc360c38
-Merge made by the 'ort' strategy.
-ok 11 - merging with a modify/modify conflict between merge bases
-
-expecting success of 6437.12 'setup for recursive merge with submodule': 
-	mkdir merge-recursive &&
-	(cd merge-recursive &&
-	 git init &&
-	 mkdir sub &&
-	 (cd sub &&
-	  git init &&
-	  test_commit a &&
-	  git checkout -b sub-b main &&
-	  test_commit b &&
-	  git checkout -b sub-c main &&
-	  test_commit c &&
-	  git checkout -b sub-bc sub-b &&
-	  git merge sub-c &&
-	  git checkout -b sub-cb sub-c &&
-	  git merge sub-b &&
-	  git checkout main) &&
-	 git add sub &&
-	 git commit -m a &&
-	 git checkout -b top-b main &&
-	 (cd sub && git checkout sub-b) &&
-	 git add sub &&
-	 git commit -m b &&
-	 git checkout -b top-c main &&
-	 (cd sub && git checkout sub-c) &&
-	 git add sub &&
-	 git commit -m c &&
-	 git checkout -b top-bc top-b &&
-	 git merge -s ours --no-commit top-c &&
-	 (cd sub && git checkout sub-bc) &&
-	 git add sub &&
-	 git commit -m bc &&
-	 git checkout -b top-cb top-c &&
-	 git merge -s ours --no-commit top-b &&
-	 (cd sub && git checkout sub-cb) &&
-	 git add sub &&
-	 git commit -m cb)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/merge-recursive/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/merge-recursive/sub/.git/
-[main (root-commit) 9d932ab] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-Switched to a new branch 'sub-b'
-[sub-b 8b32189] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-Switched to a new branch 'sub-c'
-[sub-c 7d3d4d8] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Switched to a new branch 'sub-bc'
-Merge made by the 'ort' strategy.
- c.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Switched to a new branch 'sub-cb'
-Merge made by the 'ort' strategy.
- b.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-Switched to branch 'main'
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[main (root-commit) a2ff72f] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-Switched to a new branch 'top-b'
-Switched to branch 'sub-b'
-[top-b f6b4d5a] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'top-c'
-M	sub
-Switched to branch 'sub-c'
-[top-c 4d9cfab] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'top-bc'
-M	sub
-Automatic merge went well; stopped before committing as requested
-Switched to branch 'sub-bc'
-[top-bc ff9bd9b] bc
- Author: A U Thor <author@example.com>
-Switched to a new branch 'top-cb'
-M	sub
-Automatic merge went well; stopped before committing as requested
-Switched to branch 'sub-cb'
-[top-cb a0ac63b] cb
- Author: A U Thor <author@example.com>
-ok 12 - setup for recursive merge with submodule
-
-expecting success of 6437.13 'recursive merge with submodule': 
-	(cd merge-recursive &&
-	 test_must_fail git merge top-bc &&
-	 echo "160000 $(git rev-parse top-cb:sub) 2	sub" > expect2 &&
-	 echo "160000 $(git rev-parse top-bc:sub) 3	sub" > expect3 &&
-	 git ls-files -u > actual &&
-	 grep "$(cat expect2)" actual > /dev/null &&
-	 grep "$(cat expect3)" actual > /dev/null)
-
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (sub), and either merge commit 8060496
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add sub
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config advice.submoduleMergeConflict false"
-  From inner merge:  CONFLICT (submodule): Merge conflict in sub
-Failed to merge submodule sub
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-ok 13 - recursive merge with submodule
-
-expecting success of 6437.14 'setup file/submodule conflict': 
-	git init file-submodule &&
-	(
-		cd file-submodule &&
-
-		git commit --allow-empty -m O &&
-
-		git branch A &&
-		git branch B &&
-
-		git checkout B &&
-		echo content >path &&
-		git add path &&
-		git commit -m B &&
-
-		git checkout A &&
-		git init path &&
-		test_commit -C path world &&
-		git submodule add ./path &&
-		git commit -m A
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/file-submodule/.git/
-[main (root-commit) f09f54e] O
- Author: A U Thor <author@example.com>
-Switched to branch 'B'
-[B 208816f] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 path
-Switched to branch 'A'
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/file-submodule/path/.git/
-[main (root-commit) 26692a7] world
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world.t
-Adding existing repo at 'path' to the index
-[A 85fc078] A
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 path
-ok 14 - setup file/submodule conflict
-
-expecting success of 6437.15 'file/submodule conflict': 
-	test_when_finished "git -C file-submodule reset --hard" &&
-	(
-		cd file-submodule &&
-
-		git checkout A^0 &&
-		test_must_fail git merge B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-
-		# path/ is still a submodule
-		test_path_is_dir path/.git &&
-
-		# There is a submodule at "path", so B:path cannot be written
-		# there.  We expect it to be written somewhere in the same
-		# directory, though, so just grep for its content in all
-		# files, and ignore "grep: path: Is a directory" message
-		echo Checking if contents from B:path showed up anywhere &&
-		grep -q content * 2>/dev/null
-	)
-
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 85fc078 A
-CONFLICT (distinct types): path had different types on each side; renamed one of them so each can be recorded somewhere.
-Automatic merge failed; fix conflicts and then commit the result.
-Checking if contents from B:path showed up anywhere
-HEAD is now at 85fc078 A
-ok 15 - file/submodule conflict
-
-expecting success of 6437.16 'file/submodule conflict; merge --abort works afterward': 
-	test_when_finished "git -C file-submodule reset --hard" &&
-	(
-		cd file-submodule &&
-
-		git checkout A^0 &&
-		test_must_fail git merge B^0 >out 2>err &&
-
-		test_path_is_file .git/MERGE_HEAD &&
-		git merge --abort
-	)
-
-HEAD is now at 85fc078 A
-HEAD is now at 85fc078 A
-ok 16 - file/submodule conflict; merge --abort works afterward
-
-expecting success of 6437.17 'setup directory/submodule conflict': 
-	git init directory-submodule &&
-	(
-		cd directory-submodule &&
-
-		git commit --allow-empty -m O &&
-
-		git branch A &&
-		git branch B1 &&
-		git branch B2 &&
-
-		git checkout B1 &&
-		mkdir path &&
-		echo contents >path/file &&
-		git add path/file &&
-		git commit -m B1 &&
-
-		git checkout B2 &&
-		mkdir path &&
-		echo contents >path/world &&
-		git add path/world &&
-		git commit -m B2 &&
-
-		git checkout A &&
-		git init path &&
-		test_commit -C path hello world &&
-		git submodule add ./path &&
-		git commit -m A
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/directory-submodule/.git/
-[main (root-commit) f09f54e] O
- Author: A U Thor <author@example.com>
-Switched to branch 'B1'
-[B1 8ab0f0c] B1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 path/file
-Switched to branch 'B2'
-[B2 db2a533] B2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 path/world
-Switched to branch 'A'
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/directory-submodule/path/.git/
-[main (root-commit) 2605480] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-Adding existing repo at 'path' to the index
-[A 90b0bac] A
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 path
-ok 17 - setup directory/submodule conflict
-
-checking known breakage of 6437.18 'directory/submodule conflict; keep submodule clean': 
-	test_when_finished "git -C directory-submodule reset --hard" &&
-	(
-		cd directory-submodule &&
-
-		git checkout A^0 &&
-		test_must_fail git merge B1^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-
-		# path/ is still a submodule
-		test_path_is_dir path/.git &&
-
-		echo Checking if contents from B1:path/file showed up &&
-		# Would rather use grep -r, but that is GNU extension...
-		git ls-files -co | xargs grep -q contents 2>/dev/null &&
-
-		# However, B1:path/file should NOT have shown up at path/file,
-		# because we should not write into the submodule
-		test_path_is_missing path/file
-	)
-
-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 90b0bac A
-warning: unable to rmdir 'path': Directory not empty
-CONFLICT (file/directory): directory in the way of path from HEAD; moving it to path~HEAD instead.
-Automatic merge failed; fix conflicts and then commit the result.
-Checking if contents from B1:path/file showed up
-Path exists:
--rw-r--r-- 1 pbuilder1 pbuilder1 9 Mar  4 08:01 path/file
-HEAD is now at 90b0bac A
-not ok 18 - directory/submodule conflict; keep submodule clean # TODO known breakage
-
-checking prerequisite: FAIL_PREREQS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
-		test_bool_env GIT_TEST_FAIL_PREREQS false
-	
-)
-prerequisite FAIL_PREREQS not satisfied
-expecting success of 6437.19 'directory/submodule conflict; should not treat submodule files as untracked or in the way': 
-	test_when_finished "git -C directory-submodule/path reset --hard" &&
-	test_when_finished "git -C directory-submodule reset --hard" &&
-	(
-		cd directory-submodule &&
-
-		git checkout A^0 &&
-		test_must_fail git merge B2^0 >out 2>err &&
-
-		# We do not want files within the submodule to prevent the
-		# merge from starting; we should not be writing to such paths
-		# anyway.
-		test_grep ! "refusing to lose untracked file at" err
-	)
-
-HEAD is now at 90b0bac A
-HEAD is now at 90b0bac A
-HEAD is now at 2605480 hello
-ok 19 - directory/submodule conflict; should not treat submodule files as untracked or in the way
-
-checking known breakage of 6437.20 'directory/submodule conflict; merge --abort works afterward': 
-	test_when_finished "git -C directory-submodule/path reset --hard" &&
-	test_when_finished "git -C directory-submodule reset --hard" &&
-	(
-		cd directory-submodule &&
-
-		git checkout A^0 &&
-		test_must_fail git merge B2^0 &&
-		test_path_is_file .git/MERGE_HEAD &&
-
-		# merge --abort should succeed, should clear .git/MERGE_HEAD,
-		# and should not leave behind any conflicted files
-		git merge --abort &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
-
-HEAD is now at 90b0bac A
-error: The following untracked working tree files would be overwritten by merge:
-	path/world
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-File .git/MERGE_HEAD doesn't exist
-HEAD is now at 90b0bac A
-HEAD is now at 2605480 hello
-not ok 20 - directory/submodule conflict; merge --abort works afterward # TODO known breakage
-
-expecting success of 6437.21 'setup for null merge base': 
-	mkdir no-merge-base &&
-	(cd no-merge-base &&
-	git init &&
-	mkdir sub &&
-	(cd sub &&
-	 git init &&
-	 echo "file-a" > file-a &&
-	 git add file-a &&
-	 git commit -m "commit a") &&
-	git commit --allow-empty -m init &&
-	git branch init &&
-	git checkout -b a init &&
-	git add sub &&
-	git commit -m "a" &&
-	git switch main &&
-	(cd sub &&
-	 echo "file-b" > file-b &&
-	 git add file-b &&
-	 git commit -m "commit b"))
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/no-merge-base/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/no-merge-base/sub/.git/
-[main (root-commit) d61d855] commit a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-a
-[main (root-commit) edb5fba] init
- Author: A U Thor <author@example.com>
-Switched to a new branch 'a'
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[a 8b6337e] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-warning: unable to rmdir 'sub': Directory not empty
-Switched to branch 'main'
-[main dc37965] commit b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-b
-ok 21 - setup for null merge base
-
-expecting success of 6437.22 'merging should fail with no merge base': 
-	(cd no-merge-base &&
-	git checkout -b b init &&
-	git add sub &&
-	git commit -m "b" &&
-	test_must_fail git merge a 2>actual &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-    then
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short HEAD^1)" &&
-		grep "$sub_expect" actual
-	fi)
-
-Switched to a new branch 'b'
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[b 5e75592] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-Failed to merge submodule sub (no merge base)
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-hint:  - go to submodule (sub), and either merge commit d61d855
-ok 22 - merging should fail with no merge base
-
-# still have 2 known breakage(s)
-# passed all remaining 20 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6501-freshen-objects.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6501-freshen-objects/.git/
 expecting success of 6501.1 'make repo completely empty (loose)': 
@@ -430506,12 +429552,12 @@
 expecting success of 6501.5 'simulate time passing (loose)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1772524908
-1772524908
-1772524908
-1772524908
-1772524908
-1772524908
+1738116930
+1738116930
+1738116930
+1738116930
+1738116930
+1738116929
 ok 5 - simulate time passing (loose)
 
 expecting success of 6501.6 'start writing new commit with old blob (loose)': 
@@ -430547,15 +429593,15 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at 8539479 base
-1772524909
-1772524908
-1772524908
-1772524908
-1772524909
-1772524909
-1772524909
-1772524909
-1772524909
+1738116930
+1738116930
+1738116930
+1738116930
+1738116930
+1738116930
+1738116930
+1738116930
+1738116930
 ok 10 - abandon objects again (loose)
 
 expecting success of 6501.11 'start writing new commit with same tree (loose)': 
@@ -430622,10 +429668,10 @@
 expecting success of 6501.18 'simulate time passing (repack)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1772524909
-1772524909
-1772524909
-1772524909
+1738116931
+1738116931
+1738116931
+1738116931
 ok 18 - simulate time passing (repack)
 
 expecting success of 6501.19 'start writing new commit with old blob (repack)': 
@@ -430662,17 +429708,17 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at aa8ecd7 base
-1772524910
-1772524909
-1772524909
-1772524909
-1772524909
-1772524909
-1772524910
-1772524910
-1772524910
-1772524910
-1772524910
+1738116932
+1738116931
+1738116931
+1738116931
+1738116931
+1738116931
+1738116931
+1738116931
+1738116931
+1738116931
+1738116931
 ok 23 - abandon objects again (repack)
 
 expecting success of 6501.24 'start writing new commit with same tree (repack)': 
@@ -430739,11 +429785,11 @@
 expecting success of 6501.31 'simulate time passing (bitmap)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1772524910
-1772524910
-1772524910
-1772524910
-1772524910
+1738116932
+1738116932
+1738116932
+1738116932
+1738116932
 ok 31 - simulate time passing (bitmap)
 
 expecting success of 6501.32 'start writing new commit with old blob (bitmap)': 
@@ -430780,17 +429826,17 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at 41163df base
-1772524911
-1772524910
-1772524910
-1772524910
-1772524910
-1772524910
-1772524911
-1772524911
-1772524911
-1772524911
-1772524911
+1738116933
+1738116933
+1738116933
+1738116933
+1738116933
+1738116933
+1738116933
+1738116933
+1738116933
+1738116933
+1738116933
 ok 36 - abandon objects again (bitmap)
 
 expecting success of 6501.37 'start writing new commit with same tree (bitmap)': 
@@ -432220,7 +431266,7 @@
 	git for-each-ref --format="%(authordate:rfc2822)" refs/heads
 
 Tue Jul 4 01:18:44 2006 +0200
-20 years ago
+19 years ago
 2006-07-04
 Mon Jul 3 23:18:44 2006
 2006-07-04 01:18:44 +0200
@@ -434408,6 +433454,952 @@
 1..427
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t6437-submodule-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/.git/
+expecting success of 6437.1 'setup': 
+
+	mkdir sub &&
+	(cd sub &&
+	 git init &&
+	 echo original > file &&
+	 git add file &&
+	 test_tick &&
+	 git commit -m sub-root) &&
+	git add sub &&
+	test_tick &&
+	git commit -m root &&
+
+	git checkout -b a main &&
+	(cd sub &&
+	 echo A > file &&
+	 git add file &&
+	 test_tick &&
+	 git commit -m sub-a) &&
+	git add sub &&
+	test_tick &&
+	git commit -m a &&
+
+	git checkout -b b main &&
+	(cd sub &&
+	 echo B > file &&
+	 git add file &&
+	 test_tick &&
+	 git commit -m sub-b) &&
+	git add sub &&
+	test_tick &&
+	git commit -m b &&
+
+	git checkout -b c a &&
+	git merge -s ours b &&
+
+	git checkout -b d b &&
+	git merge -s ours a
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/sub/.git/
+[main (root-commit) 0998b33] sub-root
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[main (root-commit) 5c9ada4] root
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+Switched to a new branch 'a'
+[main d98dfef] sub-a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[a 6102a2a] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'b'
+M	sub
+[main ce35c37] sub-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[b 0405d8c] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'c'
+M	sub
+Merge made by the 'ours' strategy.
+Switched to a new branch 'd'
+Merge made by the 'ours' strategy.
+ok 1 - setup
+
+expecting success of 6437.2 'setup for merge search': 
+	mkdir merge-search &&
+	(cd merge-search &&
+	git init &&
+	mkdir sub &&
+	(cd sub &&
+	 git init &&
+	 echo "file-a" > file-a &&
+	 git add file-a &&
+	 git commit -m "sub-a" &&
+	 git branch sub-a) &&
+	git commit --allow-empty -m init &&
+	git branch init &&
+	git add sub &&
+	git commit -m "a" &&
+	git branch a &&
+
+	git checkout -b b &&
+	(cd sub &&
+	 git checkout -b sub-b &&
+	 echo "file-b" > file-b &&
+	 git add file-b &&
+	 git commit -m "sub-b") &&
+	git commit -a -m "b" &&
+
+	git checkout -b c a &&
+	(cd sub &&
+	 git checkout -b sub-c sub-a &&
+	 echo "file-c" > file-c &&
+	 git add file-c &&
+	 git commit -m "sub-c") &&
+	git commit -a -m "c")
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/merge-search/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/merge-search/sub/.git/
+[main (root-commit) 9c64145] sub-a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-a
+[main (root-commit) edb5fba] init
+ Author: A U Thor <author@example.com>
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[main ea59e10] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+Switched to a new branch 'b'
+Switched to a new branch 'sub-b'
+[sub-b 1e4c5d4] sub-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-b
+[b 65d3c25] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'c'
+M	sub
+Switched to a new branch 'sub-c'
+[sub-c 18cac7c] sub-c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-c
+[c 00fd913] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - setup for merge search
+
+expecting success of 6437.3 'merging should conflict for non fast-forward': 
+	test_when_finished "git -C merge-search reset --hard" &&
+	(cd merge-search &&
+	 git checkout -b test-nonforward-a b &&
+	  if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	  then
+		test_must_fail git merge c 2>actual &&
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
+		grep "$sub_expect" actual
+	  else
+		test_must_fail git merge c 2> actual
+	  fi)
+
+Switched to a new branch 'test-nonforward-a'
+M	sub
+Failed to merge submodule sub
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+hint:  - go to submodule (sub), and either merge commit 18cac7c
+HEAD is now at 65d3c25 b
+ok 3 - merging should conflict for non fast-forward
+
+expecting success of 6437.4 'finish setup for merge-search': 
+	(cd merge-search &&
+	git checkout -b d a &&
+	(cd sub &&
+	 git checkout -b sub-d sub-b &&
+	 git merge sub-c) &&
+	git commit -a -m "d" &&
+	git branch test b &&
+
+	git checkout -b g init &&
+	(cd sub &&
+	 git checkout -b sub-g sub-c) &&
+	git add sub &&
+	git commit -a -m "g")
+
+Switched to a new branch 'd'
+M	sub
+Switched to a new branch 'sub-d'
+Merge made by the 'ort' strategy.
+ file-c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-c
+[d 40eded3] d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+warning: unable to rmdir 'sub': Directory not empty
+Switched to a new branch 'g'
+Switched to a new branch 'sub-g'
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[g 61ce3a9] g
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+ok 4 - finish setup for merge-search
+
+expecting success of 6437.5 'merge with one side as a fast-forward of the other': 
+	(cd merge-search &&
+	 git checkout -b test-forward b &&
+	 git merge d &&
+	 git ls-tree test-forward sub | cut -f1 | cut -f3 -d" " > actual &&
+	 (cd sub &&
+	  git rev-parse sub-d > ../expect) &&
+	 test_cmp expect actual)
+
+Switched to a new branch 'test-forward'
+M	sub
+Note: Fast-forwarding submodule sub to aafcfa2a62764282ab848d5d6bea86ba217c1b24
+Merge made by the 'ort' strategy.
+ sub | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - merge with one side as a fast-forward of the other
+
+expecting success of 6437.6 'merging should conflict for non fast-forward (resolution exists)': 
+	(cd merge-search &&
+	 git checkout -b test-nonforward-b b &&
+	 (cd sub &&
+	  git rev-parse --short sub-d > ../expect) &&
+	  if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	  then
+		test_must_fail git merge c >actual 2>sub-actual &&
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
+		grep "$sub_expect" sub-actual
+	  else
+		test_must_fail git merge c 2> actual
+	  fi &&
+	 grep $(cat expect) actual > /dev/null &&
+	 git reset --hard)
+
+Switched to a new branch 'test-nonforward-b'
+M	sub
+hint:  - go to submodule (sub), and either merge commit 18cac7c
+HEAD is now at 65d3c25 b
+ok 6 - merging should conflict for non fast-forward (resolution exists)
+
+expecting success of 6437.7 'merging should fail for ambiguous common parent': 
+	(cd merge-search &&
+	git checkout -b test-ambiguous b &&
+	(cd sub &&
+	 git checkout -b ambiguous sub-b &&
+	 git merge sub-c &&
+	 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	 then
+		git rev-parse --short sub-d >../expect1 &&
+		git rev-parse --short ambiguous >../expect2
+	 else
+		git rev-parse sub-d > ../expect1 &&
+		git rev-parse ambiguous > ../expect2
+	 fi
+	 ) &&
+	 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	 then
+		test_must_fail git merge c >actual 2>sub-actual &&
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
+		grep "$sub_expect" sub-actual
+	 else
+		test_must_fail git merge c 2> actual
+	 fi &&
+	grep $(cat expect1) actual > /dev/null &&
+	grep $(cat expect2) actual > /dev/null &&
+	git reset --hard)
+
+Switched to a new branch 'test-ambiguous'
+M	sub
+Switched to a new branch 'ambiguous'
+Merge made by the 'ort' strategy.
+ file-c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-c
+hint:  - go to submodule (sub), and either merge commit 18cac7c
+HEAD is now at 65d3c25 b
+ok 7 - merging should fail for ambiguous common parent
+
+expecting success of 6437.8 'merging should fail for changes that are backwards': 
+	(cd merge-search &&
+	git checkout -b bb a &&
+	(cd sub &&
+	 git checkout sub-b) &&
+	git commit -a -m "bb" &&
+
+	git checkout -b e bb &&
+	(cd sub &&
+	 git checkout sub-a) &&
+	git commit -a -m "e" &&
+
+	git checkout -b f bb &&
+	(cd sub &&
+	 git checkout sub-d) &&
+	git commit -a -m "f" &&
+
+	git checkout -b test-backward e &&
+	test_must_fail git merge f 2>actual &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+    then
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-d)" &&
+		grep "$sub_expect" actual
+	fi)
+
+Switched to a new branch 'bb'
+M	sub
+Switched to branch 'sub-b'
+[bb 41fd2a8] bb
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'e'
+Switched to branch 'sub-a'
+[e 49e8960] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'f'
+M	sub
+Switched to branch 'sub-d'
+[f ceec2f6] f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'test-backward'
+M	sub
+Failed to merge submodule sub (commits don't follow merge-base)
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+hint:  - go to submodule (sub), and either merge commit aafcfa2
+ok 8 - merging should fail for changes that are backwards
+
+expecting success of 6437.9 'git submodule status should display the merge conflict properly with merge base': 
+       (cd merge-search &&
+       cat >.gitmodules <<EOF &&
+[submodule "sub"]
+       path = sub
+       url = $TRASH_DIRECTORY/sub
+EOF
+       cat >expect <<EOF &&
+U$ZERO_OID sub
+EOF
+       git submodule status > actual &&
+       test_cmp expect actual &&
+	git reset --hard)
+
+HEAD is now at 49e8960 e
+ok 9 - git submodule status should display the merge conflict properly with merge base
+
+expecting success of 6437.10 'git submodule status should display the merge conflict properly without merge-base': 
+       (cd merge-search &&
+	git checkout -b test-no-merge-base g &&
+	test_must_fail git merge b &&
+       cat >.gitmodules <<EOF &&
+[submodule "sub"]
+       path = sub
+       url = $TRASH_DIRECTORY/sub
+EOF
+       cat >expect <<EOF &&
+U$ZERO_OID sub
+EOF
+       git submodule status > actual &&
+       test_cmp expect actual &&
+       git reset --hard)
+
+Switched to a new branch 'test-no-merge-base'
+M	sub
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (sub), and either merge commit 1e4c5d4
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add sub
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config advice.submoduleMergeConflict false"
+Failed to merge submodule sub (no merge base)
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 61ce3a9 g
+ok 10 - git submodule status should display the merge conflict properly without merge-base
+
+expecting success of 6437.11 'merging with a modify/modify conflict between merge bases': 
+	git reset --hard HEAD &&
+	git checkout -b test2 c &&
+	git merge d
+
+HEAD is now at f35b3af Merge branch 'a' into d
+Switched to a new branch 'test2'
+M	sub
+  From inner merge:  Note: Fast-forwarding submodule sub to ce35c37b7ac232e25ec1e4224f220de1cc360c38
+Merge made by the 'ort' strategy.
+ok 11 - merging with a modify/modify conflict between merge bases
+
+expecting success of 6437.12 'setup for recursive merge with submodule': 
+	mkdir merge-recursive &&
+	(cd merge-recursive &&
+	 git init &&
+	 mkdir sub &&
+	 (cd sub &&
+	  git init &&
+	  test_commit a &&
+	  git checkout -b sub-b main &&
+	  test_commit b &&
+	  git checkout -b sub-c main &&
+	  test_commit c &&
+	  git checkout -b sub-bc sub-b &&
+	  git merge sub-c &&
+	  git checkout -b sub-cb sub-c &&
+	  git merge sub-b &&
+	  git checkout main) &&
+	 git add sub &&
+	 git commit -m a &&
+	 git checkout -b top-b main &&
+	 (cd sub && git checkout sub-b) &&
+	 git add sub &&
+	 git commit -m b &&
+	 git checkout -b top-c main &&
+	 (cd sub && git checkout sub-c) &&
+	 git add sub &&
+	 git commit -m c &&
+	 git checkout -b top-bc top-b &&
+	 git merge -s ours --no-commit top-c &&
+	 (cd sub && git checkout sub-bc) &&
+	 git add sub &&
+	 git commit -m bc &&
+	 git checkout -b top-cb top-c &&
+	 git merge -s ours --no-commit top-b &&
+	 (cd sub && git checkout sub-cb) &&
+	 git add sub &&
+	 git commit -m cb)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/merge-recursive/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/merge-recursive/sub/.git/
+[main (root-commit) 9d932ab] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+Switched to a new branch 'sub-b'
+[sub-b 8b32189] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+Switched to a new branch 'sub-c'
+[sub-c 7d3d4d8] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Switched to a new branch 'sub-bc'
+Merge made by the 'ort' strategy.
+ c.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Switched to a new branch 'sub-cb'
+Merge made by the 'ort' strategy.
+ b.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+Switched to branch 'main'
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[main (root-commit) a2ff72f] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+Switched to a new branch 'top-b'
+Switched to branch 'sub-b'
+[top-b f6b4d5a] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'top-c'
+M	sub
+Switched to branch 'sub-c'
+[top-c 4d9cfab] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'top-bc'
+M	sub
+Automatic merge went well; stopped before committing as requested
+Switched to branch 'sub-bc'
+[top-bc ff9bd9b] bc
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'top-cb'
+M	sub
+Automatic merge went well; stopped before committing as requested
+Switched to branch 'sub-cb'
+[top-cb a0ac63b] cb
+ Author: A U Thor <author@example.com>
+ok 12 - setup for recursive merge with submodule
+
+expecting success of 6437.13 'recursive merge with submodule': 
+	(cd merge-recursive &&
+	 test_must_fail git merge top-bc &&
+	 echo "160000 $(git rev-parse top-cb:sub) 2	sub" > expect2 &&
+	 echo "160000 $(git rev-parse top-bc:sub) 3	sub" > expect3 &&
+	 git ls-files -u > actual &&
+	 grep "$(cat expect2)" actual > /dev/null &&
+	 grep "$(cat expect3)" actual > /dev/null)
+
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (sub), and either merge commit 8060496
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add sub
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config advice.submoduleMergeConflict false"
+  From inner merge:  CONFLICT (submodule): Merge conflict in sub
+Failed to merge submodule sub
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+ok 13 - recursive merge with submodule
+
+expecting success of 6437.14 'setup file/submodule conflict': 
+	git init file-submodule &&
+	(
+		cd file-submodule &&
+
+		git commit --allow-empty -m O &&
+
+		git branch A &&
+		git branch B &&
+
+		git checkout B &&
+		echo content >path &&
+		git add path &&
+		git commit -m B &&
+
+		git checkout A &&
+		git init path &&
+		test_commit -C path world &&
+		git submodule add ./path &&
+		git commit -m A
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/file-submodule/.git/
+[main (root-commit) f09f54e] O
+ Author: A U Thor <author@example.com>
+Switched to branch 'B'
+[B 208816f] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 path
+Switched to branch 'A'
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/file-submodule/path/.git/
+[main (root-commit) 26692a7] world
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world.t
+Adding existing repo at 'path' to the index
+[A 85fc078] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 path
+ok 14 - setup file/submodule conflict
+
+expecting success of 6437.15 'file/submodule conflict': 
+	test_when_finished "git -C file-submodule reset --hard" &&
+	(
+		cd file-submodule &&
+
+		git checkout A^0 &&
+		test_must_fail git merge B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+
+		# path/ is still a submodule
+		test_path_is_dir path/.git &&
+
+		# There is a submodule at "path", so B:path cannot be written
+		# there.  We expect it to be written somewhere in the same
+		# directory, though, so just grep for its content in all
+		# files, and ignore "grep: path: Is a directory" message
+		echo Checking if contents from B:path showed up anywhere &&
+		grep -q content * 2>/dev/null
+	)
+
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 85fc078 A
+CONFLICT (distinct types): path had different types on each side; renamed one of them so each can be recorded somewhere.
+Automatic merge failed; fix conflicts and then commit the result.
+Checking if contents from B:path showed up anywhere
+HEAD is now at 85fc078 A
+ok 15 - file/submodule conflict
+
+expecting success of 6437.16 'file/submodule conflict; merge --abort works afterward': 
+	test_when_finished "git -C file-submodule reset --hard" &&
+	(
+		cd file-submodule &&
+
+		git checkout A^0 &&
+		test_must_fail git merge B^0 >out 2>err &&
+
+		test_path_is_file .git/MERGE_HEAD &&
+		git merge --abort
+	)
+
+HEAD is now at 85fc078 A
+HEAD is now at 85fc078 A
+ok 16 - file/submodule conflict; merge --abort works afterward
+
+expecting success of 6437.17 'setup directory/submodule conflict': 
+	git init directory-submodule &&
+	(
+		cd directory-submodule &&
+
+		git commit --allow-empty -m O &&
+
+		git branch A &&
+		git branch B1 &&
+		git branch B2 &&
+
+		git checkout B1 &&
+		mkdir path &&
+		echo contents >path/file &&
+		git add path/file &&
+		git commit -m B1 &&
+
+		git checkout B2 &&
+		mkdir path &&
+		echo contents >path/world &&
+		git add path/world &&
+		git commit -m B2 &&
+
+		git checkout A &&
+		git init path &&
+		test_commit -C path hello world &&
+		git submodule add ./path &&
+		git commit -m A
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/directory-submodule/.git/
+[main (root-commit) f09f54e] O
+ Author: A U Thor <author@example.com>
+Switched to branch 'B1'
+[B1 8ab0f0c] B1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 path/file
+Switched to branch 'B2'
+[B2 db2a533] B2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 path/world
+Switched to branch 'A'
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/directory-submodule/path/.git/
+[main (root-commit) 2605480] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world
+Adding existing repo at 'path' to the index
+[A 90b0bac] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 path
+ok 17 - setup directory/submodule conflict
+
+checking known breakage of 6437.18 'directory/submodule conflict; keep submodule clean': 
+	test_when_finished "git -C directory-submodule reset --hard" &&
+	(
+		cd directory-submodule &&
+
+		git checkout A^0 &&
+		test_must_fail git merge B1^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+
+		# path/ is still a submodule
+		test_path_is_dir path/.git &&
+
+		echo Checking if contents from B1:path/file showed up &&
+		# Would rather use grep -r, but that is GNU extension...
+		git ls-files -co | xargs grep -q contents 2>/dev/null &&
+
+		# However, B1:path/file should NOT have shown up at path/file,
+		# because we should not write into the submodule
+		test_path_is_missing path/file
+	)
+
+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 90b0bac A
+warning: unable to rmdir 'path': Directory not empty
+CONFLICT (file/directory): directory in the way of path from HEAD; moving it to path~HEAD instead.
+Automatic merge failed; fix conflicts and then commit the result.
+Checking if contents from B1:path/file showed up
+Path exists:
+-rw-r--r-- 1 pbuilder2 pbuilder2 9 Jan 30 02:15 path/file
+HEAD is now at 90b0bac A
+not ok 18 - directory/submodule conflict; keep submodule clean # TODO known breakage
+
+checking prerequisite: FAIL_PREREQS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
+		test_bool_env GIT_TEST_FAIL_PREREQS false
+	
+)
+prerequisite FAIL_PREREQS not satisfied
+expecting success of 6437.19 'directory/submodule conflict; should not treat submodule files as untracked or in the way': 
+	test_when_finished "git -C directory-submodule/path reset --hard" &&
+	test_when_finished "git -C directory-submodule reset --hard" &&
+	(
+		cd directory-submodule &&
+
+		git checkout A^0 &&
+		test_must_fail git merge B2^0 >out 2>err &&
+
+		# We do not want files within the submodule to prevent the
+		# merge from starting; we should not be writing to such paths
+		# anyway.
+		test_grep ! "refusing to lose untracked file at" err
+	)
+
+HEAD is now at 90b0bac A
+HEAD is now at 90b0bac A
+HEAD is now at 2605480 hello
+ok 19 - directory/submodule conflict; should not treat submodule files as untracked or in the way
+
+checking known breakage of 6437.20 'directory/submodule conflict; merge --abort works afterward': 
+	test_when_finished "git -C directory-submodule/path reset --hard" &&
+	test_when_finished "git -C directory-submodule reset --hard" &&
+	(
+		cd directory-submodule &&
+
+		git checkout A^0 &&
+		test_must_fail git merge B2^0 &&
+		test_path_is_file .git/MERGE_HEAD &&
+
+		# merge --abort should succeed, should clear .git/MERGE_HEAD,
+		# and should not leave behind any conflicted files
+		git merge --abort &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
+
+HEAD is now at 90b0bac A
+error: The following untracked working tree files would be overwritten by merge:
+	path/world
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+File .git/MERGE_HEAD doesn't exist
+HEAD is now at 90b0bac A
+HEAD is now at 2605480 hello
+not ok 20 - directory/submodule conflict; merge --abort works afterward # TODO known breakage
+
+expecting success of 6437.21 'setup for null merge base': 
+	mkdir no-merge-base &&
+	(cd no-merge-base &&
+	git init &&
+	mkdir sub &&
+	(cd sub &&
+	 git init &&
+	 echo "file-a" > file-a &&
+	 git add file-a &&
+	 git commit -m "commit a") &&
+	git commit --allow-empty -m init &&
+	git branch init &&
+	git checkout -b a init &&
+	git add sub &&
+	git commit -m "a" &&
+	git switch main &&
+	(cd sub &&
+	 echo "file-b" > file-b &&
+	 git add file-b &&
+	 git commit -m "commit b"))
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/no-merge-base/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6437-submodule-merge/no-merge-base/sub/.git/
+[main (root-commit) d61d855] commit a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-a
+[main (root-commit) edb5fba] init
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'a'
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[a 8b6337e] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+warning: unable to rmdir 'sub': Directory not empty
+Switched to branch 'main'
+[main dc37965] commit b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-b
+ok 21 - setup for null merge base
+
+expecting success of 6437.22 'merging should fail with no merge base': 
+	(cd no-merge-base &&
+	git checkout -b b init &&
+	git add sub &&
+	git commit -m "b" &&
+	test_must_fail git merge a 2>actual &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+    then
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short HEAD^1)" &&
+		grep "$sub_expect" actual
+	fi)
+
+Switched to a new branch 'b'
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[b 5e75592] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+Failed to merge submodule sub (no merge base)
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+hint:  - go to submodule (sub), and either merge commit d61d855
+ok 22 - merging should fail with no merge base
+
+# still have 2 known breakage(s)
+# passed all remaining 20 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7005-editor.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7005-editor/.git/
 expecting success of 7005.1 'determine default editor': 
@@ -434625,601 +434617,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7002-mv-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7002-mv-sparse-checkout/.git/
-expecting success of 7002.1 'setup': 
-	mkdir -p sub/dir sub/dir2 &&
-	touch a b c sub/d sub/dir/e sub/dir2/e &&
-	git add -A &&
-	git commit -m files &&
-
-	cat >sparse_error_header <<-EOF &&
-	The following paths and/or pathspecs matched paths that exist
-	outside of your sparse-checkout definition, so will not be
-	updated in the index:
-	EOF
-
-	cat >sparse_hint <<-EOF &&
-	hint: If you intend to update such entries, try one of the following:
-	hint: * Use the --sparse option.
-	hint: * Disable or modify the sparsity rules.
-	hint: Disable this message with "git config advice.updateSparsePath false"
-	EOF
-
-	cat >dirty_error_header <<-EOF &&
-	The following paths have been moved outside the
-	sparse-checkout definition but are not sparse due to local
-	modifications.
-	EOF
-
-	cat >dirty_hint <<-EOF
-	hint: To correct the sparsity of these paths, do the following:
-	hint: * Use "git add --sparse <paths>" to update the index
-	hint: * Use "git sparse-checkout reapply" to apply the sparsity rules
-	hint: Disable this message with "git config advice.updateSparsePath false"
-	EOF
-
-[master (root-commit) 127a813] files
- Author: A U Thor <author@example.com>
- 6 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
- create mode 100644 b
- create mode 100644 c
- create mode 100644 sub/d
- create mode 100644 sub/dir/e
- create mode 100644 sub/dir2/e
-ok 1 - setup
-
-expecting success of 7002.2 'mv refuses to move sparse-to-sparse': 
-	test_when_finished rm -f e &&
-	git reset --hard &&
-	git sparse-checkout set --no-cone a &&
-	touch b &&
-	test_must_fail git mv b e 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo b >>expect &&
-	echo e >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse b e 2>stderr &&
-	test_must_be_empty stderr
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-ok 2 - mv refuses to move sparse-to-sparse
-
-expecting success of 7002.3 'mv refuses to move sparse-to-sparse, ignores failure': 
-	test_when_finished rm -f b c e &&
-	git reset --hard &&
-	git sparse-checkout set a &&
-
-	# tracked-to-untracked
-	touch b &&
-	git mv -k b e 2>stderr &&
-	test_path_exists b &&
-	test_path_is_missing e &&
-	cat sparse_error_header >expect &&
-	echo b >>expect &&
-	echo e >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse b e 2>stderr &&
-	test_must_be_empty stderr &&
-	test_path_is_missing b &&
-	test_path_exists e &&
-
-	# tracked-to-tracked
-	git reset --hard &&
-	touch b &&
-	git mv -k b c 2>stderr &&
-	test_path_exists b &&
-	test_path_is_missing c &&
-	cat sparse_error_header >expect &&
-	echo b >>expect &&
-	echo c >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse b c 2>stderr &&
-	test_must_be_empty stderr &&
-	test_path_is_missing b &&
-	test_path_exists c
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-error: Path 'e' not uptodate; will not remove from working tree.
-HEAD is now at 127a813 files
-ok 3 - mv refuses to move sparse-to-sparse, ignores failure
-
-expecting success of 7002.4 'mv refuses to move non-sparse-to-sparse': 
-	test_when_finished rm -f b c e &&
-	git reset --hard &&
-	git sparse-checkout set a &&
-
-	# tracked-to-untracked
-	test_must_fail git mv a e 2>stderr &&
-	test_path_exists a &&
-	test_path_is_missing e &&
-	cat sparse_error_header >expect &&
-	echo e >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse a e 2>stderr &&
-	test_must_be_empty stderr &&
-	test_path_is_missing a &&
-	test_path_exists e &&
-
-	# tracked-to-tracked
-	rm e &&
-	git reset --hard &&
-	test_must_fail git mv a c 2>stderr &&
-	test_path_exists a &&
-	test_path_is_missing c &&
-	cat sparse_error_header >expect &&
-	echo c >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse a c 2>stderr &&
-	test_must_be_empty stderr &&
-	test_path_is_missing a &&
-	test_path_exists c
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-HEAD is now at 127a813 files
-ok 4 - mv refuses to move non-sparse-to-sparse
-
-expecting success of 7002.5 'mv refuses to move sparse-to-non-sparse': 
-	test_when_finished rm -f b c e &&
-	git reset --hard &&
-	git sparse-checkout set a e &&
-
-	# tracked-to-untracked
-	touch b &&
-	test_must_fail git mv b e 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo b >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse b e 2>stderr &&
-	test_must_be_empty stderr
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-ok 5 - mv refuses to move sparse-to-non-sparse
-
-expecting success of 7002.6 'recursive mv refuses to move (possible) sparse': 
-	test_when_finished rm -rf b c e sub2 &&
-	git reset --hard &&
-	# Without cone mode, "sub" and "sub2" do not match
-	git sparse-checkout set sub/dir sub2/dir &&
-
-	# Add contained contents to ensure we avoid non-existence errors
-	mkdir sub/dir2 &&
-	touch sub/d sub/dir2/e &&
-
-	test_must_fail git mv sub sub2 2>stderr &&
-	cat sparse_error_header >expect &&
-	cat >>expect <<-\EOF &&
-	sub/d
-	sub2/d
-	sub/dir2/e
-	sub2/dir2/e
-	EOF
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse sub sub2 2>stderr &&
-	test_must_be_empty stderr &&
-	git commit -m "moved sub to sub2" &&
-	git rev-parse HEAD~1:sub >expect &&
-	git rev-parse HEAD:sub2 >actual &&
-	test_cmp expect actual &&
-	git reset --hard HEAD~1
-
-HEAD is now at 127a813 files
-[master 361f042] moved sub to sub2
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {sub => sub2}/d (100%)
- rename {sub => sub2}/dir/e (100%)
- rename {sub => sub2}/dir2/e (100%)
-error: Path 'sub2/d' not uptodate; will not remove from working tree.
-error: Path 'sub2/dir2/e' not uptodate; will not remove from working tree.
-HEAD is now at 127a813 files
-ok 6 - recursive mv refuses to move (possible) sparse
-
-expecting success of 7002.7 'recursive mv refuses to move sparse': 
-	git reset --hard &&
-	# Use cone mode so "sub/" matches the sparse-checkout patterns
-	git sparse-checkout init --cone &&
-	git sparse-checkout set sub/dir sub2/dir &&
-
-	# Add contained contents to ensure we avoid non-existence errors
-	mkdir sub/dir2 &&
-	touch sub/dir2/e &&
-
-	test_must_fail git mv sub sub2 2>stderr &&
-	cat sparse_error_header >expect &&
-	cat >>expect <<-\EOF &&
-	sub/dir2/e
-	sub2/dir2/e
-	EOF
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse sub sub2 2>stderr &&
-	test_must_be_empty stderr &&
-	git commit -m "moved sub to sub2" &&
-	git rev-parse HEAD~1:sub >expect &&
-	git rev-parse HEAD:sub2 >actual &&
-	test_cmp expect actual &&
-	git reset --hard HEAD~1
-
-HEAD is now at 127a813 files
-warning: unrecognized pattern: 'sub/dir'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'sub/dir'
-warning: disabling cone pattern matching
-[master 361f042] moved sub to sub2
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {sub => sub2}/d (100%)
- rename {sub => sub2}/dir/e (100%)
- rename {sub => sub2}/dir2/e (100%)
-error: Path 'sub2/dir2/e' not uptodate; will not remove from working tree.
-HEAD is now at 127a813 files
-ok 7 - recursive mv refuses to move sparse
-
-expecting success of 7002.8 'can move files to non-sparse dir': 
-	git reset --hard &&
-	git sparse-checkout init --no-cone &&
-	git sparse-checkout set a b c w !/x y/ &&
-	mkdir -p w x/y &&
-
-	git mv a w/new-a 2>stderr &&
-	git mv b x/y/new-b 2>stderr &&
-	test_must_be_empty stderr
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-warning: pass a leading slash before paths such as 'b' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-warning: pass a leading slash before paths such as 'c' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-ok 8 - can move files to non-sparse dir
-
-expecting success of 7002.9 'refuse to move file to non-skip-worktree sparse path': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	git reset --hard &&
-	git sparse-checkout init --no-cone &&
-	git sparse-checkout set a !/x y/ !x/y/z &&
-	mkdir -p x/y/z &&
-
-	test_must_fail git mv a x/y/z/new-a 2>stderr &&
-	echo x/y/z/new-a | cat sparse_error_header - sparse_hint >expect &&
-	test_cmp expect stderr
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-HEAD is now at 127a813 files
-ok 9 - refuse to move file to non-skip-worktree sparse path
-
-expecting success of 7002.10 'refuse to move out-of-cone directory without --sparse': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-
-	test_must_fail git mv folder1 sub 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo folder1/file1 >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr
-
-HEAD is now at 127a813 files
-ok 10 - refuse to move out-of-cone directory without --sparse
-
-expecting success of 7002.11 'can move out-of-cone directory with --sparse': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-
-	git mv --sparse folder1 sub 2>stderr &&
-	test_must_be_empty stderr &&
-
-	test_path_is_dir sub/folder1 &&
-	test_path_is_file sub/folder1/file1
-
-HEAD is now at 127a813 files
-ok 11 - can move out-of-cone directory with --sparse
-
-expecting success of 7002.12 'refuse to move out-of-cone file without --sparse': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-
-	test_must_fail git mv folder1/file1 sub 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo folder1/file1 >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr
-
-HEAD is now at 127a813 files
-ok 12 - refuse to move out-of-cone file without --sparse
-
-expecting success of 7002.13 'can move out-of-cone file with --sparse': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-
-	git mv --sparse folder1/file1 sub 2>stderr &&
-	test_must_be_empty stderr &&
-
-	test_path_is_file sub/file1
-
-HEAD is now at 127a813 files
-ok 13 - can move out-of-cone file with --sparse
-
-expecting success of 7002.14 'refuse to move sparse file to existing destination': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	mkdir folder1 &&
-	touch folder1/file1 &&
-	touch sub/file1 &&
-	git add folder1 sub/file1 &&
-	git sparse-checkout set --cone sub &&
-
-	test_must_fail git mv --sparse folder1/file1 sub 2>stderr &&
-	echo "fatal: destination exists, source=folder1/file1, destination=sub/file1" >expect &&
-	test_cmp expect stderr
-
-HEAD is now at 127a813 files
-ok 14 - refuse to move sparse file to existing destination
-
-expecting success of 7002.15 'move sparse file to existing destination with --force and --sparse': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	mkdir folder1 &&
-	touch folder1/file1 &&
-	touch sub/file1 &&
-	echo "overwrite" >folder1/file1 &&
-	git add folder1 sub/file1 &&
-	git sparse-checkout set --cone sub &&
-
-	git mv --sparse --force folder1/file1 sub 2>stderr &&
-	test_must_be_empty stderr &&
-	echo "overwrite" >expect &&
-	test_cmp expect sub/file1
-
-HEAD is now at 127a813 files
-ok 15 - move sparse file to existing destination with --force and --sparse
-
-expecting success of 7002.16 'move clean path from in-cone to out-of-cone': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-
-	test_must_fail git mv sub/d folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/d" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse sub/d folder1 2>stderr &&
-	test_must_be_empty stderr &&
-
-	test_path_is_missing sub/d &&
-	test_path_is_missing folder1/d &&
-	git ls-files -t >actual &&
-	! grep "^H sub/d\$" actual &&
-	grep "S folder1/d" actual
-
-S folder1/d
-HEAD is now at 127a813 files
-ok 16 - move clean path from in-cone to out-of-cone
-
-expecting success of 7002.17 'move clean path from in-cone to out-of-cone overwrite': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-	echo "sub/file1 overwrite" >sub/file1 &&
-	git add sub/file1 &&
-
-	test_must_fail git mv sub/file1 folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/file1" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	test_must_fail git mv --sparse sub/file1 folder1 2>stderr &&
-	echo "fatal: destination exists in the index, source=sub/file1, destination=folder1/file1" \
-	>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse -f sub/file1 folder1 2>stderr &&
-	test_must_be_empty stderr &&
-
-	test_path_is_missing sub/file1 &&
-	test_path_is_missing folder1/file1 &&
-	git ls-files -t >actual &&
-	! grep "H sub/file1" actual &&
-	grep "S folder1/file1" actual &&
-
-	# compare file content before move and after move
-	echo "sub/file1 overwrite" >expect &&
-	git ls-files -s -- folder1/file1 | awk "{print \$2}" >oid &&
-	git cat-file blob $(cat oid) >actual &&
-	test_cmp expect actual
-
-S folder1/file1
-HEAD is now at 127a813 files
-ok 17 - move clean path from in-cone to out-of-cone overwrite
-
-expecting success of 7002.18 'move clean path from in-cone to out-of-cone file overwrite': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-	echo "sub/file1 overwrite" >sub/file1 &&
-	git add sub/file1 &&
-
-	test_must_fail git mv sub/file1 folder1/file1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/file1" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	test_must_fail git mv --sparse sub/file1 folder1/file1 2>stderr &&
-	echo "fatal: destination exists in the index, source=sub/file1, destination=folder1/file1" \
-	>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse -f sub/file1 folder1/file1 2>stderr &&
-	test_must_be_empty stderr &&
-
-	test_path_is_missing sub/file1 &&
-	test_path_is_missing folder1/file1 &&
-	git ls-files -t >actual &&
-	! grep "H sub/file1" actual &&
-	grep "S folder1/file1" actual &&
-
-	# compare file content before move and after move
-	echo "sub/file1 overwrite" >expect &&
-	git ls-files -s -- folder1/file1 | awk "{print \$2}" >oid &&
-	git cat-file blob $(cat oid) >actual &&
-	test_cmp expect actual
-
-S folder1/file1
-HEAD is now at 127a813 files
-ok 18 - move clean path from in-cone to out-of-cone file overwrite
-
-expecting success of 7002.19 'move directory with one of the files overwrite': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	mkdir -p folder1/dir &&
-	touch folder1/dir/file1 &&
-	git add folder1 &&
-	git sparse-checkout set --cone sub &&
-
-	echo test >sub/dir/file1 &&
-	git add sub/dir/file1 &&
-
-	test_must_fail git mv sub/dir folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/dir/e" >>expect &&
-	echo "folder1/dir/file1" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	test_must_fail git mv --sparse sub/dir folder1 2>stderr &&
-	echo "fatal: destination exists in the index, source=sub/dir/file1, destination=folder1/dir/file1" \
-	>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse -f sub/dir folder1 2>stderr &&
-	test_must_be_empty stderr &&
-
-	test_path_is_missing sub/dir/file1 &&
-	test_path_is_missing sub/dir/e &&
-	test_path_is_missing folder1/file1 &&
-	git ls-files -t >actual &&
-	! grep "H sub/dir/file1" actual &&
-	! grep "H sub/dir/e" actual &&
-	grep "S folder1/dir/file1" actual &&
-
-	# compare file content before move and after move
-	echo test >expect &&
-	git ls-files -s -- folder1/dir/file1 | awk "{print \$2}" >oid &&
-	git cat-file blob $(cat oid) >actual &&
-	test_cmp expect actual
-
-S folder1/dir/file1
-HEAD is now at 127a813 files
-ok 19 - move directory with one of the files overwrite
-
-expecting success of 7002.20 'move dirty path from in-cone to out-of-cone': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-	echo "modified" >>sub/d &&
-
-	test_must_fail git mv sub/d folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/d" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse sub/d folder1 2>stderr &&
-	cat dirty_error_header >expect &&
-	echo "folder1/d" >>expect &&
-	cat dirty_hint >>expect &&
-	test_cmp expect stderr &&
-
-	test_path_is_missing sub/d &&
-	test_path_is_file folder1/d &&
-	git ls-files -t >actual &&
-	! grep "^H sub/d\$" actual &&
-	grep "H folder1/d" actual
-
-H folder1/d
-HEAD is now at 127a813 files
-ok 20 - move dirty path from in-cone to out-of-cone
-
-expecting success of 7002.21 'move dir from in-cone to out-of-cone': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-	mkdir sub/dir/deep &&
-
-	test_must_fail git mv sub/dir folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/dir/e" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse sub/dir folder1 2>stderr &&
-	test_must_be_empty stderr &&
-
-	test_path_is_missing sub/dir &&
-	test_path_is_missing folder1 &&
-	git ls-files -t >actual &&
-	! grep "H sub/dir/e" actual &&
-	grep "S folder1/dir/e" actual
-
-S folder1/dir/e
-HEAD is now at 127a813 files
-ok 21 - move dir from in-cone to out-of-cone
-
-expecting success of 7002.22 'move partially-dirty dir from in-cone to out-of-cone': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-	mkdir sub/dir/deep &&
-	touch sub/dir/e2 sub/dir/e3 &&
-	git add sub/dir/e2 sub/dir/e3 &&
-	echo "modified" >>sub/dir/e2 &&
-	echo "modified" >>sub/dir/e3 &&
-
-	test_must_fail git mv sub/dir folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/dir/e" >>expect &&
-	echo "folder1/dir/e2" >>expect &&
-	echo "folder1/dir/e3" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse sub/dir folder1 2>stderr &&
-	cat dirty_error_header >expect &&
-	echo "folder1/dir/e2" >>expect &&
-	echo "folder1/dir/e3" >>expect &&
-	cat dirty_hint >>expect &&
-	test_cmp expect stderr &&
-
-	test_path_is_missing sub/dir &&
-	test_path_is_missing folder1/dir/e &&
-	test_path_is_file folder1/dir/e2 &&
-	test_path_is_file folder1/dir/e3 &&
-	git ls-files -t >actual &&
-	! grep "H sub/dir/e" actual &&
-	! grep "H sub/dir/e2" actual &&
-	! grep "H sub/dir/e3" actual &&
-	grep "S folder1/dir/e" actual &&
-	grep "H folder1/dir/e2" actual &&
-	grep "H folder1/dir/e3" actual
-
-S folder1/dir/e
-H folder1/dir/e2
-H folder1/dir/e3
-HEAD is now at 127a813 files
-ok 22 - move partially-dirty dir from in-cone to out-of-cone
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7007-show.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7007-show/.git/
 expecting success of 7007.1 'setup': 
@@ -435446,811 +434843,239 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7010-setup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+*** t5572-pull-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/.git/
+expecting success of 5572.1 'git_pull: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
  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
+ 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.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
  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
+ 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.47.2/t/trash directory.t5572-pull-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.47.2/t/trash directory.t5572-pull-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-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.47.2/t/trash directory.t5572-pull-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.47.2/t/trash directory.t5572-pull-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(+)
-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
+ 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.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-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'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_pull: added submodule creates empty directory
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup/tester/.git/
-ok 13 - setup deeper work tree
+expecting success of 5572.2 'git_pull: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - git_pull: added submodule leaves existing empty directory alone
 
-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.47.2/t/trash directory.t7010-setup: '/build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup' is outside repository at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7010-setup/testerx
-fatal: /build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup/testerx: '/build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup/testerx' is outside repository at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7010-setup/testex
-fatal: /build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup/testex: '/build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup/testex' is outside repository at '/build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7011-skip-worktree-reading.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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) 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 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
-
-ok 11 - diff-index does not examine skip-worktree dirty entries
-
-expecting success of 7011.12 'diff-files does not examine skip-worktree absent entries': 
-	setup_absent &&
-	test -z "$(git diff-files -- one)"
-
-ok 12 - diff-files does not examine skip-worktree absent entries
-
-expecting success of 7011.13 'diff-files does not examine skip-worktree dirty entries': 
-	setup_dirty &&
-	test -z "$(git diff-files -- one)"
-
-ok 13 - diff-files does not examine skip-worktree dirty entries
-
-expecting success of 7011.14 'commit on skip-worktree absent entries': 
-	git reset &&
-	setup_absent &&
-	test_must_fail git commit -m null 1
-
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	2
-	expect.full
-	expect.skip
-	expected
-	result
-	sub/
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 14 - commit on skip-worktree absent entries
-
-expecting success of 7011.15 'commit on skip-worktree dirty entries': 
-	git reset &&
-	setup_dirty &&
-	test_must_fail git commit -m null 1
-
-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/
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 15 - commit on skip-worktree dirty entries
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7012-skip-worktree-writing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7012-skip-worktree-writing/.git/
-expecting success of 7012.1 'setup': 
-	test_commit init &&
-	echo modified >> init.t &&
-	touch added &&
-	git add init.t added &&
-	git commit -m "modified and added" &&
-	git tag top
-
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master fa1ce8e] modified and added
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 added
-ok 1 - setup
-
-expecting success of 7012.2 'read-tree updates worktree, absent case': 
-	git checkout -f top &&
-	git update-index --skip-worktree init.t &&
-	rm init.t &&
-	git read-tree -m -u HEAD^ &&
-	echo init > expected &&
-	test_cmp expected init.t
-
-Note: switching to 'top'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-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 fa1ce8e modified and added
-ok 2 - read-tree updates worktree, absent case
-
-expecting success of 7012.3 'read-tree updates worktree, dirty case': 
-	git checkout -f top &&
-	git update-index --skip-worktree init.t &&
-	echo dirty >> init.t &&
-	test_must_fail git read-tree -m -u HEAD^ &&
-	grep -q dirty init.t &&
-	test "$(git ls-files -t init.t)" = "S init.t" &&
-	git update-index --no-skip-worktree init.t
-
-HEAD is now at fa1ce8e modified and added
-error: Entry 'init.t' not uptodate. Cannot merge.
-ok 3 - read-tree updates worktree, dirty case
-
-expecting success of 7012.4 'read-tree removes worktree, absent case': 
-	git checkout -f top &&
-	git update-index --skip-worktree added &&
-	rm added &&
-	git read-tree -m -u HEAD^ &&
-	test ! -f added
-
-HEAD is now at fa1ce8e modified and added
-ok 4 - read-tree removes worktree, absent case
-
-expecting success of 7012.5 'read-tree removes worktree, dirty case': 
-	git checkout -f top &&
-	git update-index --skip-worktree added &&
-	echo dirty >> added &&
-	test_must_fail git read-tree -m -u HEAD^ &&
-	grep -q dirty added &&
-	test "$(git ls-files -t added)" = "S added" &&
-	git update-index --no-skip-worktree added
-
-HEAD is now at fa1ce8e modified and added
-error: Entry 'added' not uptodate. Cannot merge.
-ok 5 - read-tree removes worktree, dirty case
-
-expecting success of 7012.6 'index setup': 
-	git checkout -f init &&
-	mkdir sub &&
-	touch ./1 ./2 sub/1 sub/2 &&
-	git add 1 2 sub/1 sub/2 &&
-	git update-index --skip-worktree 1 sub/1 &&
-	git ls-files -t > result &&
-	test_cmp expected result
-
-Previous HEAD position was fa1ce8e modified and added
-HEAD is now at 2519212 init
-ok 6 - index setup
-
-expecting success of 7012.7 'git-rm fails if worktree is dirty': 
-	setup_dirty &&
-	test_must_fail git rm 1 &&
-	test_dirty
-
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-1
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config advice.updateSparsePath false"
-ok 7 - git-rm fails if worktree is dirty
-
-expecting success of 7012.8 'git-clean, absent case': 
-	setup_absent &&
-	git clean -n > result &&
-	test_cmp expected result
-
-ok 8 - git-clean, absent case
-
-expecting success of 7012.9 'git-clean, dirty case': 
-	setup_dirty &&
-	git clean -n > result &&
-	test_cmp expected result
-
-ok 9 - git-clean, dirty case
-
-expecting success of 7012.10 '--ignore-skip-worktree-entries leaves worktree alone': 
-	test_commit keep-me &&
-	git update-index --skip-worktree keep-me.t &&
-	rm keep-me.t &&
-
-	: ignoring the worktree &&
-	git update-index --remove --ignore-skip-worktree-entries keep-me.t &&
-	git diff-index --cached --exit-code HEAD &&
-
-	: not ignoring the worktree, a deletion is staged &&
-	git update-index --remove keep-me.t &&
-	test_must_fail git diff-index --cached --exit-code HEAD \
-		--diff-filter=D -- keep-me.t
-
-[detached HEAD 2b2ea08] keep-me
- Author: A U Thor <author@example.com>
- 5 files changed, 1 insertion(+)
- create mode 100644 1
- create mode 100644 2
- create mode 100644 keep-me.t
- create mode 100644 sub/1
- create mode 100644 sub/2
-:100644 000000 f00f5e00581fe7be1be150ec748178e224a827d4 0000000000000000000000000000000000000000 D	keep-me.t
-ok 10 - --ignore-skip-worktree-entries leaves worktree alone
-
-expecting success of 7012.11 'stash restore in sparse checkout': 
-	test_create_repo stash-restore &&
-	(
-		cd stash-restore &&
-
-		mkdir subdir &&
-		echo A >subdir/A &&
-		echo untouched >untouched &&
-		echo removeme >removeme &&
-		echo modified >modified &&
-		git add . &&
-		git commit -m Initial &&
-
-		echo AA >>subdir/A &&
-		echo addme >addme &&
-		echo tweaked >>modified &&
-		rm removeme &&
-		git add addme &&
-
-		git stash push &&
-
-		git sparse-checkout set --no-cone subdir &&
-
-		# Ensure after sparse-checkout we only have expected files
-		cat >expect <<-EOF &&
-		S modified
-		S removeme
-		H subdir/A
-		S untouched
-		EOF
-		git ls-files -t >actual &&
-		test_cmp expect actual &&
-
-		test_path_is_missing addme &&
-		test_path_is_missing modified &&
-		test_path_is_missing removeme &&
-		test_path_is_file    subdir/A &&
-		test_path_is_missing untouched &&
-
-		# Put a file in the working directory in the way
-		echo in the way >modified &&
-		test_must_fail git stash apply 2>error&&
-
-		grep "changes.*would be overwritten by merge" error &&
-
-		echo in the way >expect &&
-		test_cmp expect modified &&
-		git diff --quiet HEAD ":!modified" &&
-
-		# ...and that working directory reflects the files correctly
-		test_path_is_missing addme &&
-		test_path_is_file    modified &&
-		test_path_is_missing removeme &&
-		test_path_is_file    subdir/A &&
-		test_path_is_missing untouched
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7012-skip-worktree-writing/stash-restore/.git/
-[master (root-commit) 5e4d62b] Initial
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 modified
- create mode 100644 removeme
- create mode 100644 subdir/A
- create mode 100644 untouched
-Saved working directory and index state WIP on master: 5e4d62b Initial
-Merging Version stash was based on with Stashed changes
-On branch master
-You are in a sparse checkout with 50% of tracked files present.
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	error
-	expect
-
-no changes added to commit (use "git add" and/or "git commit -a")
-error: Your local changes to the following files would be overwritten by merge:
-ok 11 - stash restore in sparse checkout
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t5572-pull-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/.git/
-expecting success of 5572.1 'git_pull: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-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.47.2/t/trash directory.t5572-pull-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.47.2/t/trash directory.t5572-pull-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.47.2/t/trash directory.t5572-pull-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-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.47.2/t/trash directory.t5572-pull-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.47.2/t/trash directory.t5572-pull-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.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-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'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_pull: added submodule creates empty directory
-
-expecting success of 5572.2 'git_pull: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_pull: added submodule leaves existing empty directory alone
-
-expecting success of 5572.3 'git_pull: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Deleted branch replace_file_with_sub1 (was 8b6fdfc).
-Switched to a new branch 'replace_file_with_sub1'
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Updating 2364f5a..8b6fdfc
-Fast-forward
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_pull: replace tracked file with submodule creates empty directory
+expecting success of 5572.3 'git_pull: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Deleted branch replace_file_with_sub1 (was 8b6fdfc).
+Switched to a new branch 'replace_file_with_sub1'
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Updating 2364f5a..8b6fdfc
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - git_pull: replace tracked file with submodule creates empty directory
 
 expecting success of 5572.4 'git_pull: replace directory with submodule': 
 		prolog &&
@@ -438518,6 +437343,1173 @@
 1..68
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7002-mv-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7002-mv-sparse-checkout/.git/
+expecting success of 7002.1 'setup': 
+	mkdir -p sub/dir sub/dir2 &&
+	touch a b c sub/d sub/dir/e sub/dir2/e &&
+	git add -A &&
+	git commit -m files &&
+
+	cat >sparse_error_header <<-EOF &&
+	The following paths and/or pathspecs matched paths that exist
+	outside of your sparse-checkout definition, so will not be
+	updated in the index:
+	EOF
+
+	cat >sparse_hint <<-EOF &&
+	hint: If you intend to update such entries, try one of the following:
+	hint: * Use the --sparse option.
+	hint: * Disable or modify the sparsity rules.
+	hint: Disable this message with "git config advice.updateSparsePath false"
+	EOF
+
+	cat >dirty_error_header <<-EOF &&
+	The following paths have been moved outside the
+	sparse-checkout definition but are not sparse due to local
+	modifications.
+	EOF
+
+	cat >dirty_hint <<-EOF
+	hint: To correct the sparsity of these paths, do the following:
+	hint: * Use "git add --sparse <paths>" to update the index
+	hint: * Use "git sparse-checkout reapply" to apply the sparsity rules
+	hint: Disable this message with "git config advice.updateSparsePath false"
+	EOF
+
+[master (root-commit) 127a813] files
+ Author: A U Thor <author@example.com>
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 c
+ create mode 100644 sub/d
+ create mode 100644 sub/dir/e
+ create mode 100644 sub/dir2/e
+ok 1 - setup
+
+expecting success of 7002.2 'mv refuses to move sparse-to-sparse': 
+	test_when_finished rm -f e &&
+	git reset --hard &&
+	git sparse-checkout set --no-cone a &&
+	touch b &&
+	test_must_fail git mv b e 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	echo e >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse b e 2>stderr &&
+	test_must_be_empty stderr
+
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+ok 2 - mv refuses to move sparse-to-sparse
+
+expecting success of 7002.3 'mv refuses to move sparse-to-sparse, ignores failure': 
+	test_when_finished rm -f b c e &&
+	git reset --hard &&
+	git sparse-checkout set a &&
+
+	# tracked-to-untracked
+	touch b &&
+	git mv -k b e 2>stderr &&
+	test_path_exists b &&
+	test_path_is_missing e &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	echo e >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse b e 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing b &&
+	test_path_exists e &&
+
+	# tracked-to-tracked
+	git reset --hard &&
+	touch b &&
+	git mv -k b c 2>stderr &&
+	test_path_exists b &&
+	test_path_is_missing c &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	echo c >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse b c 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing b &&
+	test_path_exists c
+
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+error: Path 'e' not uptodate; will not remove from working tree.
+HEAD is now at 127a813 files
+ok 3 - mv refuses to move sparse-to-sparse, ignores failure
+
+expecting success of 7002.4 'mv refuses to move non-sparse-to-sparse': 
+	test_when_finished rm -f b c e &&
+	git reset --hard &&
+	git sparse-checkout set a &&
+
+	# tracked-to-untracked
+	test_must_fail git mv a e 2>stderr &&
+	test_path_exists a &&
+	test_path_is_missing e &&
+	cat sparse_error_header >expect &&
+	echo e >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse a e 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing a &&
+	test_path_exists e &&
+
+	# tracked-to-tracked
+	rm e &&
+	git reset --hard &&
+	test_must_fail git mv a c 2>stderr &&
+	test_path_exists a &&
+	test_path_is_missing c &&
+	cat sparse_error_header >expect &&
+	echo c >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse a c 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing a &&
+	test_path_exists c
+
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+HEAD is now at 127a813 files
+ok 4 - mv refuses to move non-sparse-to-sparse
+
+expecting success of 7002.5 'mv refuses to move sparse-to-non-sparse': 
+	test_when_finished rm -f b c e &&
+	git reset --hard &&
+	git sparse-checkout set a e &&
+
+	# tracked-to-untracked
+	touch b &&
+	test_must_fail git mv b e 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse b e 2>stderr &&
+	test_must_be_empty stderr
+
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+ok 5 - mv refuses to move sparse-to-non-sparse
+
+expecting success of 7002.6 'recursive mv refuses to move (possible) sparse': 
+	test_when_finished rm -rf b c e sub2 &&
+	git reset --hard &&
+	# Without cone mode, "sub" and "sub2" do not match
+	git sparse-checkout set sub/dir sub2/dir &&
+
+	# Add contained contents to ensure we avoid non-existence errors
+	mkdir sub/dir2 &&
+	touch sub/d sub/dir2/e &&
+
+	test_must_fail git mv sub sub2 2>stderr &&
+	cat sparse_error_header >expect &&
+	cat >>expect <<-\EOF &&
+	sub/d
+	sub2/d
+	sub/dir2/e
+	sub2/dir2/e
+	EOF
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse sub sub2 2>stderr &&
+	test_must_be_empty stderr &&
+	git commit -m "moved sub to sub2" &&
+	git rev-parse HEAD~1:sub >expect &&
+	git rev-parse HEAD:sub2 >actual &&
+	test_cmp expect actual &&
+	git reset --hard HEAD~1
+
+HEAD is now at 127a813 files
+[master 361f042] moved sub to sub2
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {sub => sub2}/d (100%)
+ rename {sub => sub2}/dir/e (100%)
+ rename {sub => sub2}/dir2/e (100%)
+error: Path 'sub2/d' not uptodate; will not remove from working tree.
+error: Path 'sub2/dir2/e' not uptodate; will not remove from working tree.
+HEAD is now at 127a813 files
+ok 6 - recursive mv refuses to move (possible) sparse
+
+expecting success of 7002.7 'recursive mv refuses to move sparse': 
+	git reset --hard &&
+	# Use cone mode so "sub/" matches the sparse-checkout patterns
+	git sparse-checkout init --cone &&
+	git sparse-checkout set sub/dir sub2/dir &&
+
+	# Add contained contents to ensure we avoid non-existence errors
+	mkdir sub/dir2 &&
+	touch sub/dir2/e &&
+
+	test_must_fail git mv sub sub2 2>stderr &&
+	cat sparse_error_header >expect &&
+	cat >>expect <<-\EOF &&
+	sub/dir2/e
+	sub2/dir2/e
+	EOF
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse sub sub2 2>stderr &&
+	test_must_be_empty stderr &&
+	git commit -m "moved sub to sub2" &&
+	git rev-parse HEAD~1:sub >expect &&
+	git rev-parse HEAD:sub2 >actual &&
+	test_cmp expect actual &&
+	git reset --hard HEAD~1
+
+HEAD is now at 127a813 files
+warning: unrecognized pattern: 'sub/dir'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'sub/dir'
+warning: disabling cone pattern matching
+[master 361f042] moved sub to sub2
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {sub => sub2}/d (100%)
+ rename {sub => sub2}/dir/e (100%)
+ rename {sub => sub2}/dir2/e (100%)
+error: Path 'sub2/dir2/e' not uptodate; will not remove from working tree.
+HEAD is now at 127a813 files
+ok 7 - recursive mv refuses to move sparse
+
+expecting success of 7002.8 'can move files to non-sparse dir': 
+	git reset --hard &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set a b c w !/x y/ &&
+	mkdir -p w x/y &&
+
+	git mv a w/new-a 2>stderr &&
+	git mv b x/y/new-b 2>stderr &&
+	test_must_be_empty stderr
+
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+warning: pass a leading slash before paths such as 'b' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+warning: pass a leading slash before paths such as 'c' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+ok 8 - can move files to non-sparse dir
+
+expecting success of 7002.9 'refuse to move file to non-skip-worktree sparse path': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	git reset --hard &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set a !/x y/ !x/y/z &&
+	mkdir -p x/y/z &&
+
+	test_must_fail git mv a x/y/z/new-a 2>stderr &&
+	echo x/y/z/new-a | cat sparse_error_header - sparse_hint >expect &&
+	test_cmp expect stderr
+
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+HEAD is now at 127a813 files
+ok 9 - refuse to move file to non-skip-worktree sparse path
+
+expecting success of 7002.10 'refuse to move out-of-cone directory without --sparse': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+
+	test_must_fail git mv folder1 sub 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo folder1/file1 >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr
+
+HEAD is now at 127a813 files
+ok 10 - refuse to move out-of-cone directory without --sparse
+
+expecting success of 7002.11 'can move out-of-cone directory with --sparse': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+
+	git mv --sparse folder1 sub 2>stderr &&
+	test_must_be_empty stderr &&
+
+	test_path_is_dir sub/folder1 &&
+	test_path_is_file sub/folder1/file1
+
+HEAD is now at 127a813 files
+ok 11 - can move out-of-cone directory with --sparse
+
+expecting success of 7002.12 'refuse to move out-of-cone file without --sparse': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+
+	test_must_fail git mv folder1/file1 sub 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo folder1/file1 >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr
+
+HEAD is now at 127a813 files
+ok 12 - refuse to move out-of-cone file without --sparse
+
+expecting success of 7002.13 'can move out-of-cone file with --sparse': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+
+	git mv --sparse folder1/file1 sub 2>stderr &&
+	test_must_be_empty stderr &&
+
+	test_path_is_file sub/file1
+
+HEAD is now at 127a813 files
+ok 13 - can move out-of-cone file with --sparse
+
+expecting success of 7002.14 'refuse to move sparse file to existing destination': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	mkdir folder1 &&
+	touch folder1/file1 &&
+	touch sub/file1 &&
+	git add folder1 sub/file1 &&
+	git sparse-checkout set --cone sub &&
+
+	test_must_fail git mv --sparse folder1/file1 sub 2>stderr &&
+	echo "fatal: destination exists, source=folder1/file1, destination=sub/file1" >expect &&
+	test_cmp expect stderr
+
+HEAD is now at 127a813 files
+ok 14 - refuse to move sparse file to existing destination
+
+expecting success of 7002.15 'move sparse file to existing destination with --force and --sparse': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	mkdir folder1 &&
+	touch folder1/file1 &&
+	touch sub/file1 &&
+	echo "overwrite" >folder1/file1 &&
+	git add folder1 sub/file1 &&
+	git sparse-checkout set --cone sub &&
+
+	git mv --sparse --force folder1/file1 sub 2>stderr &&
+	test_must_be_empty stderr &&
+	echo "overwrite" >expect &&
+	test_cmp expect sub/file1
+
+HEAD is now at 127a813 files
+ok 15 - move sparse file to existing destination with --force and --sparse
+
+expecting success of 7002.16 'move clean path from in-cone to out-of-cone': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+
+	test_must_fail git mv sub/d folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/d" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse sub/d folder1 2>stderr &&
+	test_must_be_empty stderr &&
+
+	test_path_is_missing sub/d &&
+	test_path_is_missing folder1/d &&
+	git ls-files -t >actual &&
+	! grep "^H sub/d\$" actual &&
+	grep "S folder1/d" actual
+
+S folder1/d
+HEAD is now at 127a813 files
+ok 16 - move clean path from in-cone to out-of-cone
+
+expecting success of 7002.17 'move clean path from in-cone to out-of-cone overwrite': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+	echo "sub/file1 overwrite" >sub/file1 &&
+	git add sub/file1 &&
+
+	test_must_fail git mv sub/file1 folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/file1" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	test_must_fail git mv --sparse sub/file1 folder1 2>stderr &&
+	echo "fatal: destination exists in the index, source=sub/file1, destination=folder1/file1" \
+	>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse -f sub/file1 folder1 2>stderr &&
+	test_must_be_empty stderr &&
+
+	test_path_is_missing sub/file1 &&
+	test_path_is_missing folder1/file1 &&
+	git ls-files -t >actual &&
+	! grep "H sub/file1" actual &&
+	grep "S folder1/file1" actual &&
+
+	# compare file content before move and after move
+	echo "sub/file1 overwrite" >expect &&
+	git ls-files -s -- folder1/file1 | awk "{print \$2}" >oid &&
+	git cat-file blob $(cat oid) >actual &&
+	test_cmp expect actual
+
+S folder1/file1
+HEAD is now at 127a813 files
+ok 17 - move clean path from in-cone to out-of-cone overwrite
+
+expecting success of 7002.18 'move clean path from in-cone to out-of-cone file overwrite': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+	echo "sub/file1 overwrite" >sub/file1 &&
+	git add sub/file1 &&
+
+	test_must_fail git mv sub/file1 folder1/file1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/file1" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	test_must_fail git mv --sparse sub/file1 folder1/file1 2>stderr &&
+	echo "fatal: destination exists in the index, source=sub/file1, destination=folder1/file1" \
+	>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse -f sub/file1 folder1/file1 2>stderr &&
+	test_must_be_empty stderr &&
+
+	test_path_is_missing sub/file1 &&
+	test_path_is_missing folder1/file1 &&
+	git ls-files -t >actual &&
+	! grep "H sub/file1" actual &&
+	grep "S folder1/file1" actual &&
+
+	# compare file content before move and after move
+	echo "sub/file1 overwrite" >expect &&
+	git ls-files -s -- folder1/file1 | awk "{print \$2}" >oid &&
+	git cat-file blob $(cat oid) >actual &&
+	test_cmp expect actual
+
+S folder1/file1
+HEAD is now at 127a813 files
+ok 18 - move clean path from in-cone to out-of-cone file overwrite
+
+expecting success of 7002.19 'move directory with one of the files overwrite': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	mkdir -p folder1/dir &&
+	touch folder1/dir/file1 &&
+	git add folder1 &&
+	git sparse-checkout set --cone sub &&
+
+	echo test >sub/dir/file1 &&
+	git add sub/dir/file1 &&
+
+	test_must_fail git mv sub/dir folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/dir/e" >>expect &&
+	echo "folder1/dir/file1" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	test_must_fail git mv --sparse sub/dir folder1 2>stderr &&
+	echo "fatal: destination exists in the index, source=sub/dir/file1, destination=folder1/dir/file1" \
+	>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse -f sub/dir folder1 2>stderr &&
+	test_must_be_empty stderr &&
+
+	test_path_is_missing sub/dir/file1 &&
+	test_path_is_missing sub/dir/e &&
+	test_path_is_missing folder1/file1 &&
+	git ls-files -t >actual &&
+	! grep "H sub/dir/file1" actual &&
+	! grep "H sub/dir/e" actual &&
+	grep "S folder1/dir/file1" actual &&
+
+	# compare file content before move and after move
+	echo test >expect &&
+	git ls-files -s -- folder1/dir/file1 | awk "{print \$2}" >oid &&
+	git cat-file blob $(cat oid) >actual &&
+	test_cmp expect actual
+
+S folder1/dir/file1
+HEAD is now at 127a813 files
+ok 19 - move directory with one of the files overwrite
+
+expecting success of 7002.20 'move dirty path from in-cone to out-of-cone': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+	echo "modified" >>sub/d &&
+
+	test_must_fail git mv sub/d folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/d" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse sub/d folder1 2>stderr &&
+	cat dirty_error_header >expect &&
+	echo "folder1/d" >>expect &&
+	cat dirty_hint >>expect &&
+	test_cmp expect stderr &&
+
+	test_path_is_missing sub/d &&
+	test_path_is_file folder1/d &&
+	git ls-files -t >actual &&
+	! grep "^H sub/d\$" actual &&
+	grep "H folder1/d" actual
+
+H folder1/d
+HEAD is now at 127a813 files
+ok 20 - move dirty path from in-cone to out-of-cone
+
+expecting success of 7002.21 'move dir from in-cone to out-of-cone': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+	mkdir sub/dir/deep &&
+
+	test_must_fail git mv sub/dir folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/dir/e" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse sub/dir folder1 2>stderr &&
+	test_must_be_empty stderr &&
+
+	test_path_is_missing sub/dir &&
+	test_path_is_missing folder1 &&
+	git ls-files -t >actual &&
+	! grep "H sub/dir/e" actual &&
+	grep "S folder1/dir/e" actual
+
+S folder1/dir/e
+HEAD is now at 127a813 files
+ok 21 - move dir from in-cone to out-of-cone
+
+expecting success of 7002.22 'move partially-dirty dir from in-cone to out-of-cone': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+	mkdir sub/dir/deep &&
+	touch sub/dir/e2 sub/dir/e3 &&
+	git add sub/dir/e2 sub/dir/e3 &&
+	echo "modified" >>sub/dir/e2 &&
+	echo "modified" >>sub/dir/e3 &&
+
+	test_must_fail git mv sub/dir folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/dir/e" >>expect &&
+	echo "folder1/dir/e2" >>expect &&
+	echo "folder1/dir/e3" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse sub/dir folder1 2>stderr &&
+	cat dirty_error_header >expect &&
+	echo "folder1/dir/e2" >>expect &&
+	echo "folder1/dir/e3" >>expect &&
+	cat dirty_hint >>expect &&
+	test_cmp expect stderr &&
+
+	test_path_is_missing sub/dir &&
+	test_path_is_missing folder1/dir/e &&
+	test_path_is_file folder1/dir/e2 &&
+	test_path_is_file folder1/dir/e3 &&
+	git ls-files -t >actual &&
+	! grep "H sub/dir/e" actual &&
+	! grep "H sub/dir/e2" actual &&
+	! grep "H sub/dir/e3" actual &&
+	grep "S folder1/dir/e" actual &&
+	grep "H folder1/dir/e2" actual &&
+	grep "H folder1/dir/e3" actual
+
+S folder1/dir/e
+H folder1/dir/e2
+H folder1/dir/e3
+HEAD is now at 127a813 files
+ok 22 - move partially-dirty dir from in-cone to out-of-cone
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7010-setup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/t/trash directory.t7010-setup: '/build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup' is outside repository at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7010-setup/testerx
+fatal: /build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup/testerx: '/build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup/testerx' is outside repository at '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7010-setup/testex
+fatal: /build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup/testex: '/build/reproducible-path/git-2.47.2/t/trash directory.t7010-setup/testex' is outside repository at '/build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7011-skip-worktree-reading.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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) 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 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
+
+ok 11 - diff-index does not examine skip-worktree dirty entries
+
+expecting success of 7011.12 'diff-files does not examine skip-worktree absent entries': 
+	setup_absent &&
+	test -z "$(git diff-files -- one)"
+
+ok 12 - diff-files does not examine skip-worktree absent entries
+
+expecting success of 7011.13 'diff-files does not examine skip-worktree dirty entries': 
+	setup_dirty &&
+	test -z "$(git diff-files -- one)"
+
+ok 13 - diff-files does not examine skip-worktree dirty entries
+
+expecting success of 7011.14 'commit on skip-worktree absent entries': 
+	git reset &&
+	setup_absent &&
+	test_must_fail git commit -m null 1
+
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	2
+	expect.full
+	expect.skip
+	expected
+	result
+	sub/
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 14 - commit on skip-worktree absent entries
+
+expecting success of 7011.15 'commit on skip-worktree dirty entries': 
+	git reset &&
+	setup_dirty &&
+	test_must_fail git commit -m null 1
+
+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/
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 15 - commit on skip-worktree dirty entries
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7012-skip-worktree-writing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7012-skip-worktree-writing/.git/
+expecting success of 7012.1 'setup': 
+	test_commit init &&
+	echo modified >> init.t &&
+	touch added &&
+	git add init.t added &&
+	git commit -m "modified and added" &&
+	git tag top
+
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master fa1ce8e] modified and added
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 added
+ok 1 - setup
+
+expecting success of 7012.2 'read-tree updates worktree, absent case': 
+	git checkout -f top &&
+	git update-index --skip-worktree init.t &&
+	rm init.t &&
+	git read-tree -m -u HEAD^ &&
+	echo init > expected &&
+	test_cmp expected init.t
+
+Note: switching to 'top'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+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 fa1ce8e modified and added
+ok 2 - read-tree updates worktree, absent case
+
+expecting success of 7012.3 'read-tree updates worktree, dirty case': 
+	git checkout -f top &&
+	git update-index --skip-worktree init.t &&
+	echo dirty >> init.t &&
+	test_must_fail git read-tree -m -u HEAD^ &&
+	grep -q dirty init.t &&
+	test "$(git ls-files -t init.t)" = "S init.t" &&
+	git update-index --no-skip-worktree init.t
+
+HEAD is now at fa1ce8e modified and added
+error: Entry 'init.t' not uptodate. Cannot merge.
+ok 3 - read-tree updates worktree, dirty case
+
+expecting success of 7012.4 'read-tree removes worktree, absent case': 
+	git checkout -f top &&
+	git update-index --skip-worktree added &&
+	rm added &&
+	git read-tree -m -u HEAD^ &&
+	test ! -f added
+
+HEAD is now at fa1ce8e modified and added
+ok 4 - read-tree removes worktree, absent case
+
+expecting success of 7012.5 'read-tree removes worktree, dirty case': 
+	git checkout -f top &&
+	git update-index --skip-worktree added &&
+	echo dirty >> added &&
+	test_must_fail git read-tree -m -u HEAD^ &&
+	grep -q dirty added &&
+	test "$(git ls-files -t added)" = "S added" &&
+	git update-index --no-skip-worktree added
+
+HEAD is now at fa1ce8e modified and added
+error: Entry 'added' not uptodate. Cannot merge.
+ok 5 - read-tree removes worktree, dirty case
+
+expecting success of 7012.6 'index setup': 
+	git checkout -f init &&
+	mkdir sub &&
+	touch ./1 ./2 sub/1 sub/2 &&
+	git add 1 2 sub/1 sub/2 &&
+	git update-index --skip-worktree 1 sub/1 &&
+	git ls-files -t > result &&
+	test_cmp expected result
+
+Previous HEAD position was fa1ce8e modified and added
+HEAD is now at 2519212 init
+ok 6 - index setup
+
+expecting success of 7012.7 'git-rm fails if worktree is dirty': 
+	setup_dirty &&
+	test_must_fail git rm 1 &&
+	test_dirty
+
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+1
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config advice.updateSparsePath false"
+ok 7 - git-rm fails if worktree is dirty
+
+expecting success of 7012.8 'git-clean, absent case': 
+	setup_absent &&
+	git clean -n > result &&
+	test_cmp expected result
+
+ok 8 - git-clean, absent case
+
+expecting success of 7012.9 'git-clean, dirty case': 
+	setup_dirty &&
+	git clean -n > result &&
+	test_cmp expected result
+
+ok 9 - git-clean, dirty case
+
+expecting success of 7012.10 '--ignore-skip-worktree-entries leaves worktree alone': 
+	test_commit keep-me &&
+	git update-index --skip-worktree keep-me.t &&
+	rm keep-me.t &&
+
+	: ignoring the worktree &&
+	git update-index --remove --ignore-skip-worktree-entries keep-me.t &&
+	git diff-index --cached --exit-code HEAD &&
+
+	: not ignoring the worktree, a deletion is staged &&
+	git update-index --remove keep-me.t &&
+	test_must_fail git diff-index --cached --exit-code HEAD \
+		--diff-filter=D -- keep-me.t
+
+[detached HEAD 2b2ea08] keep-me
+ Author: A U Thor <author@example.com>
+ 5 files changed, 1 insertion(+)
+ create mode 100644 1
+ create mode 100644 2
+ create mode 100644 keep-me.t
+ create mode 100644 sub/1
+ create mode 100644 sub/2
+:100644 000000 f00f5e00581fe7be1be150ec748178e224a827d4 0000000000000000000000000000000000000000 D	keep-me.t
+ok 10 - --ignore-skip-worktree-entries leaves worktree alone
+
+expecting success of 7012.11 'stash restore in sparse checkout': 
+	test_create_repo stash-restore &&
+	(
+		cd stash-restore &&
+
+		mkdir subdir &&
+		echo A >subdir/A &&
+		echo untouched >untouched &&
+		echo removeme >removeme &&
+		echo modified >modified &&
+		git add . &&
+		git commit -m Initial &&
+
+		echo AA >>subdir/A &&
+		echo addme >addme &&
+		echo tweaked >>modified &&
+		rm removeme &&
+		git add addme &&
+
+		git stash push &&
+
+		git sparse-checkout set --no-cone subdir &&
+
+		# Ensure after sparse-checkout we only have expected files
+		cat >expect <<-EOF &&
+		S modified
+		S removeme
+		H subdir/A
+		S untouched
+		EOF
+		git ls-files -t >actual &&
+		test_cmp expect actual &&
+
+		test_path_is_missing addme &&
+		test_path_is_missing modified &&
+		test_path_is_missing removeme &&
+		test_path_is_file    subdir/A &&
+		test_path_is_missing untouched &&
+
+		# Put a file in the working directory in the way
+		echo in the way >modified &&
+		test_must_fail git stash apply 2>error&&
+
+		grep "changes.*would be overwritten by merge" error &&
+
+		echo in the way >expect &&
+		test_cmp expect modified &&
+		git diff --quiet HEAD ":!modified" &&
+
+		# ...and that working directory reflects the files correctly
+		test_path_is_missing addme &&
+		test_path_is_file    modified &&
+		test_path_is_missing removeme &&
+		test_path_is_file    subdir/A &&
+		test_path_is_missing untouched
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7012-skip-worktree-writing/stash-restore/.git/
+[master (root-commit) 5e4d62b] Initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 modified
+ create mode 100644 removeme
+ create mode 100644 subdir/A
+ create mode 100644 untouched
+Saved working directory and index state WIP on master: 5e4d62b Initial
+Merging Version stash was based on with Stashed changes
+On branch master
+You are in a sparse checkout with 50% of tracked files present.
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	error
+	expect
+
+no changes added to commit (use "git add" and/or "git commit -a")
+error: Your local changes to the following files would be overwritten by merge:
+ok 11 - stash restore in sparse checkout
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7030-verify-tag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7030-verify-tag/.git/
 checking prerequisite: GPG
@@ -438637,6 +438629,204 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7031-verify-tag-signed-ssh.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7031-verify-tag-signed-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 tags ssh (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 2 # skip create signed tags with keys having defined lifetimes (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+
+ok 3 # skip verify and show ssh signatures (missing GPGSSH)
+
+ok 4 # skip verify-tag exits failure on expired signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+
+ok 5 # skip verify-tag exits failure on not yet valid signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+
+ok 6 # skip verify-tag succeeds with tag date and key validity matching (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+
+ok 7 # skip verify-tag failes with tag date outside of key validity (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+
+ok 8 # skip detect fudged ssh signature (missing GPGSSH)
+
+ok 9 # skip verify ssh signatures with --raw (missing GPGSSH)
+
+ok 10 # skip verify signatures with --raw ssh (missing GPGSSH)
+
+ok 11 # skip verify multiple tags ssh (missing GPGSSH)
+
+ok 12 # skip verifying tag with --format - ssh (missing GPGSSH)
+
+ok 13 # skip verifying a forged tag with --format should fail silently - ssh (missing GPGSSH)
+
+ok 14 # skip rev-list --format=%G (missing GPGSSH)
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7008-filter-branch-null-sha1.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7008-filter-branch-null-sha1/.git/
+expecting success of 7008.1 'setup: base commits': 
+	test_commit one &&
+	test_commit two &&
+	test_commit three
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 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
+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) (1 seconds passed, remaining 0 predicted)    rm 'three.t'
+
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (3/5) (1 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) (0 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (1 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
+rm 'broken'
+
Rewrite 6fc1982a7cbeec7380180353ef341fd996ac21f7 (4/5) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/master' was rewritten
+ok 6 - removing the broken entry works
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6500-gc.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6500-gc/.git/
 expecting success of 6500.1 'setup': 
@@ -439247,7 +439437,7 @@
 		gc --cruft --max-cruft-size=1M &&
 	test_subcommand $cruft_max_size_opts --max-cruft-size=1048576 <trace2.txt
 
-{"event":"child_start","sid":"20260304T080156.915829Z-H8d819085-P000bd371","thread":"main","time":"2026-03-04T08:01:56.925208Z","file":"run-command.c","line":733,"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":"20250130T021543.072135Z-H5c947e1c-P001ec0fc","thread":"main","time":"2025-01-30T02:15:43.119421Z","file":"run-command.c","line":733,"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': 
@@ -439260,8 +439450,8 @@
 		--max-cruft-size=3M &&
 	test_subcommand $cruft_max_size_opts --max-cruft-size=3145728 <trace2.txt
 
-{"event":"child_start","sid":"20260304T080157.078784Z-H8d819085-P000bd453","thread":"main","time":"2026-03-04T08:01:57.125105Z","file":"run-command.c","line":733,"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":"20260304T080157.302795Z-H8d819085-P000bd537","thread":"main","time":"2026-03-04T08:01:57.331084Z","file":"run-command.c","line":733,"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":"20250130T021543.322323Z-H5c947e1c-P001ec1a7","thread":"main","time":"2025-01-30T02:15:43.359469Z","file":"run-command.c","line":733,"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":"20250130T021543.553932Z-H5c947e1c-P001ec252","thread":"main","time":"2025-01-30T02:15:43.586219Z","file":"run-command.c","line":733,"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 'background auto gc does not run if gc.log is present and recent but does if it is old': 
@@ -439405,204 +439595,6 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7031-verify-tag-signed-ssh.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7031-verify-tag-signed-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 tags ssh (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 2 # skip create signed tags with keys having defined lifetimes (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 3 # skip verify and show ssh signatures (missing GPGSSH)
-
-ok 4 # skip verify-tag exits failure on expired signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 5 # skip verify-tag exits failure on not yet valid signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 6 # skip verify-tag succeeds with tag date and key validity matching (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 7 # skip verify-tag failes with tag date outside of key validity (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 8 # skip detect fudged ssh signature (missing GPGSSH)
-
-ok 9 # skip verify ssh signatures with --raw (missing GPGSSH)
-
-ok 10 # skip verify signatures with --raw ssh (missing GPGSSH)
-
-ok 11 # skip verify multiple tags ssh (missing GPGSSH)
-
-ok 12 # skip verifying tag with --format - ssh (missing GPGSSH)
-
-ok 13 # skip verifying a forged tag with --format should fail silently - ssh (missing GPGSSH)
-
-ok 14 # skip rev-list --format=%G (missing GPGSSH)
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7008-filter-branch-null-sha1.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7008-filter-branch-null-sha1/.git/
-expecting success of 7008.1 'setup: base commits': 
-	test_commit one &&
-	test_commit two &&
-	test_commit three
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 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
-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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7062-wtstatus-ignorecase.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7062-wtstatus-ignorecase/.git/
 expecting success of 7062.1 'status with hash collisions': 
@@ -439906,7 +439898,7 @@
 	git mv ab a
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7001-mv/.git/
-[master (root-commit) 80ec4bf] initial
+[master (root-commit) 1a0348b] initial
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 ab.c
@@ -440649,88 +440641,6 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7101-reset-empty-subdirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7101-reset-empty-subdirs/.git/
-expecting success of 7101.1 'creating initial files': 
-	mkdir path0 &&
-	COPYING_test_data >path0/COPYING &&
-	git add path0/COPYING &&
-	git commit -m add -a
-
-[master (root-commit) eb5c9d9] add
- Author: A U Thor <author@example.com>
- 1 file changed, 18 insertions(+)
- create mode 100644 path0/COPYING
-ok 1 - creating initial files
-
-expecting success of 7101.2 'creating second files': 
-	mkdir path1 &&
-	mkdir path1/path2 &&
-	COPYING_test_data >path1/path2/COPYING &&
-	COPYING_test_data >path1/COPYING &&
-	COPYING_test_data >COPYING &&
-	COPYING_test_data >path0/COPYING-TOO &&
-	git add path1/path2/COPYING &&
-	git add path1/COPYING &&
-	git add COPYING &&
-	git add path0/COPYING-TOO &&
-	git commit -m change -a
-
-[master 2982bdc] change
- Author: A U Thor <author@example.com>
- 4 files changed, 72 insertions(+)
- create mode 100644 COPYING
- create mode 100644 path0/COPYING-TOO
- create mode 100644 path1/COPYING
- create mode 100644 path1/path2/COPYING
-ok 2 - creating second files
-
-expecting success of 7101.3 'resetting tree HEAD^': 
-	git reset --hard HEAD^
-
-HEAD is now at eb5c9d9 add
-ok 3 - resetting tree HEAD^
-
-expecting success of 7101.4 'checking initial files exist after rewind': 
-	test -d path0 &&
-	test -f path0/COPYING
-
-ok 4 - checking initial files exist after rewind
-
-expecting success of 7101.5 'checking lack of path1/path2/COPYING': 
-	! test -f path1/path2/COPYING
-
-ok 5 - checking lack of path1/path2/COPYING
-
-expecting success of 7101.6 'checking lack of path1/COPYING': 
-	! test -f path1/COPYING
-
-ok 6 - checking lack of path1/COPYING
-
-expecting success of 7101.7 'checking lack of COPYING': 
-	! test -f COPYING
-
-ok 7 - checking lack of COPYING
-
-expecting success of 7101.8 'checking checking lack of path1/COPYING-TOO': 
-	! test -f path0/COPYING-TOO
-
-ok 8 - checking checking lack of path1/COPYING-TOO
-
-expecting success of 7101.9 'checking lack of path1/path2': 
-	! test -d path1/path2
-
-ok 9 - checking lack of path1/path2
-
-expecting success of 7101.10 'checking lack of path1': 
-	! test -d path1
-
-ok 10 - checking lack of path1
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7060-wtstatus.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7060-wtstatus/.git/
 expecting success of 7060.1 'setup': 
@@ -441135,6 +441045,88 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7101-reset-empty-subdirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7101-reset-empty-subdirs/.git/
+expecting success of 7101.1 'creating initial files': 
+	mkdir path0 &&
+	COPYING_test_data >path0/COPYING &&
+	git add path0/COPYING &&
+	git commit -m add -a
+
+[master (root-commit) eb5c9d9] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 18 insertions(+)
+ create mode 100644 path0/COPYING
+ok 1 - creating initial files
+
+expecting success of 7101.2 'creating second files': 
+	mkdir path1 &&
+	mkdir path1/path2 &&
+	COPYING_test_data >path1/path2/COPYING &&
+	COPYING_test_data >path1/COPYING &&
+	COPYING_test_data >COPYING &&
+	COPYING_test_data >path0/COPYING-TOO &&
+	git add path1/path2/COPYING &&
+	git add path1/COPYING &&
+	git add COPYING &&
+	git add path0/COPYING-TOO &&
+	git commit -m change -a
+
+[master 2982bdc] change
+ Author: A U Thor <author@example.com>
+ 4 files changed, 72 insertions(+)
+ create mode 100644 COPYING
+ create mode 100644 path0/COPYING-TOO
+ create mode 100644 path1/COPYING
+ create mode 100644 path1/path2/COPYING
+ok 2 - creating second files
+
+expecting success of 7101.3 'resetting tree HEAD^': 
+	git reset --hard HEAD^
+
+HEAD is now at eb5c9d9 add
+ok 3 - resetting tree HEAD^
+
+expecting success of 7101.4 'checking initial files exist after rewind': 
+	test -d path0 &&
+	test -f path0/COPYING
+
+ok 4 - checking initial files exist after rewind
+
+expecting success of 7101.5 'checking lack of path1/path2/COPYING': 
+	! test -f path1/path2/COPYING
+
+ok 5 - checking lack of path1/path2/COPYING
+
+expecting success of 7101.6 'checking lack of path1/COPYING': 
+	! test -f path1/COPYING
+
+ok 6 - checking lack of path1/COPYING
+
+expecting success of 7101.7 'checking lack of COPYING': 
+	! test -f COPYING
+
+ok 7 - checking lack of COPYING
+
+expecting success of 7101.8 'checking checking lack of path1/COPYING-TOO': 
+	! test -f path0/COPYING-TOO
+
+ok 8 - checking checking lack of path1/COPYING-TOO
+
+expecting success of 7101.9 'checking lack of path1/path2': 
+	! test -d path1/path2
+
+ok 9 - checking lack of path1/path2
+
+expecting success of 7101.10 'checking lack of path1': 
+	! test -d path1
+
+ok 10 - checking lack of path1
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7104-reset-hard.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7104-reset-hard/.git/
 expecting success of 7104.1 'setup': 
@@ -441548,8 +441540,8 @@
 	verify_expect !
 
 HEAD is now at 4b301d4 Commit
---- expect	2026-03-04 08:02:04.047352315 +0000
-+++ actual	2026-03-04 08:02:04.051352315 +0000
+--- expect	2025-01-30 02:15:52.277583674 +0000
++++ actual	2025-01-30 02:15:52.289583746 +0000
 @@ -1 +0,0 @@
 - D fileA.t
 ok 9 - quotes not compatible with --pathspec-file-nul
@@ -442597,6 +442589,171 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7113-post-index-change-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7113-post-index-change-hook/.git/
+expecting success of 7113.1 'setup': 
+	mkdir -p dir1 &&
+	touch dir1/file1.txt &&
+	echo testing >dir1/file2.txt &&
+	git add . &&
+	git commit -m "initial"
+
+[main (root-commit) 7e53173] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 dir1/file1.txt
+ create mode 100644 dir1/file2.txt
+ok 1 - setup
+
+expecting success of 7113.2 'test status, add, commit, others trigger hook without flags set': 
+	test_hook post-index-change <<-\EOF &&
+		if test "$1" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_workdir is set." >testfailure
+			exit 1
+		fi
+		if test "$2" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_skipworktree is set." >testfailure
+			exit 1
+		fi
+		if test -f ".git/index.lock"; then
+			echo ".git/index.lock exists" >testfailure
+			exit 3
+		fi
+		if ! test -f ".git/index"; then
+			echo ".git/index does not exist" >testfailure
+			exit 3
+		fi
+		echo "success" >testsuccess
+	EOF
+	mkdir -p dir2 &&
+	touch dir2/file1.txt &&
+	touch dir2/file2.txt &&
+	: force index to be dirty &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git status &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git add . &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git commit -m "second" &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git checkout -- dir1/file1.txt &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git update-index &&
+	test_path_is_missing testsuccess &&
+	test_path_is_missing testfailure &&
+	git reset --soft &&
+	test_path_is_missing testsuccess &&
+	test_path_is_missing testfailure
+
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir2/
+
+nothing added to commit but untracked files present (use "git add" to track)
+[main 5070ba9] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir2/file1.txt
+ create mode 100644 dir2/file2.txt
+ok 2 - test status, add, commit, others trigger hook without flags set
+
+expecting success of 7113.3 'test checkout and reset trigger the hook': 
+	test_hook post-index-change <<-\EOF &&
+		if test "$1" -eq 1 && test "$2" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
+			exit 1
+		fi
+		if test "$1" -eq 0 && test "$2" -eq 0; then
+			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
+			exit 2
+		fi
+		if test "$1" -eq 1; then
+			if test -f ".git/index.lock"; then
+				echo "updated_workdir set but .git/index.lock exists" >testfailure
+				exit 3
+			fi
+			if ! test -f ".git/index"; then
+				echo "updated_workdir set but .git/index does not exist" >testfailure
+				exit 3
+			fi
+		else
+			echo "update_workdir should be set for checkout" >testfailure
+			exit 4
+		fi
+		echo "success" >testsuccess
+	EOF
+	: force index to be dirty &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git checkout main &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git checkout HEAD &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git reset --hard &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git checkout -B test &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure
+
+Already on 'main'
+HEAD is now at 5070ba9 second
+Switched to a new branch 'test'
+ok 3 - test checkout and reset trigger the hook
+
+expecting success of 7113.4 'test reset --mixed and update-index triggers the hook': 
+	test_hook post-index-change <<-\EOF &&
+		if test "$1" -eq 1 && test "$2" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
+			exit 1
+		fi
+		if test "$1" -eq 0 && test "$2" -eq 0; then
+			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
+			exit 2
+		fi
+		if test "$2" -eq 1; then
+			if test -f ".git/index.lock"; then
+				echo "updated_skipworktree set but .git/index.lock exists" >testfailure
+				exit 3
+			fi
+			if ! test -f ".git/index"; then
+				echo "updated_skipworktree set but .git/index does not exist" >testfailure
+				exit 3
+			fi
+		else
+			echo "updated_skipworktree should be set for reset --mixed and update-index" >testfailure
+			exit 4
+		fi
+		echo "success" >testsuccess
+	EOF
+	: force index to be dirty &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git reset --mixed --quiet HEAD~1 &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git hash-object -w --stdin <dir1/file2.txt >expect &&
+	git update-index --cacheinfo 100644 "$(cat expect)" dir1/file1.txt &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git update-index --skip-worktree dir1/file2.txt &&
+	git update-index --remove dir1/file2.txt &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure
+
+ok 4 - test reset --mixed and update-index triggers the hook
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6600-test-reach.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6600-test-reach/.git/
 expecting success of 6600.1 'setup': 
@@ -443721,171 +443878,6 @@
 1..44
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7113-post-index-change-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7113-post-index-change-hook/.git/
-expecting success of 7113.1 'setup': 
-	mkdir -p dir1 &&
-	touch dir1/file1.txt &&
-	echo testing >dir1/file2.txt &&
-	git add . &&
-	git commit -m "initial"
-
-[main (root-commit) 7e53173] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 dir1/file1.txt
- create mode 100644 dir1/file2.txt
-ok 1 - setup
-
-expecting success of 7113.2 'test status, add, commit, others trigger hook without flags set': 
-	test_hook post-index-change <<-\EOF &&
-		if test "$1" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_workdir is set." >testfailure
-			exit 1
-		fi
-		if test "$2" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_skipworktree is set." >testfailure
-			exit 1
-		fi
-		if test -f ".git/index.lock"; then
-			echo ".git/index.lock exists" >testfailure
-			exit 3
-		fi
-		if ! test -f ".git/index"; then
-			echo ".git/index does not exist" >testfailure
-			exit 3
-		fi
-		echo "success" >testsuccess
-	EOF
-	mkdir -p dir2 &&
-	touch dir2/file1.txt &&
-	touch dir2/file2.txt &&
-	: force index to be dirty &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git status &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git add . &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git commit -m "second" &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git checkout -- dir1/file1.txt &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git update-index &&
-	test_path_is_missing testsuccess &&
-	test_path_is_missing testfailure &&
-	git reset --soft &&
-	test_path_is_missing testsuccess &&
-	test_path_is_missing testfailure
-
-On branch main
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir2/
-
-nothing added to commit but untracked files present (use "git add" to track)
-[main 5070ba9] second
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir2/file1.txt
- create mode 100644 dir2/file2.txt
-ok 2 - test status, add, commit, others trigger hook without flags set
-
-expecting success of 7113.3 'test checkout and reset trigger the hook': 
-	test_hook post-index-change <<-\EOF &&
-		if test "$1" -eq 1 && test "$2" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
-			exit 1
-		fi
-		if test "$1" -eq 0 && test "$2" -eq 0; then
-			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
-			exit 2
-		fi
-		if test "$1" -eq 1; then
-			if test -f ".git/index.lock"; then
-				echo "updated_workdir set but .git/index.lock exists" >testfailure
-				exit 3
-			fi
-			if ! test -f ".git/index"; then
-				echo "updated_workdir set but .git/index does not exist" >testfailure
-				exit 3
-			fi
-		else
-			echo "update_workdir should be set for checkout" >testfailure
-			exit 4
-		fi
-		echo "success" >testsuccess
-	EOF
-	: force index to be dirty &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git checkout main &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git checkout HEAD &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git reset --hard &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git checkout -B test &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure
-
-Already on 'main'
-HEAD is now at 5070ba9 second
-Switched to a new branch 'test'
-ok 3 - test checkout and reset trigger the hook
-
-expecting success of 7113.4 'test reset --mixed and update-index triggers the hook': 
-	test_hook post-index-change <<-\EOF &&
-		if test "$1" -eq 1 && test "$2" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
-			exit 1
-		fi
-		if test "$1" -eq 0 && test "$2" -eq 0; then
-			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
-			exit 2
-		fi
-		if test "$2" -eq 1; then
-			if test -f ".git/index.lock"; then
-				echo "updated_skipworktree set but .git/index.lock exists" >testfailure
-				exit 3
-			fi
-			if ! test -f ".git/index"; then
-				echo "updated_skipworktree set but .git/index does not exist" >testfailure
-				exit 3
-			fi
-		else
-			echo "updated_skipworktree should be set for reset --mixed and update-index" >testfailure
-			exit 4
-		fi
-		echo "success" >testsuccess
-	EOF
-	: force index to be dirty &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git reset --mixed --quiet HEAD~1 &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git hash-object -w --stdin <dir1/file2.txt >expect &&
-	git update-index --cacheinfo 100644 "$(cat expect)" dir1/file1.txt &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git update-index --skip-worktree dir1/file2.txt &&
-	git update-index --remove dir1/file2.txt &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure
-
-ok 4 - test reset --mixed and update-index triggers the hook
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7110-reset-merge.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7110-reset-merge/.git/
 expecting success of 7110.1 'setup': 
@@ -444229,672 +444221,2526 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7004-tag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7004-tag/.git/
-expecting success of 7004.1 'setup': 
-	test_oid_cache <<-EOM
-	othersigheader sha1:gpgsig-sha256
-	othersigheader sha256:gpgsig
-	EOM
-
-ok 1 - setup
-
-expecting success of 7004.2 'listing all tags in an empty tree should succeed': 
-	git tag -l &&
-	git tag
+*** t7102-reset.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7102-reset/.git/
+expecting success of 7102.1 'creating initial files and commits': 
+	test_tick &&
+	echo "1st file" >first &&
+	git add first &&
+	git commit -m "create 1st file" &&
 
-ok 2 - listing all tags in an empty tree should succeed
+	echo "2nd file" >second &&
+	git add second &&
+	git commit -m "create 2nd file" &&
 
-expecting success of 7004.3 'listing all tags in an empty tree should output nothing': 
-	test $(git tag -l | wc -l) -eq 0 &&
-	test $(git tag | wc -l) -eq 0
+	echo "2nd line 1st file" >>first &&
+	git commit -a -m "modify 1st file" &&
+	head5p2=$(git rev-parse --verify HEAD) &&
+	head5p2f=$(git rev-parse --short HEAD:first) &&
 
-ok 3 - listing all tags in an empty tree should output nothing
+	git rm first &&
+	git mv second secondfile &&
+	git commit -a -m "remove 1st and rename 2nd" &&
+	head5p1=$(git rev-parse --verify HEAD) &&
+	head5p1s=$(git rev-parse --short HEAD:secondfile) &&
 
-expecting success of 7004.4 'sort tags, ignore case': 
-	(
-		git init sort &&
-		cd sort &&
-		test_commit initial &&
-		git tag tag-one &&
-		git tag TAG-two &&
-		git tag -l >actual &&
-		cat >expected <<-\EOF &&
-		TAG-two
-		initial
-		tag-one
-		EOF
-		test_cmp expected actual &&
-		git tag -l -i >actual &&
-		cat >expected <<-\EOF &&
-		initial
-		tag-one
-		TAG-two
-		EOF
-		test_cmp expected actual
-	)
+	echo "1st line 2nd file" >secondfile &&
+	echo "2nd line 2nd file" >>secondfile &&
+	# "git commit -m" would break MinGW, as Windows refuse to pass
+	# $test_encoding encoded parameter to git.
+	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
+	head5=$(git rev-parse --verify HEAD) &&
+	head5s=$(git rev-parse --short HEAD:secondfile) &&
+	head5sl=$(git rev-parse HEAD:secondfile)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7004-tag/sort/.git/
-[main (root-commit) 24b24cf] initial
+[main (root-commit) 811bbdf] create 1st file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 4 - sort tags, ignore case
-
-expecting success of 7004.5 'looking for a tag in an empty tree should fail': 
-	! (tag_exists mytag)
-
-ok 5 - looking for a tag in an empty tree should fail
-
-expecting success of 7004.6 'creating a tag in an empty tree should fail': 
-	test_must_fail git tag mynotag &&
-	! tag_exists mynotag
-
-fatal: Failed to resolve 'HEAD' as a valid ref.
-ok 6 - creating a tag in an empty tree should fail
-
-expecting success of 7004.7 'creating a tag for HEAD in an empty tree should fail': 
-	test_must_fail git tag mytaghead HEAD &&
-	! tag_exists mytaghead
-
-fatal: Failed to resolve 'HEAD' as a valid ref.
-ok 7 - creating a tag for HEAD in an empty tree should fail
-
-expecting success of 7004.8 'creating a tag for an unknown revision should fail': 
-	test_must_fail git tag mytagnorev aaaaaaaaaaa &&
-	! tag_exists mytagnorev
-
-fatal: Failed to resolve 'aaaaaaaaaaa' as a valid ref.
-ok 8 - creating a tag for an unknown revision should fail
-
-expecting success of 7004.9 'creating a tag using default HEAD should succeed': 
-	test_config core.logAllRefUpdates true &&
-	test_tick &&
-	echo foo >foo &&
-	git add foo &&
-	git commit -m Foo &&
-	git tag mytag &&
-	test_must_fail git reflog exists refs/tags/mytag
-
-[main (root-commit) 86e17e4] Foo
+ create mode 100644 first
+[main ba22ccd] create 2nd file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-ok 9 - creating a tag using default HEAD should succeed
-
-expecting success of 7004.10 'creating a tag with --create-reflog should create reflog': 
-	git log -1 \
-		--format="format:tag: tagging %h (%s, %cd)%n" \
-		--date=format:%Y-%m-%d >expected &&
-	test_when_finished "git tag -d tag_with_reflog1" &&
-	git tag --create-reflog tag_with_reflog1 &&
-	git reflog exists refs/tags/tag_with_reflog1 &&
-	test-tool ref-store main for-each-reflog-ent refs/tags/tag_with_reflog1 | sed -e "s/^.*	//" >actual &&
-	test_cmp expected actual
+ create mode 100644 second
+[main ddaefe0] modify 1st file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+rm 'first'
+[main d1a4bc3] remove 1st and rename 2nd
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 first
+ rename second => secondfile (100%)
+[main eed6733] modify 2nd file (geändert)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ok 1 - creating initial files and commits
 
-Deleted tag 'tag_with_reflog1' (was 86e17e4)
-ok 10 - creating a tag with --create-reflog should create reflog
+expecting success of 7102.2 'no 'git reset --no-soft'': 
+		test_when_finished "rm -f err" &&
+		test_must_fail git reset --no-$opt 2>err &&
+		grep "error: unknown option .no-$opt." err
+	
+error: unknown option `no-soft'
+ok 2 - no 'git reset --no-soft'
 
-expecting success of 7004.11 'annotated tag with --create-reflog has correct message': 
-	git log -1 \
-		--format="format:tag: tagging %h (%s, %cd)%n" \
-		--date=format:%Y-%m-%d >expected &&
-	test_when_finished "git tag -d tag_with_reflog2" &&
-	git tag -m "annotated tag" --create-reflog tag_with_reflog2 &&
-	git reflog exists refs/tags/tag_with_reflog2 &&
-	test-tool ref-store main for-each-reflog-ent refs/tags/tag_with_reflog2 | sed -e "s/^.*	//" >actual &&
-	test_cmp expected actual
+expecting success of 7102.3 'no 'git reset --no-mixed'': 
+		test_when_finished "rm -f err" &&
+		test_must_fail git reset --no-$opt 2>err &&
+		grep "error: unknown option .no-$opt." err
+	
+error: unknown option `no-mixed'
+ok 3 - no 'git reset --no-mixed'
 
-Deleted tag 'tag_with_reflog2' (was fcdbddb)
-ok 11 - annotated tag with --create-reflog has correct message
+expecting success of 7102.4 'no 'git reset --no-hard'': 
+		test_when_finished "rm -f err" &&
+		test_must_fail git reset --no-$opt 2>err &&
+		grep "error: unknown option .no-$opt." err
+	
+error: unknown option `no-hard'
+ok 4 - no 'git reset --no-hard'
 
-expecting success of 7004.12 '--create-reflog does not create reflog on failure': 
-	test_must_fail git tag --create-reflog mytag &&
-	test_must_fail git reflog exists refs/tags/mytag
+expecting success of 7102.5 'no 'git reset --no-merge'': 
+		test_when_finished "rm -f err" &&
+		test_must_fail git reset --no-$opt 2>err &&
+		grep "error: unknown option .no-$opt." err
+	
+error: unknown option `no-merge'
+ok 5 - no 'git reset --no-merge'
 
-fatal: tag 'mytag' already exists
-ok 12 - --create-reflog does not create reflog on failure
+expecting success of 7102.6 'no 'git reset --no-keep'': 
+		test_when_finished "rm -f err" &&
+		test_must_fail git reset --no-$opt 2>err &&
+		grep "error: unknown option .no-$opt." err
+	
+error: unknown option `no-keep'
+ok 6 - no 'git reset --no-keep'
 
-expecting success of 7004.13 'option core.logAllRefUpdates=always creates reflog': 
-	test_when_finished "git tag -d tag_with_reflog3" &&
-	test_config core.logAllRefUpdates always &&
-	git tag tag_with_reflog3 &&
-	git reflog exists refs/tags/tag_with_reflog3
+expecting success of 7102.7 'reset --hard message': 
+	hex=$(git log -1 --format="%h") &&
+	git reset --hard >.actual &&
+	echo HEAD is now at $hex $(commit_msg) >.expected &&
+	test_cmp .expected .actual
 
-Deleted tag 'tag_with_reflog3' (was 86e17e4)
-ok 13 - option core.logAllRefUpdates=always creates reflog
+ok 7 - reset --hard message
 
-expecting success of 7004.14 'listing all tags if one exists should succeed': 
-	git tag -l &&
-	git tag
+expecting success of 7102.8 'reset --hard message (ISO8859-1 logoutputencoding)': 
+	hex=$(git log -1 --format="%h") &&
+	git -c "i18n.logOutputEncoding=$test_encoding" reset --hard >.actual &&
+	echo HEAD is now at $hex $(commit_msg $test_encoding) >.expected &&
+	test_cmp .expected .actual
 
-mytag
-mytag
-ok 14 - listing all tags if one exists should succeed
+ok 8 - reset --hard message (ISO8859-1 logoutputencoding)
 
-expecting success of 7004.15 'Multiple -l or --list options are equivalent to one -l option': 
-	cat >expect <<-\EOF &&
-	mytag
+expecting success of 7102.9 'giving a non existing revision should fail': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
 	EOF
-	git tag -l -l >actual &&
-	test_cmp expect actual &&
-	git tag --list --list >actual &&
-	test_cmp expect actual &&
-	git tag --list -l --list >actual &&
-	test_cmp expect actual
 
-ok 15 - Multiple -l or --list options are equivalent to one -l option
+	test_must_fail git reset aaaaaa &&
+	test_must_fail git reset --mixed aaaaaa &&
+	test_must_fail git reset --soft aaaaaa &&
+	test_must_fail git reset --hard aaaaaa &&
+	check_changes $head5
 
-expecting success of 7004.16 'listing all tags if one exists should output that tag': 
-	test $(git tag -l) = mytag &&
-	test $(git tag) = mytag
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 9 - giving a non existing revision should fail
 
-ok 16 - listing all tags if one exists should output that tag
+expecting success of 7102.10 'reset --soft with unmerged index should fail': 
+	touch .git/MERGE_HEAD &&
+	echo "100644 $head5sl 1	un" |
+		git update-index --index-info &&
+	test_must_fail git reset --soft HEAD &&
+	rm .git/MERGE_HEAD &&
+	git rm --cached -- un
 
-expecting success of 7004.17 'listing a tag using a matching pattern should succeed': 
-	git tag -l mytag
+fatal: Cannot do a soft reset in the middle of a merge.
+rm 'un'
+ok 10 - reset --soft with unmerged index should fail
 
-mytag
-ok 17 - listing a tag using a matching pattern should succeed
+expecting success of 7102.11 'giving paths with options different than --mixed should fail': 
+	test_must_fail git reset --soft -- first &&
+	test_must_fail git reset --hard -- first &&
+	test_must_fail git reset --soft HEAD^ -- first &&
+	test_must_fail git reset --hard HEAD^ -- first &&
+	check_changes $head5
 
-expecting success of 7004.18 'listing a tag with --ignore-case': 
-	test $(git tag -l --ignore-case MYTAG) = mytag
+fatal: Cannot do soft reset with paths.
+fatal: Cannot do hard reset with paths.
+fatal: Cannot do soft reset with paths.
+fatal: Cannot do hard reset with paths.
+ok 11 - giving paths with options different than --mixed should fail
 
-ok 18 - listing a tag with --ignore-case
+expecting success of 7102.12 'giving unrecognized options should fail': 
+	test_must_fail git reset --other &&
+	test_must_fail git reset -o &&
+	test_must_fail git reset --mixed --other &&
+	test_must_fail git reset --mixed -o &&
+	test_must_fail git reset --soft --other &&
+	test_must_fail git reset --soft -o &&
+	test_must_fail git reset --hard --other &&
+	test_must_fail git reset --hard -o &&
+	check_changes $head5
 
-expecting success of 7004.19 'listing a tag using a matching pattern should output that tag': 
-	test $(git tag -l mytag) = mytag
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-ok 19 - listing a tag using a matching pattern should output that tag
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-expecting success of 7004.20 'listing tags using a non-matching pattern should succeed': 
-	git tag -l xxx
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-ok 20 - listing tags using a non-matching pattern should succeed
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-expecting success of 7004.21 'listing tags using a non-matching pattern should output nothing': 
-	test $(git tag -l xxx | wc -l) -eq 0
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-ok 21 - listing tags using a non-matching pattern should output nothing
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-expecting success of 7004.22 'trying to create a tag with the name of one existing should fail': 
-	test_must_fail git tag mytag
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-fatal: tag 'mytag' already exists
-ok 22 - trying to create a tag with the name of one existing should fail
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-expecting success of 7004.23 'trying to create a tag with a non-valid name should fail': 
-	test $(git tag -l | wc -l) -eq 1 &&
-	test_must_fail git tag "" &&
-	test_must_fail git tag .othertag &&
-	test_must_fail git tag "other tag" &&
-	test_must_fail git tag "othertag^" &&
-	test_must_fail git tag "other~tag" &&
-	test $(git tag -l | wc -l) -eq 1
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-fatal: '' is not a valid tag name.
-fatal: '.othertag' is not a valid tag name.
-fatal: 'other tag' is not a valid tag name.
-fatal: 'othertag^' is not a valid tag name.
-fatal: 'other~tag' is not a valid tag name.
-ok 23 - trying to create a tag with a non-valid name should fail
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-expecting success of 7004.24 'creating a tag using HEAD directly should succeed': 
-	git tag myhead HEAD &&
-	tag_exists myhead
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-ok 24 - creating a tag using HEAD directly should succeed
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-expecting success of 7004.25 '--force can create a tag with the name of one existing': 
-	tag_exists mytag &&
-	git tag --force mytag &&
-	tag_exists mytag
-ok 25 - --force can create a tag with the name of one existing
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-expecting success of 7004.26 '--force is moot with a non-existing tag name': 
-	test_when_finished git tag -d newtag forcetag &&
-	git tag newtag >expect &&
-	git tag --force forcetag >actual &&
-	test_cmp expect actual
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-Deleted tag 'newtag' (was 86e17e4)
-Deleted tag 'forcetag' (was 86e17e4)
-ok 26 - --force is moot with a non-existing tag name
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-expecting success of 7004.27 'trying to delete an unknown tag should fail': 
-	! tag_exists unknown-tag &&
-	test_must_fail git tag -d unknown-tag
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-error: tag 'unknown-tag' not found.
-ok 27 - trying to delete an unknown tag should fail
+ok 12 - giving unrecognized options should fail
 
-expecting success of 7004.28 'trying to delete tags without params should succeed and do nothing': 
-	cat >expect <<-\EOF &&
-	myhead
-	mytag
-	EOF
-	git tag -l >actual &&
-	test_cmp expect actual &&
-	git tag -d &&
-	git tag -l >actual &&
-	test_cmp expect actual
+expecting success of 7102.13 'trying to do reset --soft with pending merge should fail': 
+	git branch branch1 &&
+	git branch branch2 &&
 
-ok 28 - trying to delete tags without params should succeed and do nothing
+	git checkout branch1 &&
+	echo "3rd line in branch1" >>secondfile &&
+	git commit -a -m "change in branch1" &&
 
-expecting success of 7004.29 'deleting two existing tags in one command should succeed': 
-	tag_exists mytag &&
-	tag_exists myhead &&
-	git tag -d mytag myhead &&
-	! tag_exists mytag &&
-	! tag_exists myhead
+	git checkout branch2 &&
+	echo "3rd line in branch2" >>secondfile &&
+	git commit -a -m "change in branch2" &&
 
-Deleted tag 'mytag' (was 86e17e4)
-Deleted tag 'myhead' (was 86e17e4)
-ok 29 - deleting two existing tags in one command should succeed
+	test_must_fail git merge branch1 &&
+	test_must_fail git reset --soft &&
 
-expecting success of 7004.30 'creating a tag with the name of another deleted one should succeed': 
-	! tag_exists mytag &&
-	git tag mytag &&
-	tag_exists mytag
+	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
+	git commit -a -m "the change in branch2" &&
 
-ok 30 - creating a tag with the name of another deleted one should succeed
+	git checkout main &&
+	git branch -D branch1 branch2 &&
+	check_changes $head5
 
-expecting success of 7004.31 'trying to delete two tags, existing and not, should fail in the 2nd': 
-	tag_exists mytag &&
-	! tag_exists nonexistingtag &&
-	test_must_fail git tag -d mytag nonexistingtag &&
-	! tag_exists mytag &&
-	! tag_exists nonexistingtag
+Switched to branch 'branch1'
+[branch1 6b78ea5] change in branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch2'
+[branch2 f8a209f] change in branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Auto-merging secondfile
+CONFLICT (content): Merge conflict in secondfile
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a soft reset in the middle of a merge.
+[branch2 8e8e261] the change in branch2
+ Author: A U Thor <author@example.com>
+Switched to branch 'main'
+Deleted branch branch1 (was 6b78ea5).
+Deleted branch branch2 (was 8e8e261).
+ok 13 - trying to do reset --soft with pending merge should fail
 
-error: tag 'nonexistingtag' not found.
-Deleted tag 'mytag' (was 86e17e4)
-ok 31 - trying to delete two tags, existing and not, should fail in the 2nd
+expecting success of 7102.14 'trying to do reset --soft with pending checkout merge should fail': 
+	git branch branch3 &&
+	git branch branch4 &&
 
-expecting success of 7004.32 'trying to delete an already deleted tag should fail': 
-	test_must_fail git tag -d mytag
+	git checkout branch3 &&
+	echo "3rd line in branch3" >>secondfile &&
+	git commit -a -m "line in branch3" &&
 
-error: tag 'mytag' not found.
-ok 32 - trying to delete an already deleted tag should fail
+	git checkout branch4 &&
+	echo "3rd line in branch4" >>secondfile &&
 
-expecting success of 7004.33 'listing all tags should print them ordered': 
-	cat >expect <<-\EOF &&
-	a1
-	aa1
-	cba
-	t210
-	t211
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
-	EOF
-	git tag v1.0.1 &&
-	git tag t211 &&
-	git tag aa1 &&
-	git tag v0.2.1 &&
-	git tag v1.1.3 &&
-	git tag cba &&
-	git tag a1 &&
-	git tag v1.0 &&
-	git tag t210 &&
-	git tag -l >actual &&
-	test_cmp expect actual &&
-	git tag >actual &&
-	test_cmp expect actual
+	git checkout -m branch3 &&
+	test_must_fail git reset --soft &&
 
-ok 33 - listing all tags should print them ordered
+	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
+	git commit -a -m "the line in branch3" &&
 
-expecting success of 7004.34 'listing tags with substring as pattern must print those matching': 
-	cat >expect <<-\EOF &&
-	a1
-	aa1
-	cba
-	EOF
-	rm *a* &&
-	git tag -l "*a*" >current &&
-	test_cmp expect current
+	git checkout main &&
+	git branch -D branch3 branch4 &&
+	check_changes $head5
 
-ok 34 - listing tags with substring as pattern must print those matching
+Switched to branch 'branch3'
+[branch3 0b5021a] line in branch3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+M	secondfile
+fatal: Cannot do a soft reset in the middle of a merge.
+[branch3 dbe96ed] the line in branch3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Deleted branch branch3 (was dbe96ed).
+Deleted branch branch4 (was eed6733).
+ok 14 - trying to do reset --soft with pending checkout merge should fail
 
-expecting success of 7004.35 'listing tags with a suffix as pattern must print those matching': 
-	cat >expect <<-\EOF &&
-	v0.2.1
-	v1.0.1
-	EOF
-	git tag -l "*.1" >actual &&
-	test_cmp expect actual
+expecting success of 7102.15 'resetting to HEAD with no changes should succeed and do nothing': 
+	git reset --hard &&
+		check_changes $head5 &&
+	git reset --hard HEAD &&
+		check_changes $head5 &&
+	git reset --soft &&
+		check_changes $head5 &&
+	git reset --soft HEAD &&
+		check_changes $head5 &&
+	git reset --mixed &&
+		check_changes $head5 &&
+	git reset --mixed HEAD &&
+		check_changes $head5 &&
+	git reset &&
+		check_changes $head5 &&
+	git reset HEAD &&
+		check_changes $head5
 
-ok 35 - listing tags with a suffix as pattern must print those matching
+HEAD is now at eed6733 modify 2nd file (geändert)
+HEAD is now at eed6733 modify 2nd file (geändert)
+ok 15 - resetting to HEAD with no changes should succeed and do nothing
 
-expecting success of 7004.36 'listing tags with a prefix as pattern must print those matching': 
-	cat >expect <<-\EOF &&
-	t210
-	t211
+expecting success of 7102.16 '--soft reset only should show changes in diff --cached': 
+	>.diff_expect &&
+	cat >.cached_expect <<-EOF &&
+	diff --git a/secondfile b/secondfile
+	index $head5p1s..$head5s 100644
+	--- a/secondfile
+	+++ b/secondfile
+	@@ -1 +1,2 @@
+	-2nd file
+	+1st line 2nd file
+	+2nd line 2nd file
 	EOF
-	git tag -l "t21*" >actual &&
-	test_cmp expect actual
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
+	git reset --soft HEAD^ &&
+	check_changes $head5p1 &&
+	test "$(git rev-parse ORIG_HEAD)" = \
+			$head5
 
-ok 36 - listing tags with a prefix as pattern must print those matching
+ok 16 - --soft reset only should show changes in diff --cached
 
-expecting success of 7004.37 'listing tags using a name as pattern must print that one matching': 
-	cat >expect <<-\EOF &&
-	a1
+expecting success of 7102.17 'changing files and redo the last commit should succeed': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	3rd line 2nd file
 	EOF
-	git tag -l a1 >actual &&
-	test_cmp expect actual
+	echo "3rd line 2nd file" >>secondfile &&
+	git commit -a -C ORIG_HEAD &&
+	head4=$(git rev-parse --verify HEAD) &&
+	check_changes $head4 &&
+	test "$(git rev-parse ORIG_HEAD)" = \
+			$head5
 
-ok 37 - listing tags using a name as pattern must print that one matching
+[main b052eb8] modify 2nd file (geändert)
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+ok 17 - changing files and redo the last commit should succeed
 
-expecting success of 7004.38 'listing tags using a name as pattern must print that one matching': 
-	cat >expect <<-\EOF &&
-	v1.0
+expecting success of 7102.18 '--hard reset should change the files and undo commits permanently': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	first:
+	1st file
+	2nd line 1st file
+	second:
+	2nd file
 	EOF
-	git tag -l v1.0 >actual &&
-	test_cmp expect actual
+	git reset --hard HEAD~2 &&
+	check_changes $head5p2 &&
+	test "$(git rev-parse ORIG_HEAD)" = \
+			$head4
 
-ok 38 - listing tags using a name as pattern must print that one matching
+HEAD is now at ddaefe0 modify 1st file
+ok 18 - --hard reset should change the files and undo commits permanently
 
-expecting success of 7004.39 'listing tags with ? in the pattern should print those matching': 
-	cat >expect <<-\EOF &&
-	v1.0.1
-	v1.1.3
+expecting success of 7102.19 'redoing changes adding them without commit them should succeed': 
+	>.diff_expect &&
+	cat >.cached_expect <<-EOF &&
+	diff --git a/first b/first
+	deleted file mode 100644
+	index $head5p2f..0000000
+	--- a/first
+	+++ /dev/null
+	@@ -1,2 +0,0 @@
+	-1st file
+	-2nd line 1st file
+	diff --git a/second b/second
+	deleted file mode 100644
+	index $head5p1s..0000000
+	--- a/second
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2nd file
+	diff --git a/secondfile b/secondfile
+	new file mode 100644
+	index 0000000..$head5s
+	--- /dev/null
+	+++ b/secondfile
+	@@ -0,0 +1,2 @@
+	+1st line 2nd file
+	+2nd line 2nd file
 	EOF
-	git tag -l "v1.?.?" >actual &&
-	test_cmp expect actual
-
-ok 39 - listing tags with ? in the pattern should print those matching
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
+	git rm first &&
+	git mv second secondfile &&
 
-expecting success of 7004.40 'listing tags using v.* should print nothing because none have v.': 
-	git tag -l "v.*" >actual &&
-	test_must_be_empty actual
+	echo "1st line 2nd file" >secondfile &&
+	echo "2nd line 2nd file" >>secondfile &&
+	git add secondfile &&
+	check_changes $head5p2
 
-ok 40 - listing tags using v.* should print nothing because none have v.
+rm 'first'
+ok 19 - redoing changes adding them without commit them should succeed
 
-expecting success of 7004.41 'listing tags using v* should print only those having v': 
-	cat >expect <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
+expecting success of 7102.20 '--mixed reset to HEAD should unadd the files': 
+	cat >.diff_expect <<-EOF &&
+	diff --git a/first b/first
+	deleted file mode 100644
+	index $head5p2f..0000000
+	--- a/first
+	+++ /dev/null
+	@@ -1,2 +0,0 @@
+	-1st file
+	-2nd line 1st file
+	diff --git a/second b/second
+	deleted file mode 100644
+	index $head5p1s..0000000
+	--- a/second
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2nd file
 	EOF
-	git tag -l "v*" >actual &&
-	test_cmp expect actual
-
-ok 41 - listing tags using v* should print only those having v
-
-expecting success of 7004.42 'tag -l can accept multiple patterns': 
-	cat >expect <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
 	EOF
-	git tag -l "v1*" "v0*" >actual &&
-	test_cmp expect actual
+	git reset &&
+	check_changes $head5p2 &&
+	test "$(git rev-parse ORIG_HEAD)" = $head5p2
 
-ok 42 - tag -l can accept multiple patterns
+Unstaged changes after reset:
+D	first
+D	second
+ok 20 - --mixed reset to HEAD should unadd the files
 
-expecting success of 7004.43 'tag -l <pattern> -l <pattern> works, as our buggy documentation previously suggested': 
-	cat >expect <<-\EOF &&
-	v0.2.1
-	v1.0
-	v1.0.1
-	v1.1.3
+expecting success of 7102.21 'redoing the last two commits should succeed': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
 	EOF
-	git tag -l "v1*" -l "v0*" >actual &&
-	test_cmp expect actual
-
-ok 43 - tag -l <pattern> -l <pattern> works, as our buggy documentation previously suggested
+	git add secondfile &&
+	git reset --hard $head5p2 &&
+	git rm first &&
+	git mv second secondfile &&
+	git commit -a -m "remove 1st and rename 2nd" &&
 
-expecting success of 7004.44 'listing tags in column': 
-	COLUMNS=41 git tag -l --column=row >actual &&
-	cat >expected <<-\EOF &&
-	a1      aa1     cba     t210    t211
-	v0.2.1  v1.0    v1.0.1  v1.1.3
-	EOF
-	test_cmp expected actual
+	echo "1st line 2nd file" >secondfile &&
+	echo "2nd line 2nd file" >>secondfile &&
+	# "git commit -m" would break MinGW, as Windows refuse to pass
+	# $test_encoding encoded parameter to git.
+	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
+	check_changes $head5
 
-ok 44 - listing tags in column
+HEAD is now at ddaefe0 modify 1st file
+rm 'first'
+[main d1a4bc3] remove 1st and rename 2nd
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 first
+ rename second => secondfile (100%)
+[main eed6733] modify 2nd file (geändert)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ok 21 - redoing the last two commits should succeed
 
-expecting success of 7004.45 'listing tags in column with column.*': 
-	test_config column.tag row &&
-	test_config column.ui dense &&
-	COLUMNS=40 git tag -l >actual &&
-	cat >expected <<-\EOF &&
-	a1      aa1   cba     t210    t211
-	v0.2.1  v1.0  v1.0.1  v1.1.3
+expecting success of 7102.22 '--hard reset to HEAD should clear a failed merge': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	3rd line in branch2
 	EOF
-	test_cmp expected actual
-
-ok 45 - listing tags in column with column.*
+	git branch branch1 &&
+	git branch branch2 &&
 
-expecting success of 7004.46 'listing tag with -n --column should fail': 
-	test_must_fail git tag --column -n
+	git checkout branch1 &&
+	echo "3rd line in branch1" >>secondfile &&
+	git commit -a -m "change in branch1" &&
 
-fatal: options '--column' and '-n' cannot be used together
-ok 46 - listing tag with -n --column should fail
+	git checkout branch2 &&
+	echo "3rd line in branch2" >>secondfile &&
+	git commit -a -m "change in branch2" &&
+	head3=$(git rev-parse --verify HEAD) &&
 
-expecting success of 7004.47 'listing tags -n in column with column.ui ignored': 
-	test_config column.ui "row dense" &&
-	COLUMNS=40 git tag -l -n >actual &&
-	cat >expected <<-\EOF &&
-	a1              Foo
-	aa1             Foo
-	cba             Foo
-	t210            Foo
-	t211            Foo
-	v0.2.1          Foo
-	v1.0            Foo
-	v1.0.1          Foo
-	v1.1.3          Foo
-	EOF
-	test_cmp expected actual
+	test_must_fail git pull . branch1 &&
+	git reset --hard &&
+	check_changes $head3
 
-ok 47 - listing tags -n in column with column.ui ignored
+Switched to branch 'branch1'
+[branch1 6b78ea5] change in branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch2'
+[branch2 f8a209f] change in branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+From .
+ * branch            branch1    -> FETCH_HEAD
+hint: You have divergent branches and need to specify how to reconcile them.
+hint: You can do so by running one of the following commands sometime before
+hint: your next pull:
+hint:
+hint:   git config pull.rebase false  # merge
+hint:   git config pull.rebase true   # rebase
+hint:   git config pull.ff only       # fast-forward only
+hint:
+hint: You can replace "git config" with "git config --global" to set a default
+hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+hint: or --ff-only on the command line to override the configured default per
+hint: invocation.
+fatal: Need to specify how to reconcile divergent branches.
+HEAD is now at f8a209f change in branch2
+ok 22 - --hard reset to HEAD should clear a failed merge
 
-expecting success of 7004.48 'a non-annotated tag created without parameters should point to HEAD': 
-	git tag non-annotated-tag &&
-	test $(git cat-file -t non-annotated-tag) = commit &&
-	test $(git rev-parse non-annotated-tag) = $(git rev-parse HEAD)
+expecting success of 7102.23 '--hard reset to ORIG_HEAD should clear a fast-forward merge': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
+	git reset --hard HEAD^ &&
+	check_changes $head5 &&
 
-ok 48 - a non-annotated tag created without parameters should point to HEAD
+	git pull . branch1 &&
+	git reset --hard ORIG_HEAD &&
+	check_changes $head5 &&
 
-expecting success of 7004.49 'trying to verify an unknown tag should fail': 
-	test_must_fail git tag -v unknown-tag
+	git checkout main &&
+	git branch -D branch1 branch2 &&
+	check_changes $head5
 
-error: tag 'unknown-tag' not found.
-ok 49 - trying to verify an unknown tag should fail
+HEAD is now at eed6733 modify 2nd file (geändert)
+From .
+ * branch            branch1    -> FETCH_HEAD
+Updating eed6733..6b78ea5
+Fast-forward
+ secondfile | 1 +
+ 1 file changed, 1 insertion(+)
+HEAD is now at eed6733 modify 2nd file (geändert)
+Switched to branch 'main'
+Deleted branch branch1 (was 6b78ea5).
+Deleted branch branch2 (was eed6733).
+ok 23 - --hard reset to ORIG_HEAD should clear a fast-forward merge
 
-expecting success of 7004.50 'trying to verify a non-annotated and non-signed tag should fail': 
-	test_must_fail git tag -v non-annotated-tag
+expecting success of 7102.24 'test --mixed <paths>': 
+	echo 1 >file1 &&
+	echo 2 >file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m files &&
+	before1=$(git rev-parse --short HEAD:file1) &&
+	before2=$(git rev-parse --short HEAD:file2) &&
+	git rm file2 &&
+	echo 3 >file3 &&
+	echo 4 >file4 &&
+	echo 5 >file1 &&
+	after1=$(git rev-parse --short $(git hash-object file1)) &&
+	after4=$(git rev-parse --short $(git hash-object file4)) &&
+	git add file1 file3 file4 &&
+	git reset HEAD -- file1 file2 file3 &&
+	test_must_fail git diff --quiet &&
+	git diff >output &&
 
-error: non-annotated-tag: cannot verify a non-tag object of type commit.
-ok 50 - trying to verify a non-annotated and non-signed tag should fail
+	cat >expect <<-EOF &&
+	diff --git a/file1 b/file1
+	index $before1..$after1 100644
+	--- a/file1
+	+++ b/file1
+	@@ -1 +1 @@
+	-1
+	+5
+	diff --git a/file2 b/file2
+	deleted file mode 100644
+	index $before2..0000000
+	--- a/file2
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2
+	EOF
 
-expecting success of 7004.51 'trying to verify many non-annotated or unknown tags, should fail': 
-	test_must_fail git tag -v unknown-tag1 non-annotated-tag unknown-tag2
+	test_cmp expect output &&
+	git diff --cached >output &&
 
-error: tag 'unknown-tag1' not found.
-error: non-annotated-tag: cannot verify a non-tag object of type commit.
-error: tag 'unknown-tag2' not found.
-ok 51 - trying to verify many non-annotated or unknown tags, should fail
+	cat >cached_expect <<-EOF &&
+	diff --git a/file4 b/file4
+	new file mode 100644
+	index 0000000..$after4
+	--- /dev/null
+	+++ b/file4
+	@@ -0,0 +1 @@
+	+4
+	EOF
 
-expecting success of 7004.52 'creating an annotated tag with -m message should succeed': 
-	commit=$(git rev-parse HEAD) &&
-	time=$test_tick &&
-	get_tag_header annotated-tag $commit commit $time >expect &&
-	echo "A message" >>expect &&
-	git tag -m "A message" annotated-tag &&
-	get_tag_msg annotated-tag >actual &&
-	test_cmp expect actual
+	test_cmp cached_expect output
 
-ok 52 - creating an annotated tag with -m message should succeed
+[main 14b96fb] files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+rm 'file2'
+Unstaged changes after reset:
+M	file1
+D	file2
+ok 24 - test --mixed <paths>
 
-expecting success of 7004.53 'set up editor': 
-	write_script fakeeditor <<-\EOF
-	sed -e "s/A message/An edited message/g" <"$1" >"$1-"
-	mv "$1-" "$1"
-	EOF
+expecting success of 7102.25 'test resetting the index at give paths': 
+	mkdir sub &&
+	>sub/file1 &&
+	>sub/file2 &&
+	git update-index --add sub/file1 sub/file2 &&
+	T=$(git write-tree) &&
+	git reset HEAD sub/file2 &&
+	test_must_fail git diff --quiet &&
+	U=$(git write-tree) &&
+	echo "$T" &&
+	echo "$U" &&
+	test_must_fail git diff-index --cached --exit-code "$T" &&
+	test "$T" != "$U"
 
-ok 53 - set up editor
+Unstaged changes after reset:
+M	file1
+D	file2
+9571d9b5fb34d9c1274612948c5356f0615744bc
+88880074c0c9957f91fd21817fee120b773fc32c
+:100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D	sub/file2
+ok 25 - test resetting the index at give paths
 
-expecting success of 7004.54 'creating an annotated tag with -m message --edit should succeed': 
-	get_tag_header annotated-tag-edit $commit commit $time >expect &&
-	echo "An edited message" >>expect &&
-	GIT_EDITOR=./fakeeditor git tag -m "A message" --edit annotated-tag-edit &&
-	get_tag_msg annotated-tag-edit >actual &&
-	test_cmp expect actual
+expecting success of 7102.26 'resetting an unmodified path is a no-op': 
+	git reset --hard &&
+	git reset -- file1 &&
+	git diff-files --exit-code &&
+	git diff-index --cached --exit-code HEAD
 
-ok 54 - creating an annotated tag with -m message --edit should succeed
+HEAD is now at 14b96fb files
+ok 26 - resetting an unmodified path is a no-op
 
-expecting success of 7004.55 'creating an annotated tag with -F messagefile should succeed': 
-	cat >msgfile <<-\EOF &&
-	Another message
-	in a file.
-	EOF
-	get_tag_header file-annotated-tag $commit commit $time >expect &&
-	cat msgfile >>expect &&
-	git tag -F msgfile file-annotated-tag &&
-	get_tag_msg file-annotated-tag >actual &&
-	test_cmp expect actual
+expecting success of 7102.27 '--mixed refreshes the index': 
+	# Verify default behavior (without --[no-]refresh or reset.refresh)
+	test_reset_refreshes_index &&
 
-ok 55 - creating an annotated tag with -F messagefile should succeed
+	# With --quiet
+	test_reset_refreshes_index "" --quiet
 
-expecting success of 7004.56 'set up editor': 
-	write_script fakeeditor <<-\EOF
-	sed -e "s/Another message/Another edited message/g" <"$1" >"$1-"
-	mv "$1-" "$1"
-	EOF
+HEAD is now at 14b96fb files
+rm 'file2'
+HEAD is now at 14b96fb files
+rm 'file2'
+ok 27 - --mixed refreshes the index
 
-ok 56 - set up editor
+expecting success of 7102.28 '--mixed --[no-]refresh sets refresh behavior': 
+	# Verify that --[no-]refresh controls index refresh
+	test_reset_refreshes_index "" --refresh &&
+	! test_reset_refreshes_index "" --no-refresh
 
-expecting success of 7004.57 'creating an annotated tag with -F messagefile --edit should succeed': 
-	get_tag_header file-annotated-tag-edit $commit commit $time >expect &&
-	sed -e "s/Another message/Another edited message/g" msgfile >>expect &&
-	GIT_EDITOR=./fakeeditor git tag -F msgfile --edit file-annotated-tag-edit &&
-	get_tag_msg file-annotated-tag-edit >actual &&
-	test_cmp expect actual
+HEAD is now at 14b96fb files
+rm 'file2'
+HEAD is now at 14b96fb files
+rm 'file2'
+'output.log' is not empty, it contains:
+:100644 100644 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 0000000000000000000000000000000000000000 M	file2
+ok 28 - --mixed --[no-]refresh sets refresh behavior
 
-ok 57 - creating an annotated tag with -F messagefile --edit should succeed
+expecting success of 7102.29 '--mixed preserves skip-worktree': 
+	echo 123 >>file2 &&
+	git add file2 &&
+	git update-index --skip-worktree file2 &&
+	git reset --mixed HEAD >output &&
+	test_must_be_empty output &&
 
-expecting success of 7004.58 'creating an annotated tag with -F - should succeed': 
-	cat >inputmsg <<-\EOF &&
-	A message from the
-	standard input
+	cat >expect <<-\EOF &&
+	Unstaged changes after reset:
+	M	file2
 	EOF
-	get_tag_header stdin-annotated-tag $commit commit $time >expect &&
-	cat inputmsg >>expect &&
-	git tag -F - stdin-annotated-tag <inputmsg &&
-	get_tag_msg stdin-annotated-tag >actual &&
-	test_cmp expect actual
+	git update-index --no-skip-worktree file2 &&
+	git add file2 &&
+	git reset --mixed HEAD >output &&
+	test_cmp expect output
 
-ok 58 - creating an annotated tag with -F - should succeed
+ok 29 - --mixed preserves skip-worktree
 
-expecting success of 7004.59 'trying to create a tag with a non-existing -F file should fail': 
-	! test -f nonexistingfile &&
-	! tag_exists notag &&
-	test_must_fail git tag -F nonexistingfile notag &&
-	! tag_exists notag
+expecting success of 7102.30 'resetting specific path that is unmerged': 
+	git rm --cached file2 &&
+	F1=$(git rev-parse HEAD:file1) &&
+	F2=$(git rev-parse HEAD:file2) &&
+	F3=$(git rev-parse HEAD:secondfile) &&
+	{
+		echo "100644 $F1 1	file2" &&
+		echo "100644 $F2 2	file2" &&
+		echo "100644 $F3 3	file2"
+	} | git update-index --index-info &&
+	git ls-files -u &&
+	git reset HEAD file2 &&
+	test_must_fail git diff --quiet &&
+	git diff-index --exit-code --cached HEAD
 
-fatal: could not open or read 'nonexistingfile': No such file or directory
-ok 59 - trying to create a tag with a non-existing -F file should fail
+rm 'file2'
+100644 d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 1	file2
+100644 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 2	file2
+100644 44c5b5884550c17758737edcced463447b91d42b 3	file2
+Unstaged changes after reset:
+M	file2
+ok 30 - resetting specific path that is unmerged
 
-expecting success of 7004.60 'trying to create tags giving both -m or -F options should fail': 
-	echo "message file 1" >msgfile1 &&
-	! tag_exists msgtag &&
-	test_must_fail git tag -m "message 1" -F msgfile1 msgtag &&
-	! tag_exists msgtag &&
-	test_must_fail git tag -F msgfile1 -m "message 1" msgtag &&
-	! tag_exists msgtag &&
-	test_must_fail git tag -m "message 1" -F msgfile1 \
-		-m "message 2" msgtag &&
-	! tag_exists msgtag
+expecting success of 7102.31 'disambiguation (1)': 
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	git reset secondfile &&
+	test_must_fail git diff --quiet -- secondfile &&
+	test -z "$(git diff --cached --name-only)" &&
+	test -f secondfile &&
+	test_must_be_empty secondfile
 
-fatal: options '-F' and '-m' cannot be used together
-fatal: options '-F' and '-m' cannot be used together
-fatal: options '-F' and '-m' cannot be used together
-ok 60 - trying to create tags giving both -m or -F options should fail
+HEAD is now at 14b96fb files
+Unstaged changes after reset:
+M	secondfile
+ok 31 - disambiguation (1)
 
-expecting success of 7004.61 'creating a tag with an empty -m message should succeed': 
-	get_tag_header empty-annotated-tag $commit commit $time >expect &&
-	git tag -m "" empty-annotated-tag &&
-	get_tag_msg empty-annotated-tag >actual &&
-	test_cmp expect actual
+expecting success of 7102.32 'disambiguation (2)': 
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	rm -f secondfile &&
+	test_must_fail git reset secondfile &&
+	test -n "$(git diff --cached --name-only -- secondfile)" &&
+	test ! -f secondfile
 
-ok 61 - creating a tag with an empty -m message should succeed
+HEAD is now at 14b96fb files
+fatal: ambiguous argument 'secondfile': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 32 - disambiguation (2)
 
-expecting success of 7004.62 'creating a tag with an empty -F messagefile should succeed': 
-	>emptyfile &&
-	get_tag_header emptyfile-annotated-tag $commit commit $time >expect &&
-	git tag -F emptyfile emptyfile-annotated-tag &&
-	get_tag_msg emptyfile-annotated-tag >actual &&
-	test_cmp expect actual
+expecting success of 7102.33 'disambiguation (3)': 
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	rm -f secondfile &&
+	git reset HEAD secondfile &&
+	test_must_fail git diff --quiet &&
+	test -z "$(git diff --cached --name-only)" &&
+	test ! -f secondfile
 
-ok 62 - creating a tag with an empty -F messagefile should succeed
+HEAD is now at 14b96fb files
+Unstaged changes after reset:
+D	secondfile
+ok 33 - disambiguation (3)
 
-expecting success of 7004.63 'extra blanks in the message for an annotated tag should be removed': 
-	printf "\n\n  \n\t\nLeading blank lines\n" >blanksfile &&
-	printf "\n\t \t  \nRepeated blank lines\n" >>blanksfile &&
-	printf "\n\n\nTrailing spaces      \t  \n" >>blanksfile &&
-	printf "\nTrailing blank lines\n\n\t \n\n" >>blanksfile &&
-	get_tag_header blanks-annotated-tag $commit commit $time >expect &&
-	cat >>expect <<-\EOF &&
-	Leading blank lines
+expecting success of 7102.34 'disambiguation (4)': 
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	rm -f secondfile &&
+	git reset -- secondfile &&
+	test_must_fail git diff --quiet &&
+	test -z "$(git diff --cached --name-only)" &&
+	test ! -f secondfile
 
-	Repeated blank lines
+HEAD is now at 14b96fb files
+Unstaged changes after reset:
+D	secondfile
+ok 34 - disambiguation (4)
 
-	Trailing spaces
+expecting success of 7102.35 'reset with paths accepts tree': 
+	# for simpler tests, drop last commit containing added files
+	git reset --hard HEAD^ &&
+	git reset HEAD^^{tree} -- . &&
+	git diff --cached HEAD^ --exit-code &&
+	git diff HEAD --exit-code
 
-	Trailing blank lines
-	EOF
-	git tag -F blanksfile blanks-annotated-tag &&
-	get_tag_msg blanks-annotated-tag >actual &&
-	test_cmp expect actual
+HEAD is now at eed6733 modify 2nd file (geändert)
+Unstaged changes after reset:
+M	secondfile
+ok 35 - reset with paths accepts tree
 
-ok 63 - extra blanks in the message for an annotated tag should be removed
+expecting success of 7102.36 'reset -N keeps removed files as intent-to-add': 
+	echo new-file >new-file &&
+	git add new-file &&
+	git reset -N HEAD &&
 
-expecting success of 7004.64 'creating a tag with blank -m message with spaces should succeed': 
-	get_tag_header blank-annotated-tag $commit commit $time >expect &&
-	git tag -m "     " blank-annotated-tag &&
-	get_tag_msg blank-annotated-tag >actual &&
+	tree=$(git write-tree) &&
+	git ls-tree $tree new-file >actual &&
+	test_must_be_empty actual &&
+
+	git diff --name-only >actual &&
+	echo new-file >expect &&
 	test_cmp expect actual
 
-ok 64 - creating a tag with blank -m message with spaces should succeed
+Unstaged changes after reset:
+A	new-file
+ok 36 - reset -N keeps removed files as intent-to-add
 
-expecting success of 7004.65 'creating a tag with blank -F messagefile with spaces should succeed': 
-	echo "     " >blankfile &&
-	echo ""      >>blankfile &&
-	echo "  "    >>blankfile &&
-	get_tag_header blankfile-annotated-tag $commit commit $time >expect &&
-	git tag -F blankfile blankfile-annotated-tag &&
-	get_tag_msg blankfile-annotated-tag >actual &&
-	test_cmp expect actual
+expecting success of 7102.37 'reset --mixed sets up work tree': 
+	git init mixed_worktree &&
+	(
+		cd mixed_worktree &&
+		test_commit dummy
+	) &&
+	git --git-dir=mixed_worktree/.git --work-tree=mixed_worktree reset >actual &&
+	test_must_be_empty actual
 
-ok 65 - creating a tag with blank -F messagefile with spaces should succeed
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7102-reset/mixed_worktree/.git/
+[main (root-commit) b737dfa] dummy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dummy.t
+ok 37 - reset --mixed sets up work tree
 
-expecting success of 7004.66 'creating a tag with -F file of spaces and no newline should succeed': 
-	printf "      " >blanknonlfile &&
-	get_tag_header blanknonlfile-annotated-tag $commit commit $time >expect &&
-	git tag -F blanknonlfile blanknonlfile-annotated-tag &&
-	get_tag_msg blanknonlfile-annotated-tag >actual &&
+expecting success of 7102.38 'reset handles --end-of-options': 
+	git update-ref refs/heads/--foo HEAD^ &&
+	git log -1 --format=%s refs/heads/--foo >expect &&
+	git reset --hard --end-of-options --foo &&
+	git log -1 --format=%s HEAD >actual &&
 	test_cmp expect actual
 
-ok 66 - creating a tag with -F file of spaces and no newline should succeed
-
-expecting success of 7004.67 'creating a tag using a -F messagefile with #comments should succeed': 
-	cat >commentsfile <<-\EOF &&
-	# A comment
+HEAD is now at d1a4bc3 remove 1st and rename 2nd
+ok 38 - reset handles --end-of-options
 
-	############
-	The message.
-	############
-	One line.
+# passed all 38 test(s)
+1..38
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7301-clean-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 .
 
-	# commented lines
-	# commented lines
 
-	Another line.
+[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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7004-tag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7004-tag/.git/
+expecting success of 7004.1 'setup': 
+	test_oid_cache <<-EOM
+	othersigheader sha1:gpgsig-sha256
+	othersigheader sha256:gpgsig
+	EOM
+
+ok 1 - setup
+
+expecting success of 7004.2 'listing all tags in an empty tree should succeed': 
+	git tag -l &&
+	git tag
+
+ok 2 - listing all tags in an empty tree should succeed
+
+expecting success of 7004.3 'listing all tags in an empty tree should output nothing': 
+	test $(git tag -l | wc -l) -eq 0 &&
+	test $(git tag | wc -l) -eq 0
+
+ok 3 - listing all tags in an empty tree should output nothing
+
+expecting success of 7004.4 'sort tags, ignore case': 
+	(
+		git init sort &&
+		cd sort &&
+		test_commit initial &&
+		git tag tag-one &&
+		git tag TAG-two &&
+		git tag -l >actual &&
+		cat >expected <<-\EOF &&
+		TAG-two
+		initial
+		tag-one
+		EOF
+		test_cmp expected actual &&
+		git tag -l -i >actual &&
+		cat >expected <<-\EOF &&
+		initial
+		tag-one
+		TAG-two
+		EOF
+		test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7004-tag/sort/.git/
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 4 - sort tags, ignore case
+
+expecting success of 7004.5 'looking for a tag in an empty tree should fail': 
+	! (tag_exists mytag)
+
+ok 5 - looking for a tag in an empty tree should fail
+
+expecting success of 7004.6 'creating a tag in an empty tree should fail': 
+	test_must_fail git tag mynotag &&
+	! tag_exists mynotag
+
+fatal: Failed to resolve 'HEAD' as a valid ref.
+ok 6 - creating a tag in an empty tree should fail
+
+expecting success of 7004.7 'creating a tag for HEAD in an empty tree should fail': 
+	test_must_fail git tag mytaghead HEAD &&
+	! tag_exists mytaghead
+
+fatal: Failed to resolve 'HEAD' as a valid ref.
+ok 7 - creating a tag for HEAD in an empty tree should fail
+
+expecting success of 7004.8 'creating a tag for an unknown revision should fail': 
+	test_must_fail git tag mytagnorev aaaaaaaaaaa &&
+	! tag_exists mytagnorev
+
+fatal: Failed to resolve 'aaaaaaaaaaa' as a valid ref.
+ok 8 - creating a tag for an unknown revision should fail
+
+expecting success of 7004.9 'creating a tag using default HEAD should succeed': 
+	test_config core.logAllRefUpdates true &&
+	test_tick &&
+	echo foo >foo &&
+	git add foo &&
+	git commit -m Foo &&
+	git tag mytag &&
+	test_must_fail git reflog exists refs/tags/mytag
+
+[main (root-commit) 86e17e4] Foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+ok 9 - creating a tag using default HEAD should succeed
+
+expecting success of 7004.10 'creating a tag with --create-reflog should create reflog': 
+	git log -1 \
+		--format="format:tag: tagging %h (%s, %cd)%n" \
+		--date=format:%Y-%m-%d >expected &&
+	test_when_finished "git tag -d tag_with_reflog1" &&
+	git tag --create-reflog tag_with_reflog1 &&
+	git reflog exists refs/tags/tag_with_reflog1 &&
+	test-tool ref-store main for-each-reflog-ent refs/tags/tag_with_reflog1 | sed -e "s/^.*	//" >actual &&
+	test_cmp expected actual
+
+Deleted tag 'tag_with_reflog1' (was 86e17e4)
+ok 10 - creating a tag with --create-reflog should create reflog
+
+expecting success of 7004.11 'annotated tag with --create-reflog has correct message': 
+	git log -1 \
+		--format="format:tag: tagging %h (%s, %cd)%n" \
+		--date=format:%Y-%m-%d >expected &&
+	test_when_finished "git tag -d tag_with_reflog2" &&
+	git tag -m "annotated tag" --create-reflog tag_with_reflog2 &&
+	git reflog exists refs/tags/tag_with_reflog2 &&
+	test-tool ref-store main for-each-reflog-ent refs/tags/tag_with_reflog2 | sed -e "s/^.*	//" >actual &&
+	test_cmp expected actual
+
+Deleted tag 'tag_with_reflog2' (was fcdbddb)
+ok 11 - annotated tag with --create-reflog has correct message
+
+expecting success of 7004.12 '--create-reflog does not create reflog on failure': 
+	test_must_fail git tag --create-reflog mytag &&
+	test_must_fail git reflog exists refs/tags/mytag
+
+fatal: tag 'mytag' already exists
+ok 12 - --create-reflog does not create reflog on failure
+
+expecting success of 7004.13 'option core.logAllRefUpdates=always creates reflog': 
+	test_when_finished "git tag -d tag_with_reflog3" &&
+	test_config core.logAllRefUpdates always &&
+	git tag tag_with_reflog3 &&
+	git reflog exists refs/tags/tag_with_reflog3
+
+Deleted tag 'tag_with_reflog3' (was 86e17e4)
+ok 13 - option core.logAllRefUpdates=always creates reflog
+
+expecting success of 7004.14 'listing all tags if one exists should succeed': 
+	git tag -l &&
+	git tag
+
+mytag
+mytag
+ok 14 - listing all tags if one exists should succeed
+
+expecting success of 7004.15 'Multiple -l or --list options are equivalent to one -l option': 
+	cat >expect <<-\EOF &&
+	mytag
+	EOF
+	git tag -l -l >actual &&
+	test_cmp expect actual &&
+	git tag --list --list >actual &&
+	test_cmp expect actual &&
+	git tag --list -l --list >actual &&
+	test_cmp expect actual
+
+ok 15 - Multiple -l or --list options are equivalent to one -l option
+
+expecting success of 7004.16 'listing all tags if one exists should output that tag': 
+	test $(git tag -l) = mytag &&
+	test $(git tag) = mytag
+
+ok 16 - listing all tags if one exists should output that tag
+
+expecting success of 7004.17 'listing a tag using a matching pattern should succeed': 
+	git tag -l mytag
+
+mytag
+ok 17 - listing a tag using a matching pattern should succeed
+
+expecting success of 7004.18 'listing a tag with --ignore-case': 
+	test $(git tag -l --ignore-case MYTAG) = mytag
+
+ok 18 - listing a tag with --ignore-case
+
+expecting success of 7004.19 'listing a tag using a matching pattern should output that tag': 
+	test $(git tag -l mytag) = mytag
+
+ok 19 - listing a tag using a matching pattern should output that tag
+
+expecting success of 7004.20 'listing tags using a non-matching pattern should succeed': 
+	git tag -l xxx
+
+ok 20 - listing tags using a non-matching pattern should succeed
+
+expecting success of 7004.21 'listing tags using a non-matching pattern should output nothing': 
+	test $(git tag -l xxx | wc -l) -eq 0
+
+ok 21 - listing tags using a non-matching pattern should output nothing
+
+expecting success of 7004.22 'trying to create a tag with the name of one existing should fail': 
+	test_must_fail git tag mytag
+
+fatal: tag 'mytag' already exists
+ok 22 - trying to create a tag with the name of one existing should fail
+
+expecting success of 7004.23 'trying to create a tag with a non-valid name should fail': 
+	test $(git tag -l | wc -l) -eq 1 &&
+	test_must_fail git tag "" &&
+	test_must_fail git tag .othertag &&
+	test_must_fail git tag "other tag" &&
+	test_must_fail git tag "othertag^" &&
+	test_must_fail git tag "other~tag" &&
+	test $(git tag -l | wc -l) -eq 1
+
+fatal: '' is not a valid tag name.
+fatal: '.othertag' is not a valid tag name.
+fatal: 'other tag' is not a valid tag name.
+fatal: 'othertag^' is not a valid tag name.
+fatal: 'other~tag' is not a valid tag name.
+ok 23 - trying to create a tag with a non-valid name should fail
+
+expecting success of 7004.24 'creating a tag using HEAD directly should succeed': 
+	git tag myhead HEAD &&
+	tag_exists myhead
+
+ok 24 - creating a tag using HEAD directly should succeed
+
+expecting success of 7004.25 '--force can create a tag with the name of one existing': 
+	tag_exists mytag &&
+	git tag --force mytag &&
+	tag_exists mytag
+ok 25 - --force can create a tag with the name of one existing
+
+expecting success of 7004.26 '--force is moot with a non-existing tag name': 
+	test_when_finished git tag -d newtag forcetag &&
+	git tag newtag >expect &&
+	git tag --force forcetag >actual &&
+	test_cmp expect actual
+
+Deleted tag 'newtag' (was 86e17e4)
+Deleted tag 'forcetag' (was 86e17e4)
+ok 26 - --force is moot with a non-existing tag name
+
+expecting success of 7004.27 'trying to delete an unknown tag should fail': 
+	! tag_exists unknown-tag &&
+	test_must_fail git tag -d unknown-tag
+
+error: tag 'unknown-tag' not found.
+ok 27 - trying to delete an unknown tag should fail
+
+expecting success of 7004.28 'trying to delete tags without params should succeed and do nothing': 
+	cat >expect <<-\EOF &&
+	myhead
+	mytag
+	EOF
+	git tag -l >actual &&
+	test_cmp expect actual &&
+	git tag -d &&
+	git tag -l >actual &&
+	test_cmp expect actual
+
+ok 28 - trying to delete tags without params should succeed and do nothing
+
+expecting success of 7004.29 'deleting two existing tags in one command should succeed': 
+	tag_exists mytag &&
+	tag_exists myhead &&
+	git tag -d mytag myhead &&
+	! tag_exists mytag &&
+	! tag_exists myhead
+
+Deleted tag 'mytag' (was 86e17e4)
+Deleted tag 'myhead' (was 86e17e4)
+ok 29 - deleting two existing tags in one command should succeed
+
+expecting success of 7004.30 'creating a tag with the name of another deleted one should succeed': 
+	! tag_exists mytag &&
+	git tag mytag &&
+	tag_exists mytag
+
+ok 30 - creating a tag with the name of another deleted one should succeed
+
+expecting success of 7004.31 'trying to delete two tags, existing and not, should fail in the 2nd': 
+	tag_exists mytag &&
+	! tag_exists nonexistingtag &&
+	test_must_fail git tag -d mytag nonexistingtag &&
+	! tag_exists mytag &&
+	! tag_exists nonexistingtag
+
+error: tag 'nonexistingtag' not found.
+Deleted tag 'mytag' (was 86e17e4)
+ok 31 - trying to delete two tags, existing and not, should fail in the 2nd
+
+expecting success of 7004.32 'trying to delete an already deleted tag should fail': 
+	test_must_fail git tag -d mytag
+
+error: tag 'mytag' not found.
+ok 32 - trying to delete an already deleted tag should fail
+
+expecting success of 7004.33 'listing all tags should print them ordered': 
+	cat >expect <<-\EOF &&
+	a1
+	aa1
+	cba
+	t210
+	t211
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	EOF
+	git tag v1.0.1 &&
+	git tag t211 &&
+	git tag aa1 &&
+	git tag v0.2.1 &&
+	git tag v1.1.3 &&
+	git tag cba &&
+	git tag a1 &&
+	git tag v1.0 &&
+	git tag t210 &&
+	git tag -l >actual &&
+	test_cmp expect actual &&
+	git tag >actual &&
+	test_cmp expect actual
+
+ok 33 - listing all tags should print them ordered
+
+expecting success of 7004.34 'listing tags with substring as pattern must print those matching': 
+	cat >expect <<-\EOF &&
+	a1
+	aa1
+	cba
+	EOF
+	rm *a* &&
+	git tag -l "*a*" >current &&
+	test_cmp expect current
+
+ok 34 - listing tags with substring as pattern must print those matching
+
+expecting success of 7004.35 'listing tags with a suffix as pattern must print those matching': 
+	cat >expect <<-\EOF &&
+	v0.2.1
+	v1.0.1
+	EOF
+	git tag -l "*.1" >actual &&
+	test_cmp expect actual
+
+ok 35 - listing tags with a suffix as pattern must print those matching
+
+expecting success of 7004.36 'listing tags with a prefix as pattern must print those matching': 
+	cat >expect <<-\EOF &&
+	t210
+	t211
+	EOF
+	git tag -l "t21*" >actual &&
+	test_cmp expect actual
+
+ok 36 - listing tags with a prefix as pattern must print those matching
+
+expecting success of 7004.37 'listing tags using a name as pattern must print that one matching': 
+	cat >expect <<-\EOF &&
+	a1
+	EOF
+	git tag -l a1 >actual &&
+	test_cmp expect actual
+
+ok 37 - listing tags using a name as pattern must print that one matching
+
+expecting success of 7004.38 'listing tags using a name as pattern must print that one matching': 
+	cat >expect <<-\EOF &&
+	v1.0
+	EOF
+	git tag -l v1.0 >actual &&
+	test_cmp expect actual
+
+ok 38 - listing tags using a name as pattern must print that one matching
+
+expecting success of 7004.39 'listing tags with ? in the pattern should print those matching': 
+	cat >expect <<-\EOF &&
+	v1.0.1
+	v1.1.3
+	EOF
+	git tag -l "v1.?.?" >actual &&
+	test_cmp expect actual
+
+ok 39 - listing tags with ? in the pattern should print those matching
+
+expecting success of 7004.40 'listing tags using v.* should print nothing because none have v.': 
+	git tag -l "v.*" >actual &&
+	test_must_be_empty actual
+
+ok 40 - listing tags using v.* should print nothing because none have v.
+
+expecting success of 7004.41 'listing tags using v* should print only those having v': 
+	cat >expect <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	EOF
+	git tag -l "v*" >actual &&
+	test_cmp expect actual
+
+ok 41 - listing tags using v* should print only those having v
+
+expecting success of 7004.42 'tag -l can accept multiple patterns': 
+	cat >expect <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	EOF
+	git tag -l "v1*" "v0*" >actual &&
+	test_cmp expect actual
+
+ok 42 - tag -l can accept multiple patterns
+
+expecting success of 7004.43 'tag -l <pattern> -l <pattern> works, as our buggy documentation previously suggested': 
+	cat >expect <<-\EOF &&
+	v0.2.1
+	v1.0
+	v1.0.1
+	v1.1.3
+	EOF
+	git tag -l "v1*" -l "v0*" >actual &&
+	test_cmp expect actual
+
+ok 43 - tag -l <pattern> -l <pattern> works, as our buggy documentation previously suggested
+
+expecting success of 7004.44 'listing tags in column': 
+	COLUMNS=41 git tag -l --column=row >actual &&
+	cat >expected <<-\EOF &&
+	a1      aa1     cba     t210    t211
+	v0.2.1  v1.0    v1.0.1  v1.1.3
+	EOF
+	test_cmp expected actual
+
+ok 44 - listing tags in column
+
+expecting success of 7004.45 'listing tags in column with column.*': 
+	test_config column.tag row &&
+	test_config column.ui dense &&
+	COLUMNS=40 git tag -l >actual &&
+	cat >expected <<-\EOF &&
+	a1      aa1   cba     t210    t211
+	v0.2.1  v1.0  v1.0.1  v1.1.3
+	EOF
+	test_cmp expected actual
+
+ok 45 - listing tags in column with column.*
+
+expecting success of 7004.46 'listing tag with -n --column should fail': 
+	test_must_fail git tag --column -n
+
+fatal: options '--column' and '-n' cannot be used together
+ok 46 - listing tag with -n --column should fail
+
+expecting success of 7004.47 'listing tags -n in column with column.ui ignored': 
+	test_config column.ui "row dense" &&
+	COLUMNS=40 git tag -l -n >actual &&
+	cat >expected <<-\EOF &&
+	a1              Foo
+	aa1             Foo
+	cba             Foo
+	t210            Foo
+	t211            Foo
+	v0.2.1          Foo
+	v1.0            Foo
+	v1.0.1          Foo
+	v1.1.3          Foo
+	EOF
+	test_cmp expected actual
+
+ok 47 - listing tags -n in column with column.ui ignored
+
+expecting success of 7004.48 'a non-annotated tag created without parameters should point to HEAD': 
+	git tag non-annotated-tag &&
+	test $(git cat-file -t non-annotated-tag) = commit &&
+	test $(git rev-parse non-annotated-tag) = $(git rev-parse HEAD)
+
+ok 48 - a non-annotated tag created without parameters should point to HEAD
+
+expecting success of 7004.49 'trying to verify an unknown tag should fail': 
+	test_must_fail git tag -v unknown-tag
+
+error: tag 'unknown-tag' not found.
+ok 49 - trying to verify an unknown tag should fail
+
+expecting success of 7004.50 'trying to verify a non-annotated and non-signed tag should fail': 
+	test_must_fail git tag -v non-annotated-tag
+
+error: non-annotated-tag: cannot verify a non-tag object of type commit.
+ok 50 - trying to verify a non-annotated and non-signed tag should fail
+
+expecting success of 7004.51 'trying to verify many non-annotated or unknown tags, should fail': 
+	test_must_fail git tag -v unknown-tag1 non-annotated-tag unknown-tag2
+
+error: tag 'unknown-tag1' not found.
+error: non-annotated-tag: cannot verify a non-tag object of type commit.
+error: tag 'unknown-tag2' not found.
+ok 51 - trying to verify many non-annotated or unknown tags, should fail
+
+expecting success of 7004.52 'creating an annotated tag with -m message should succeed': 
+	commit=$(git rev-parse HEAD) &&
+	time=$test_tick &&
+	get_tag_header annotated-tag $commit commit $time >expect &&
+	echo "A message" >>expect &&
+	git tag -m "A message" annotated-tag &&
+	get_tag_msg annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 52 - creating an annotated tag with -m message should succeed
+
+expecting success of 7004.53 'set up editor': 
+	write_script fakeeditor <<-\EOF
+	sed -e "s/A message/An edited message/g" <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+
+ok 53 - set up editor
+
+expecting success of 7004.54 'creating an annotated tag with -m message --edit should succeed': 
+	get_tag_header annotated-tag-edit $commit commit $time >expect &&
+	echo "An edited message" >>expect &&
+	GIT_EDITOR=./fakeeditor git tag -m "A message" --edit annotated-tag-edit &&
+	get_tag_msg annotated-tag-edit >actual &&
+	test_cmp expect actual
+
+ok 54 - creating an annotated tag with -m message --edit should succeed
+
+expecting success of 7004.55 'creating an annotated tag with -F messagefile should succeed': 
+	cat >msgfile <<-\EOF &&
+	Another message
+	in a file.
+	EOF
+	get_tag_header file-annotated-tag $commit commit $time >expect &&
+	cat msgfile >>expect &&
+	git tag -F msgfile file-annotated-tag &&
+	get_tag_msg file-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 55 - creating an annotated tag with -F messagefile should succeed
+
+expecting success of 7004.56 'set up editor': 
+	write_script fakeeditor <<-\EOF
+	sed -e "s/Another message/Another edited message/g" <"$1" >"$1-"
+	mv "$1-" "$1"
+	EOF
+
+ok 56 - set up editor
+
+expecting success of 7004.57 'creating an annotated tag with -F messagefile --edit should succeed': 
+	get_tag_header file-annotated-tag-edit $commit commit $time >expect &&
+	sed -e "s/Another message/Another edited message/g" msgfile >>expect &&
+	GIT_EDITOR=./fakeeditor git tag -F msgfile --edit file-annotated-tag-edit &&
+	get_tag_msg file-annotated-tag-edit >actual &&
+	test_cmp expect actual
+
+ok 57 - creating an annotated tag with -F messagefile --edit should succeed
+
+expecting success of 7004.58 'creating an annotated tag with -F - should succeed': 
+	cat >inputmsg <<-\EOF &&
+	A message from the
+	standard input
+	EOF
+	get_tag_header stdin-annotated-tag $commit commit $time >expect &&
+	cat inputmsg >>expect &&
+	git tag -F - stdin-annotated-tag <inputmsg &&
+	get_tag_msg stdin-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 58 - creating an annotated tag with -F - should succeed
+
+expecting success of 7004.59 'trying to create a tag with a non-existing -F file should fail': 
+	! test -f nonexistingfile &&
+	! tag_exists notag &&
+	test_must_fail git tag -F nonexistingfile notag &&
+	! tag_exists notag
+
+fatal: could not open or read 'nonexistingfile': No such file or directory
+ok 59 - trying to create a tag with a non-existing -F file should fail
+
+expecting success of 7004.60 'trying to create tags giving both -m or -F options should fail': 
+	echo "message file 1" >msgfile1 &&
+	! tag_exists msgtag &&
+	test_must_fail git tag -m "message 1" -F msgfile1 msgtag &&
+	! tag_exists msgtag &&
+	test_must_fail git tag -F msgfile1 -m "message 1" msgtag &&
+	! tag_exists msgtag &&
+	test_must_fail git tag -m "message 1" -F msgfile1 \
+		-m "message 2" msgtag &&
+	! tag_exists msgtag
+
+fatal: options '-F' and '-m' cannot be used together
+fatal: options '-F' and '-m' cannot be used together
+fatal: options '-F' and '-m' cannot be used together
+ok 60 - trying to create tags giving both -m or -F options should fail
+
+expecting success of 7004.61 'creating a tag with an empty -m message should succeed': 
+	get_tag_header empty-annotated-tag $commit commit $time >expect &&
+	git tag -m "" empty-annotated-tag &&
+	get_tag_msg empty-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 61 - creating a tag with an empty -m message should succeed
+
+expecting success of 7004.62 'creating a tag with an empty -F messagefile should succeed': 
+	>emptyfile &&
+	get_tag_header emptyfile-annotated-tag $commit commit $time >expect &&
+	git tag -F emptyfile emptyfile-annotated-tag &&
+	get_tag_msg emptyfile-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 62 - creating a tag with an empty -F messagefile should succeed
+
+expecting success of 7004.63 'extra blanks in the message for an annotated tag should be removed': 
+	printf "\n\n  \n\t\nLeading blank lines\n" >blanksfile &&
+	printf "\n\t \t  \nRepeated blank lines\n" >>blanksfile &&
+	printf "\n\n\nTrailing spaces      \t  \n" >>blanksfile &&
+	printf "\nTrailing blank lines\n\n\t \n\n" >>blanksfile &&
+	get_tag_header blanks-annotated-tag $commit commit $time >expect &&
+	cat >>expect <<-\EOF &&
+	Leading blank lines
+
+	Repeated blank lines
+
+	Trailing spaces
+
+	Trailing blank lines
+	EOF
+	git tag -F blanksfile blanks-annotated-tag &&
+	get_tag_msg blanks-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 63 - extra blanks in the message for an annotated tag should be removed
+
+expecting success of 7004.64 'creating a tag with blank -m message with spaces should succeed': 
+	get_tag_header blank-annotated-tag $commit commit $time >expect &&
+	git tag -m "     " blank-annotated-tag &&
+	get_tag_msg blank-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 64 - creating a tag with blank -m message with spaces should succeed
+
+expecting success of 7004.65 'creating a tag with blank -F messagefile with spaces should succeed': 
+	echo "     " >blankfile &&
+	echo ""      >>blankfile &&
+	echo "  "    >>blankfile &&
+	get_tag_header blankfile-annotated-tag $commit commit $time >expect &&
+	git tag -F blankfile blankfile-annotated-tag &&
+	get_tag_msg blankfile-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 65 - creating a tag with blank -F messagefile with spaces should succeed
+
+expecting success of 7004.66 'creating a tag with -F file of spaces and no newline should succeed': 
+	printf "      " >blanknonlfile &&
+	get_tag_header blanknonlfile-annotated-tag $commit commit $time >expect &&
+	git tag -F blanknonlfile blanknonlfile-annotated-tag &&
+	get_tag_msg blanknonlfile-annotated-tag >actual &&
+	test_cmp expect actual
+
+ok 66 - creating a tag with -F file of spaces and no newline should succeed
+
+expecting success of 7004.67 'creating a tag using a -F messagefile with #comments should succeed': 
+	cat >commentsfile <<-\EOF &&
+	# A comment
+
+	############
+	The message.
+	############
+	One line.
+
+
+	# commented lines
+	# commented lines
+
+	Another line.
 	# comments
 
 	Last line.
@@ -447592,1860 +449438,6 @@
 1..228
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7102-reset.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7102-reset/.git/
-expecting success of 7102.1 'creating initial files and commits': 
-	test_tick &&
-	echo "1st file" >first &&
-	git add first &&
-	git commit -m "create 1st file" &&
-
-	echo "2nd file" >second &&
-	git add second &&
-	git commit -m "create 2nd file" &&
-
-	echo "2nd line 1st file" >>first &&
-	git commit -a -m "modify 1st file" &&
-	head5p2=$(git rev-parse --verify HEAD) &&
-	head5p2f=$(git rev-parse --short HEAD:first) &&
-
-	git rm first &&
-	git mv second secondfile &&
-	git commit -a -m "remove 1st and rename 2nd" &&
-	head5p1=$(git rev-parse --verify HEAD) &&
-	head5p1s=$(git rev-parse --short HEAD:secondfile) &&
-
-	echo "1st line 2nd file" >secondfile &&
-	echo "2nd line 2nd file" >>secondfile &&
-	# "git commit -m" would break MinGW, as Windows refuse to pass
-	# $test_encoding encoded parameter to git.
-	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
-	head5=$(git rev-parse --verify HEAD) &&
-	head5s=$(git rev-parse --short HEAD:secondfile) &&
-	head5sl=$(git rev-parse HEAD:secondfile)
-
-[main (root-commit) 811bbdf] create 1st file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first
-[main ba22ccd] create 2nd file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second
-[main ddaefe0] modify 1st file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-rm 'first'
-[main d1a4bc3] remove 1st and rename 2nd
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 first
- rename second => secondfile (100%)
-[main eed6733] modify 2nd file (geändert)
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-ok 1 - creating initial files and commits
-
-expecting success of 7102.2 'no 'git reset --no-soft'': 
-		test_when_finished "rm -f err" &&
-		test_must_fail git reset --no-$opt 2>err &&
-		grep "error: unknown option .no-$opt." err
-	
-error: unknown option `no-soft'
-ok 2 - no 'git reset --no-soft'
-
-expecting success of 7102.3 'no 'git reset --no-mixed'': 
-		test_when_finished "rm -f err" &&
-		test_must_fail git reset --no-$opt 2>err &&
-		grep "error: unknown option .no-$opt." err
-	
-error: unknown option `no-mixed'
-ok 3 - no 'git reset --no-mixed'
-
-expecting success of 7102.4 'no 'git reset --no-hard'': 
-		test_when_finished "rm -f err" &&
-		test_must_fail git reset --no-$opt 2>err &&
-		grep "error: unknown option .no-$opt." err
-	
-error: unknown option `no-hard'
-ok 4 - no 'git reset --no-hard'
-
-expecting success of 7102.5 'no 'git reset --no-merge'': 
-		test_when_finished "rm -f err" &&
-		test_must_fail git reset --no-$opt 2>err &&
-		grep "error: unknown option .no-$opt." err
-	
-error: unknown option `no-merge'
-ok 5 - no 'git reset --no-merge'
-
-expecting success of 7102.6 'no 'git reset --no-keep'': 
-		test_when_finished "rm -f err" &&
-		test_must_fail git reset --no-$opt 2>err &&
-		grep "error: unknown option .no-$opt." err
-	
-error: unknown option `no-keep'
-ok 6 - no 'git reset --no-keep'
-
-expecting success of 7102.7 'reset --hard message': 
-	hex=$(git log -1 --format="%h") &&
-	git reset --hard >.actual &&
-	echo HEAD is now at $hex $(commit_msg) >.expected &&
-	test_cmp .expected .actual
-
-ok 7 - reset --hard message
-
-expecting success of 7102.8 'reset --hard message (ISO8859-1 logoutputencoding)': 
-	hex=$(git log -1 --format="%h") &&
-	git -c "i18n.logOutputEncoding=$test_encoding" reset --hard >.actual &&
-	echo HEAD is now at $hex $(commit_msg $test_encoding) >.expected &&
-	test_cmp .expected .actual
-
-ok 8 - reset --hard message (ISO8859-1 logoutputencoding)
-
-expecting success of 7102.9 'giving a non existing revision should fail': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-
-	test_must_fail git reset aaaaaa &&
-	test_must_fail git reset --mixed aaaaaa &&
-	test_must_fail git reset --soft aaaaaa &&
-	test_must_fail git reset --hard aaaaaa &&
-	check_changes $head5
-
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 9 - giving a non existing revision should fail
-
-expecting success of 7102.10 'reset --soft with unmerged index should fail': 
-	touch .git/MERGE_HEAD &&
-	echo "100644 $head5sl 1	un" |
-		git update-index --index-info &&
-	test_must_fail git reset --soft HEAD &&
-	rm .git/MERGE_HEAD &&
-	git rm --cached -- un
-
-fatal: Cannot do a soft reset in the middle of a merge.
-rm 'un'
-ok 10 - reset --soft with unmerged index should fail
-
-expecting success of 7102.11 'giving paths with options different than --mixed should fail': 
-	test_must_fail git reset --soft -- first &&
-	test_must_fail git reset --hard -- first &&
-	test_must_fail git reset --soft HEAD^ -- first &&
-	test_must_fail git reset --hard HEAD^ -- first &&
-	check_changes $head5
-
-fatal: Cannot do soft reset with paths.
-fatal: Cannot do hard reset with paths.
-fatal: Cannot do soft reset with paths.
-fatal: Cannot do hard reset with paths.
-ok 11 - giving paths with options different than --mixed should fail
-
-expecting success of 7102.12 'giving unrecognized options should fail': 
-	test_must_fail git reset --other &&
-	test_must_fail git reset -o &&
-	test_must_fail git reset --mixed --other &&
-	test_must_fail git reset --mixed -o &&
-	test_must_fail git reset --soft --other &&
-	test_must_fail git reset --soft -o &&
-	test_must_fail git reset --hard --other &&
-	test_must_fail git reset --hard -o &&
-	check_changes $head5
-
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
-
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
-
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
-
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
-
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
-
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
-
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
-
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
-
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
-
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
-
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
-
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
-
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
-
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
-
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
-
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
-
-ok 12 - giving unrecognized options should fail
-
-expecting success of 7102.13 'trying to do reset --soft with pending merge should fail': 
-	git branch branch1 &&
-	git branch branch2 &&
-
-	git checkout branch1 &&
-	echo "3rd line in branch1" >>secondfile &&
-	git commit -a -m "change in branch1" &&
-
-	git checkout branch2 &&
-	echo "3rd line in branch2" >>secondfile &&
-	git commit -a -m "change in branch2" &&
-
-	test_must_fail git merge branch1 &&
-	test_must_fail git reset --soft &&
-
-	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
-	git commit -a -m "the change in branch2" &&
-
-	git checkout main &&
-	git branch -D branch1 branch2 &&
-	check_changes $head5
-
-Switched to branch 'branch1'
-[branch1 6b78ea5] change in branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch2'
-[branch2 f8a209f] change in branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Auto-merging secondfile
-CONFLICT (content): Merge conflict in secondfile
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a soft reset in the middle of a merge.
-[branch2 8e8e261] the change in branch2
- Author: A U Thor <author@example.com>
-Switched to branch 'main'
-Deleted branch branch1 (was 6b78ea5).
-Deleted branch branch2 (was 8e8e261).
-ok 13 - trying to do reset --soft with pending merge should fail
-
-expecting success of 7102.14 'trying to do reset --soft with pending checkout merge should fail': 
-	git branch branch3 &&
-	git branch branch4 &&
-
-	git checkout branch3 &&
-	echo "3rd line in branch3" >>secondfile &&
-	git commit -a -m "line in branch3" &&
-
-	git checkout branch4 &&
-	echo "3rd line in branch4" >>secondfile &&
-
-	git checkout -m branch3 &&
-	test_must_fail git reset --soft &&
-
-	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
-	git commit -a -m "the line in branch3" &&
-
-	git checkout main &&
-	git branch -D branch3 branch4 &&
-	check_changes $head5
-
-Switched to branch 'branch3'
-[branch3 0b5021a] line in branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-M	secondfile
-fatal: Cannot do a soft reset in the middle of a merge.
-[branch3 dbe96ed] the line in branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Deleted branch branch3 (was dbe96ed).
-Deleted branch branch4 (was eed6733).
-ok 14 - trying to do reset --soft with pending checkout merge should fail
-
-expecting success of 7102.15 'resetting to HEAD with no changes should succeed and do nothing': 
-	git reset --hard &&
-		check_changes $head5 &&
-	git reset --hard HEAD &&
-		check_changes $head5 &&
-	git reset --soft &&
-		check_changes $head5 &&
-	git reset --soft HEAD &&
-		check_changes $head5 &&
-	git reset --mixed &&
-		check_changes $head5 &&
-	git reset --mixed HEAD &&
-		check_changes $head5 &&
-	git reset &&
-		check_changes $head5 &&
-	git reset HEAD &&
-		check_changes $head5
-
-HEAD is now at eed6733 modify 2nd file (geändert)
-HEAD is now at eed6733 modify 2nd file (geändert)
-ok 15 - resetting to HEAD with no changes should succeed and do nothing
-
-expecting success of 7102.16 '--soft reset only should show changes in diff --cached': 
-	>.diff_expect &&
-	cat >.cached_expect <<-EOF &&
-	diff --git a/secondfile b/secondfile
-	index $head5p1s..$head5s 100644
-	--- a/secondfile
-	+++ b/secondfile
-	@@ -1 +1,2 @@
-	-2nd file
-	+1st line 2nd file
-	+2nd line 2nd file
-	EOF
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-	git reset --soft HEAD^ &&
-	check_changes $head5p1 &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			$head5
-
-ok 16 - --soft reset only should show changes in diff --cached
-
-expecting success of 7102.17 'changing files and redo the last commit should succeed': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	3rd line 2nd file
-	EOF
-	echo "3rd line 2nd file" >>secondfile &&
-	git commit -a -C ORIG_HEAD &&
-	head4=$(git rev-parse --verify HEAD) &&
-	check_changes $head4 &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			$head5
-
-[main b052eb8] modify 2nd file (geändert)
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 3 insertions(+), 1 deletion(-)
-ok 17 - changing files and redo the last commit should succeed
-
-expecting success of 7102.18 '--hard reset should change the files and undo commits permanently': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	first:
-	1st file
-	2nd line 1st file
-	second:
-	2nd file
-	EOF
-	git reset --hard HEAD~2 &&
-	check_changes $head5p2 &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			$head4
-
-HEAD is now at ddaefe0 modify 1st file
-ok 18 - --hard reset should change the files and undo commits permanently
-
-expecting success of 7102.19 'redoing changes adding them without commit them should succeed': 
-	>.diff_expect &&
-	cat >.cached_expect <<-EOF &&
-	diff --git a/first b/first
-	deleted file mode 100644
-	index $head5p2f..0000000
-	--- a/first
-	+++ /dev/null
-	@@ -1,2 +0,0 @@
-	-1st file
-	-2nd line 1st file
-	diff --git a/second b/second
-	deleted file mode 100644
-	index $head5p1s..0000000
-	--- a/second
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-2nd file
-	diff --git a/secondfile b/secondfile
-	new file mode 100644
-	index 0000000..$head5s
-	--- /dev/null
-	+++ b/secondfile
-	@@ -0,0 +1,2 @@
-	+1st line 2nd file
-	+2nd line 2nd file
-	EOF
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-	git rm first &&
-	git mv second secondfile &&
-
-	echo "1st line 2nd file" >secondfile &&
-	echo "2nd line 2nd file" >>secondfile &&
-	git add secondfile &&
-	check_changes $head5p2
-
-rm 'first'
-ok 19 - redoing changes adding them without commit them should succeed
-
-expecting success of 7102.20 '--mixed reset to HEAD should unadd the files': 
-	cat >.diff_expect <<-EOF &&
-	diff --git a/first b/first
-	deleted file mode 100644
-	index $head5p2f..0000000
-	--- a/first
-	+++ /dev/null
-	@@ -1,2 +0,0 @@
-	-1st file
-	-2nd line 1st file
-	diff --git a/second b/second
-	deleted file mode 100644
-	index $head5p1s..0000000
-	--- a/second
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-2nd file
-	EOF
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-	git reset &&
-	check_changes $head5p2 &&
-	test "$(git rev-parse ORIG_HEAD)" = $head5p2
-
-Unstaged changes after reset:
-D	first
-D	second
-ok 20 - --mixed reset to HEAD should unadd the files
-
-expecting success of 7102.21 'redoing the last two commits should succeed': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-	git add secondfile &&
-	git reset --hard $head5p2 &&
-	git rm first &&
-	git mv second secondfile &&
-	git commit -a -m "remove 1st and rename 2nd" &&
-
-	echo "1st line 2nd file" >secondfile &&
-	echo "2nd line 2nd file" >>secondfile &&
-	# "git commit -m" would break MinGW, as Windows refuse to pass
-	# $test_encoding encoded parameter to git.
-	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
-	check_changes $head5
-
-HEAD is now at ddaefe0 modify 1st file
-rm 'first'
-[main d1a4bc3] remove 1st and rename 2nd
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 first
- rename second => secondfile (100%)
-[main eed6733] modify 2nd file (geändert)
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-ok 21 - redoing the last two commits should succeed
-
-expecting success of 7102.22 '--hard reset to HEAD should clear a failed merge': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	3rd line in branch2
-	EOF
-	git branch branch1 &&
-	git branch branch2 &&
-
-	git checkout branch1 &&
-	echo "3rd line in branch1" >>secondfile &&
-	git commit -a -m "change in branch1" &&
-
-	git checkout branch2 &&
-	echo "3rd line in branch2" >>secondfile &&
-	git commit -a -m "change in branch2" &&
-	head3=$(git rev-parse --verify HEAD) &&
-
-	test_must_fail git pull . branch1 &&
-	git reset --hard &&
-	check_changes $head3
-
-Switched to branch 'branch1'
-[branch1 6b78ea5] change in branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch2'
-[branch2 f8a209f] change in branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-From .
- * branch            branch1    -> FETCH_HEAD
-hint: You have divergent branches and need to specify how to reconcile them.
-hint: You can do so by running one of the following commands sometime before
-hint: your next pull:
-hint:
-hint:   git config pull.rebase false  # merge
-hint:   git config pull.rebase true   # rebase
-hint:   git config pull.ff only       # fast-forward only
-hint:
-hint: You can replace "git config" with "git config --global" to set a default
-hint: preference for all repositories. You can also pass --rebase, --no-rebase,
-hint: or --ff-only on the command line to override the configured default per
-hint: invocation.
-fatal: Need to specify how to reconcile divergent branches.
-HEAD is now at f8a209f change in branch2
-ok 22 - --hard reset to HEAD should clear a failed merge
-
-expecting success of 7102.23 '--hard reset to ORIG_HEAD should clear a fast-forward merge': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-	git reset --hard HEAD^ &&
-	check_changes $head5 &&
-
-	git pull . branch1 &&
-	git reset --hard ORIG_HEAD &&
-	check_changes $head5 &&
-
-	git checkout main &&
-	git branch -D branch1 branch2 &&
-	check_changes $head5
-
-HEAD is now at eed6733 modify 2nd file (geändert)
-From .
- * branch            branch1    -> FETCH_HEAD
-Updating eed6733..6b78ea5
-Fast-forward
- secondfile | 1 +
- 1 file changed, 1 insertion(+)
-HEAD is now at eed6733 modify 2nd file (geändert)
-Switched to branch 'main'
-Deleted branch branch1 (was 6b78ea5).
-Deleted branch branch2 (was eed6733).
-ok 23 - --hard reset to ORIG_HEAD should clear a fast-forward merge
-
-expecting success of 7102.24 'test --mixed <paths>': 
-	echo 1 >file1 &&
-	echo 2 >file2 &&
-	git add file1 file2 &&
-	test_tick &&
-	git commit -m files &&
-	before1=$(git rev-parse --short HEAD:file1) &&
-	before2=$(git rev-parse --short HEAD:file2) &&
-	git rm file2 &&
-	echo 3 >file3 &&
-	echo 4 >file4 &&
-	echo 5 >file1 &&
-	after1=$(git rev-parse --short $(git hash-object file1)) &&
-	after4=$(git rev-parse --short $(git hash-object file4)) &&
-	git add file1 file3 file4 &&
-	git reset HEAD -- file1 file2 file3 &&
-	test_must_fail git diff --quiet &&
-	git diff >output &&
-
-	cat >expect <<-EOF &&
-	diff --git a/file1 b/file1
-	index $before1..$after1 100644
-	--- a/file1
-	+++ b/file1
-	@@ -1 +1 @@
-	-1
-	+5
-	diff --git a/file2 b/file2
-	deleted file mode 100644
-	index $before2..0000000
-	--- a/file2
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-2
-	EOF
-
-	test_cmp expect output &&
-	git diff --cached >output &&
-
-	cat >cached_expect <<-EOF &&
-	diff --git a/file4 b/file4
-	new file mode 100644
-	index 0000000..$after4
-	--- /dev/null
-	+++ b/file4
-	@@ -0,0 +1 @@
-	+4
-	EOF
-
-	test_cmp cached_expect output
-
-[main 14b96fb] files
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-rm 'file2'
-Unstaged changes after reset:
-M	file1
-D	file2
-ok 24 - test --mixed <paths>
-
-expecting success of 7102.25 'test resetting the index at give paths': 
-	mkdir sub &&
-	>sub/file1 &&
-	>sub/file2 &&
-	git update-index --add sub/file1 sub/file2 &&
-	T=$(git write-tree) &&
-	git reset HEAD sub/file2 &&
-	test_must_fail git diff --quiet &&
-	U=$(git write-tree) &&
-	echo "$T" &&
-	echo "$U" &&
-	test_must_fail git diff-index --cached --exit-code "$T" &&
-	test "$T" != "$U"
-
-Unstaged changes after reset:
-M	file1
-D	file2
-9571d9b5fb34d9c1274612948c5356f0615744bc
-88880074c0c9957f91fd21817fee120b773fc32c
-:100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D	sub/file2
-ok 25 - test resetting the index at give paths
-
-expecting success of 7102.26 'resetting an unmodified path is a no-op': 
-	git reset --hard &&
-	git reset -- file1 &&
-	git diff-files --exit-code &&
-	git diff-index --cached --exit-code HEAD
-
-HEAD is now at 14b96fb files
-ok 26 - resetting an unmodified path is a no-op
-
-expecting success of 7102.27 '--mixed refreshes the index': 
-	# Verify default behavior (without --[no-]refresh or reset.refresh)
-	test_reset_refreshes_index &&
-
-	# With --quiet
-	test_reset_refreshes_index "" --quiet
-
-HEAD is now at 14b96fb files
-rm 'file2'
-HEAD is now at 14b96fb files
-rm 'file2'
-ok 27 - --mixed refreshes the index
-
-expecting success of 7102.28 '--mixed --[no-]refresh sets refresh behavior': 
-	# Verify that --[no-]refresh controls index refresh
-	test_reset_refreshes_index "" --refresh &&
-	! test_reset_refreshes_index "" --no-refresh
-
-HEAD is now at 14b96fb files
-rm 'file2'
-HEAD is now at 14b96fb files
-rm 'file2'
-'output.log' is not empty, it contains:
-:100644 100644 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 0000000000000000000000000000000000000000 M	file2
-ok 28 - --mixed --[no-]refresh sets refresh behavior
-
-expecting success of 7102.29 '--mixed preserves skip-worktree': 
-	echo 123 >>file2 &&
-	git add file2 &&
-	git update-index --skip-worktree file2 &&
-	git reset --mixed HEAD >output &&
-	test_must_be_empty output &&
-
-	cat >expect <<-\EOF &&
-	Unstaged changes after reset:
-	M	file2
-	EOF
-	git update-index --no-skip-worktree file2 &&
-	git add file2 &&
-	git reset --mixed HEAD >output &&
-	test_cmp expect output
-
-ok 29 - --mixed preserves skip-worktree
-
-expecting success of 7102.30 'resetting specific path that is unmerged': 
-	git rm --cached file2 &&
-	F1=$(git rev-parse HEAD:file1) &&
-	F2=$(git rev-parse HEAD:file2) &&
-	F3=$(git rev-parse HEAD:secondfile) &&
-	{
-		echo "100644 $F1 1	file2" &&
-		echo "100644 $F2 2	file2" &&
-		echo "100644 $F3 3	file2"
-	} | git update-index --index-info &&
-	git ls-files -u &&
-	git reset HEAD file2 &&
-	test_must_fail git diff --quiet &&
-	git diff-index --exit-code --cached HEAD
-
-rm 'file2'
-100644 d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 1	file2
-100644 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 2	file2
-100644 44c5b5884550c17758737edcced463447b91d42b 3	file2
-Unstaged changes after reset:
-M	file2
-ok 30 - resetting specific path that is unmerged
-
-expecting success of 7102.31 'disambiguation (1)': 
-	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	git reset secondfile &&
-	test_must_fail git diff --quiet -- secondfile &&
-	test -z "$(git diff --cached --name-only)" &&
-	test -f secondfile &&
-	test_must_be_empty secondfile
-
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-M	secondfile
-ok 31 - disambiguation (1)
-
-expecting success of 7102.32 'disambiguation (2)': 
-	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	rm -f secondfile &&
-	test_must_fail git reset secondfile &&
-	test -n "$(git diff --cached --name-only -- secondfile)" &&
-	test ! -f secondfile
-
-HEAD is now at 14b96fb files
-fatal: ambiguous argument 'secondfile': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 32 - disambiguation (2)
-
-expecting success of 7102.33 'disambiguation (3)': 
-	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	rm -f secondfile &&
-	git reset HEAD secondfile &&
-	test_must_fail git diff --quiet &&
-	test -z "$(git diff --cached --name-only)" &&
-	test ! -f secondfile
-
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-D	secondfile
-ok 33 - disambiguation (3)
-
-expecting success of 7102.34 'disambiguation (4)': 
-	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	rm -f secondfile &&
-	git reset -- secondfile &&
-	test_must_fail git diff --quiet &&
-	test -z "$(git diff --cached --name-only)" &&
-	test ! -f secondfile
-
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-D	secondfile
-ok 34 - disambiguation (4)
-
-expecting success of 7102.35 'reset with paths accepts tree': 
-	# for simpler tests, drop last commit containing added files
-	git reset --hard HEAD^ &&
-	git reset HEAD^^{tree} -- . &&
-	git diff --cached HEAD^ --exit-code &&
-	git diff HEAD --exit-code
-
-HEAD is now at eed6733 modify 2nd file (geändert)
-Unstaged changes after reset:
-M	secondfile
-ok 35 - reset with paths accepts tree
-
-expecting success of 7102.36 'reset -N keeps removed files as intent-to-add': 
-	echo new-file >new-file &&
-	git add new-file &&
-	git reset -N HEAD &&
-
-	tree=$(git write-tree) &&
-	git ls-tree $tree new-file >actual &&
-	test_must_be_empty actual &&
-
-	git diff --name-only >actual &&
-	echo new-file >expect &&
-	test_cmp expect actual
-
-Unstaged changes after reset:
-A	new-file
-ok 36 - reset -N keeps removed files as intent-to-add
-
-expecting success of 7102.37 'reset --mixed sets up work tree': 
-	git init mixed_worktree &&
-	(
-		cd mixed_worktree &&
-		test_commit dummy
-	) &&
-	git --git-dir=mixed_worktree/.git --work-tree=mixed_worktree reset >actual &&
-	test_must_be_empty actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7102-reset/mixed_worktree/.git/
-[main (root-commit) b737dfa] dummy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dummy.t
-ok 37 - reset --mixed sets up work tree
-
-expecting success of 7102.38 'reset handles --end-of-options': 
-	git update-ref refs/heads/--foo HEAD^ &&
-	git log -1 --format=%s refs/heads/--foo >expect &&
-	git reset --hard --end-of-options --foo &&
-	git log -1 --format=%s HEAD >actual &&
-	test_cmp expect actual
-
-HEAD is now at d1a4bc3 remove 1st and rename 2nd
-ok 38 - reset handles --end-of-options
-
-# passed all 38 test(s)
-1..38
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7301-clean-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7111-reset-table.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7111-reset-table/.git/
 expecting success of 7111.1 'creating initial commits': 
@@ -450492,311 +450484,4998 @@
 M	file1
 ok 39 - check: X U B B --mixed X B B
 
-expecting success of 7111.40 'check: X U B B --hard B B B': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at aa272d3 B
-ok 40 - check: X U B B --hard B B B
+expecting success of 7111.40 'check: X U B B --hard B B B': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at aa272d3 B
+ok 40 - check: X U B B --hard B B B
+
+expecting success of 7111.41 'check: X U B B --merge B B B': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 41 - check: X U B B --merge B B B
+
+expecting success of 7111.42 'check: X U B B --keep XXXXX  ': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 42 - check: X U B B --keep XXXXX  
+
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7402-submodule-rebase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7402-submodule-rebase/.git/
+expecting success of 7402.1 'setup': 
+
+	echo file > file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	git clone . submodule &&
+	git add submodule &&
+	test_tick &&
+	git commit -m submodule &&
+	echo second line >> file &&
+	(cd submodule && git pull) &&
+	test_tick &&
+	git commit -m file-and-submodule -a &&
+	git branch added-submodule
+
+
+[master (root-commit) ffefb50] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'submodule'...
+done.
+warning: adding embedded git repository: submodule
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> submodule
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached submodule
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[master 9bd10db] submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submodule
+From /build/reproducible-path/git-2.47.2/t/trash directory.t7402-submodule-rebase/.
+   ffefb50..9bd10db  master     -> origin/master
+Updating ffefb50..9bd10db
+Fast-forward
+ submodule | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submodule
+[master 041f541] file-and-submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 7402.2 'rebase with a dirty submodule': 
+
+	(cd submodule &&
+	 echo 3rd line >> file &&
+	 test_tick &&
+	 git commit -m fork -a) &&
+	echo unrelated >> file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m unrelated file2 &&
+	echo other line >> file &&
+	test_tick &&
+	git commit -m update file &&
+	CURRENT=$(cd submodule && git rev-parse HEAD) &&
+	EXPECTED=$(git rev-parse HEAD~2:submodule) &&
+	GIT_TRACE=1 git rebase --onto HEAD~2 HEAD^ &&
+	STORED=$(git rev-parse HEAD:submodule) &&
+	test $EXPECTED = $STORED &&
+	test $CURRENT = $(cd submodule && git rev-parse HEAD)
+
+
+[master eb5e1a6] fork
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b5e9d7b] unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[master a65f80c] update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+trace: built-in: git rebase --onto 'HEAD~2' HEAD^
+Rebasing (1/1)
trace: run_command: git notes copy --for-rewrite=rebase
+trace: start_command: /build/reproducible-path/git-2.47.2/git notes copy --for-rewrite=rebase
+trace: built-in: git notes copy --for-rewrite=rebase
+Successfully rebased and updated refs/heads/master.
+ok 2 - rebase with a dirty submodule
+
+expecting success of 7402.3 'interactive rebase with a dirty submodule': 
+
+	echo submodule >expect &&
+	git diff --name-only >actual &&
+	test_cmp expect actual &&
+	HEAD=$(git rev-parse HEAD) &&
+	GIT_EDITOR="\"$(pwd)/fake-editor.sh\"" EDITOR_TEXT="pick $HEAD" \
+		git rebase -i HEAD^ &&
+	echo submodule >expect &&
+	git diff --name-only >actual &&
+	test_cmp expect actual
+
+pick 81a011672801a6d53f73688ebde4d518274102e6
+Successfully rebased and updated refs/heads/master.
+ok 3 - interactive rebase with a dirty submodule
+
+expecting success of 7402.4 'rebase with dirty file and submodule fails': 
+
+	echo yet another line >> file &&
+	test_tick &&
+	git commit -m next file &&
+	echo rewrite > file &&
+	test_tick &&
+	git commit -m rewrite file &&
+	echo dirty > file &&
+	test_must_fail git rebase --onto HEAD~2 HEAD^
+
+
+[master 260764e] next
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 63179b5] rewrite
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+ok 4 - rebase with dirty file and submodule fails
+
+expecting success of 7402.5 'stash with a dirty submodule': 
+
+	echo new > file &&
+	CURRENT=$(cd submodule && git rev-parse HEAD) &&
+	git stash &&
+	test new != $(cat file) &&
+	echo submodule >expect &&
+	git diff --name-only >actual &&
+	test_cmp expect actual &&
+
+	echo "$CURRENT" >expect &&
+	git -C submodule rev-parse HEAD >actual &&
+	test_cmp expect actual &&
+
+	git stash apply &&
+	test new = $(cat file) &&
+	echo "$CURRENT" >expect &&
+	git -C submodule rev-parse HEAD >actual &&
+	test_cmp expect actual
+
+
+Saved working directory and index state WIP on master: 63179b5 rewrite
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   file
+	modified:   submodule (new commits)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	fake-editor.sh
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 5 - stash with a dirty submodule
+
+expecting success of 7402.6 'rebasing submodule that should conflict': 
+	git reset --hard &&
+	git checkout added-submodule &&
+	git add submodule &&
+	test_tick &&
+	git commit -m third &&
+	(
+		cd submodule &&
+		git commit --allow-empty -m extra
+	) &&
+	git add submodule &&
+	test_tick &&
+	git commit -m fourth &&
+
+	test_must_fail git rebase --onto HEAD^^ HEAD^ HEAD^0 2>actual_output &&
+	git ls-files -s submodule >actual &&
+	(
+		cd submodule &&
+		echo "160000 $(git rev-parse HEAD^) 1	submodule" &&
+		echo "160000 $(git rev-parse HEAD^^) 2	submodule" &&
+		echo "160000 $(git rev-parse HEAD) 3	submodule"
+	) >expect &&
+	test_cmp expect actual &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+    then
+		sub_expect="go to submodule (submodule), and either merge commit $(git -C submodule rev-parse --short HEAD^0)" &&
+		grep "$sub_expect" actual_output
+	fi
+
+HEAD is now at 63179b5 rewrite
+Switched to branch 'added-submodule'
+M	submodule
+[added-submodule 3e80a7a] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 7d89a17] extra
+ Author: A U Thor <author@example.com>
+[added-submodule b58fe73] fourth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Failed to merge submodule submodule (commits don't follow merge-base)
+CONFLICT (submodule): Merge conflict in submodule
+hint:  - go to submodule (submodule), and either merge commit 7d89a17
+ok 6 - rebasing submodule that should conflict
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7300-clean.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/.git/
+expecting success of 7300.1 'setup': 
+
+	mkdir -p src &&
+	touch src/part1.c Makefile &&
+	echo build >.gitignore &&
+	echo \*.o >>.gitignore &&
+	git add . &&
+	git commit -m setup &&
+	touch src/part2.c README &&
+	git add .
+
+
+[master (root-commit) c1a48e2] setup
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 Makefile
+ create mode 100644 src/part1.c
+ok 1 - setup
+
+expecting success of 7300.2 'git clean with skip-worktree .gitignore': 
+	git update-index --skip-worktree .gitignore &&
+	rm .gitignore &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so &&
+	git update-index --no-skip-worktree .gitignore &&
+	git checkout .gitignore
+
+Removing a.out
+Removing src/part3.c
+Updated 1 path from the index
+ok 2 - git clean with skip-worktree .gitignore
+
+expecting success of 7300.3 'git clean': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing a.out
+Removing src/part3.c
+ok 3 - git clean
+
+expecting success of 7300.4 'git clean src/': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean src/ &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing src/part3.c
+ok 4 - git clean src/
+
+expecting success of 7300.5 'git clean src/ src/': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean src/ src/ &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing src/part3.c
+ok 5 - git clean src/ src/
+
+expecting success of 7300.6 'git clean with prefix': 
+
+	mkdir -p build docs src/test &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
+	(cd src/ && git clean) &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f src/part3.c &&
+	test -f src/test/1.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing part3.c
+ok 6 - git clean with prefix
+
+expecting success of 7300.7 'git clean with relative prefix': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	would_clean=$(
+		cd docs &&
+		git clean -n ../src |
+		grep part3 |
+		sed -n -e "s|^Would remove ||p"
+	) &&
+	test "$would_clean" = ../src/part3.c
+
+ok 7 - git clean with relative prefix
+
+expecting success of 7300.8 'git clean with absolute path': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	would_clean=$(
+		cd docs &&
+		git clean -n "$(pwd)/../src" |
+		grep part3 |
+		sed -n -e "s|^Would remove ||p"
+	) &&
+	test "$would_clean" = ../src/part3.c
+
+ok 8 - git clean with absolute path
+
+expecting success of 7300.9 'git clean with out of work tree relative path': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	(
+		cd docs &&
+		test_must_fail git clean -n ../..
+	)
+
+fatal: ../..: '../..' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean'
+ok 9 - git clean with out of work tree relative path
+
+expecting success of 7300.10 'git clean with out of work tree absolute path': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	dd=$(cd .. && pwd) &&
+	(
+		cd docs &&
+		test_must_fail git clean -n $dd
+	)
+
+fatal: /build/reproducible-path/git-2.47.2/t: '/build/reproducible-path/git-2.47.2/t' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean'
+ok 10 - git clean with out of work tree absolute path
+
+expecting success of 7300.11 'git clean -d with prefix and path': 
+
+	mkdir -p build docs src/feature &&
+	touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
+	(cd src/ && git clean -d feature/) &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f src/part3.c &&
+	test ! -f src/feature/file.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing feature/
+ok 11 - git clean -d with prefix and path
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 7300.12 'git clean symbolic link': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	ln -s docs/manual.txt src/part4.c &&
+	git clean &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test ! -f src/part4.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing a.out
+Removing src/part3.c
+Removing src/part4.c
+ok 12 - git clean symbolic link
+
+expecting success of 7300.13 'git clean with wildcard': 
+
+	touch a.clean b.clean other.c &&
+	git clean "*.clean" &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.clean &&
+	test ! -f b.clean &&
+	test -f other.c
+
+
+Removing a.clean
+Removing b.clean
+ok 13 - git clean with wildcard
+
+expecting success of 7300.14 'git clean -n': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -n &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Would remove a.out
+Would remove other.c
+Would remove src/part3.c
+ok 14 - git clean -n
+
+expecting success of 7300.15 'git clean -d': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test ! -d docs &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing a.out
+Removing docs/
+Removing other.c
+Removing src/part3.c
+Removing src/test/
+ok 15 - git clean -d
+
+expecting success of 7300.16 'git clean -d src/ examples/': 
+
+	mkdir -p build docs examples &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
+	git clean -d src/ examples/ &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f src/part3.c &&
+	test ! -f examples/1.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing examples/
+Removing src/part3.c
+ok 16 - git clean -d src/ examples/
+
+expecting success of 7300.17 'git clean -x': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -x &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test ! -f obj.o &&
+	test -f build/lib.so
+
+
+Removing a.out
+Removing obj.o
+Removing src/part3.c
+ok 17 - git clean -x
+
+expecting success of 7300.18 'git clean -d -x': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -x &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test ! -d docs &&
+	test ! -f obj.o &&
+	test ! -d build
+
+
+Removing a.out
+Removing build/
+Removing docs/
+Removing obj.o
+Removing src/part3.c
+ok 18 - git clean -d -x
+
+expecting success of 7300.19 'git clean -d -x with ignored tracked directory': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -x -e src &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test -f src/part3.c &&
+	test ! -d docs &&
+	test ! -f obj.o &&
+	test ! -d build
+
+
+Removing a.out
+Removing build/
+Removing docs/
+Removing obj.o
+ok 19 - git clean -d -x with ignored tracked directory
+
+expecting success of 7300.20 'git clean -X': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -X &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test ! -f obj.o &&
+	test -f build/lib.so
+
+
+Removing obj.o
+ok 20 - git clean -X
+
+expecting success of 7300.21 'git clean -d -X': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -X &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test ! -f obj.o &&
+	test ! -d build
+
+
+Removing build/
+Removing obj.o
+ok 21 - git clean -d -X
+
+expecting success of 7300.22 'git clean -d -X with ignored tracked directory': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -X -e src &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test ! -f obj.o &&
+	test ! -d build
+
+
+Removing build/
+Removing obj.o
+Removing src/part3.c
+ok 22 - git clean -d -X with ignored tracked directory
+
+expecting success of 7300.23 'clean.requireForce defaults to true': 
+
+	git config --unset clean.requireForce &&
+	test_must_fail git clean
+
+
+fatal: clean.requireForce is true and -f not given: refusing to clean
+ok 23 - clean.requireForce defaults to true
+
+expecting success of 7300.24 'clean.requireForce': 
+
+	git config clean.requireForce true &&
+	test_must_fail git clean
+
+
+fatal: clean.requireForce is true and -f not given: refusing to clean
+ok 24 - clean.requireForce
+
+expecting success of 7300.25 'clean.requireForce and -n': 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -n &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Would remove a.out
+Would remove src/part3.c
+ok 25 - clean.requireForce and -n
+
+expecting success of 7300.26 'clean.requireForce and -f': 
+
+	git clean -f &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing a.out
+Removing src/part3.c
+ok 26 - clean.requireForce and -f
+
+expecting success of 7300.27 'clean.requireForce and --interactive': 
+	git clean --interactive </dev/null >output 2>error &&
+	test_grep ! "requireForce is true and" error &&
+	test_grep "\*\*\* Commands \*\*\*" output
+
+*** Commands ***
+ok 27 - clean.requireForce and --interactive
+
+expecting success of 7300.28 'core.excludesfile': 
+
+	echo excludes >excludes &&
+	echo included >included &&
+	git config core.excludesfile excludes &&
+	output=$(git clean -n excludes included 2>&1) &&
+	expr "$output" : ".*included" >/dev/null &&
+	! expr "$output" : ".*excludes" >/dev/null
+
+
+ok 28 - core.excludesfile
+
+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 7300.29 'removal failure': 
+
+	mkdir foo &&
+	touch foo/bar &&
+	test_when_finished "chmod 755 foo" &&
+	(exec <foo/bar &&
+	 chmod 0 foo &&
+	 test_must_fail git clean -f -d)
+
+warning: could not open directory 'foo/': Permission denied
+warning: failed to remove foo/: Directory not empty
+Removing docs/
+Removing error
+Removing included
+Removing output
+ok 29 - removal failure
+
+expecting success of 7300.30 'nested git work tree': 
+	rm -fr foo bar baz &&
+	mkdir -p foo bar baz/boo &&
+	(
+		cd foo &&
+		git init &&
+		test_commit nested hello.world
+	) &&
+	(
+		cd bar &&
+		>goodbye.people
+	) &&
+	(
+		cd baz/boo &&
+		git init &&
+		test_commit deeply.nested deeper.world
+	) &&
+	git clean -f -d &&
+	test -f foo/.git/index &&
+	test -f foo/hello.world &&
+	test -f baz/boo/.git/index &&
+	test -f baz/boo/deeper.world &&
+	! test -d bar
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/foo/.git/
+[master (root-commit) abd8674] nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/baz/boo/.git/
+[master (root-commit) 3f7f1fc] deeply.nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deeper.world
+Removing bar/
+Skipping repository baz/boo
+ok 30 - nested git work tree
+
+expecting success of 7300.31 'should clean things that almost look like git but are not': 
+	rm -fr almost_git almost_bare_git almost_submodule &&
+	mkdir -p almost_git/.git/objects &&
+	mkdir -p almost_git/.git/refs &&
+	cat >almost_git/.git/HEAD <<-\EOF &&
+	garbage
+	EOF
+	cp -r almost_git/.git/ almost_bare_git &&
+	mkdir almost_submodule/ &&
+	cat >almost_submodule/.git <<-\EOF &&
+	garbage
+	EOF
+	test_when_finished "rm -rf almost_*" &&
+	git clean -f -d &&
+	test_path_is_missing almost_git &&
+	test_path_is_missing almost_bare_git &&
+	test_path_is_missing almost_submodule
+
+Removing almost_bare_git/
+Removing almost_git/
+Removing almost_submodule/
+Skipping repository baz/boo
+ok 31 - should clean things that almost look like git but are not
+
+expecting success of 7300.32 'should not clean submodules': 
+	rm -fr repo to_clean sub1 sub2 &&
+	mkdir repo to_clean &&
+	(
+		cd repo &&
+		git init &&
+		test_commit msg hello.world
+	) &&
+	test_config_global protocol.file.allow always &&
+	git submodule add ./repo/.git sub1 &&
+	git commit -m "sub1" &&
+	git branch before_sub2 &&
+	git submodule add ./repo/.git sub2 &&
+	git commit -m "sub2" &&
+	git checkout before_sub2 &&
+	>to_clean/should_clean.this &&
+	git clean -f -d &&
+	test_path_is_file repo/.git/index &&
+	test_path_is_file repo/hello.world &&
+	test_path_is_file sub1/.git &&
+	test_path_is_file sub1/hello.world &&
+	test_path_is_file sub2/.git &&
+	test_path_is_file sub2/hello.world &&
+	test_path_is_missing to_clean
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 1af9d3b] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/sub1'...
+done.
+[master a5d0902] sub1
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 README
+ create mode 100644 src/part2.c
+ create mode 160000 sub1
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/sub2'...
+done.
+[master 8525980] sub2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub2
+warning: unable to rmdir 'sub2': Directory not empty
+Switched to branch 'before_sub2'
+Removing .gitconfig
+Skipping repository baz/boo
+Removing to_clean/
+ok 32 - should not clean submodules
+
+expecting success of 7300.33 'should avoid cleaning possible submodules': 
+	rm -fr to_clean possible_sub1 &&
+	mkdir to_clean possible_sub1 &&
+	test_when_finished "rm -rf possible_sub*" &&
+	echo "gitdir: foo" >possible_sub1/.git &&
+	>possible_sub1/hello.world &&
+	chmod 0 possible_sub1/.git &&
+	>to_clean/should_clean.this &&
+	git clean -f -d &&
+	test_path_is_file possible_sub1/.git &&
+	test_path_is_file possible_sub1/hello.world &&
+	test_path_is_missing to_clean
+
+Skipping repository baz/boo
+Removing to_clean/
+ok 33 - should avoid cleaning possible submodules
+
+expecting success of 7300.34 'nested (empty) git should be kept': 
+	rm -fr empty_repo to_clean &&
+	git init empty_repo &&
+	mkdir to_clean &&
+	>to_clean/should_clean.this &&
+	# Note that we put the expect file in the .git directory so that it
+	# does not get cleaned.
+	find empty_repo | sort >.git/expect &&
+	git clean -f -d &&
+	find empty_repo | sort >actual &&
+	test_cmp .git/expect actual &&
+	test_path_is_missing to_clean
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/empty_repo/.git/
+Skipping repository baz/boo
+Removing to_clean/
+ok 34 - nested (empty) git should be kept
+
+expecting success of 7300.35 'nested bare repositories should be cleaned': 
+	rm -fr bare1 bare2 subdir &&
+	git init --bare bare1 &&
+	git clone --local --bare . bare2 &&
+	mkdir subdir &&
+	cp -r bare2 subdir/bare3 &&
+	git clean -f -d &&
+	test_path_is_missing bare1 &&
+	test_path_is_missing bare2 &&
+	test_path_is_missing subdir
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/bare1/
+Cloning into bare repository 'bare2'...
+done.
+Removing actual
+Removing bare1/
+Removing bare2/
+Skipping repository baz/boo
+Removing subdir/
+ok 35 - nested bare repositories should be cleaned
+
+checking known breakage of 7300.36 'nested (empty) bare repositories should be cleaned even when in .git': 
+	rm -fr strange_bare &&
+	mkdir strange_bare &&
+	git init --bare strange_bare/.git &&
+	git clean -f -d &&
+	test_path_is_missing strange_bare
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/strange_bare/.git/
+Skipping repository baz/boo
+Path exists:
+drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 30 02:16 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': 
+	rm -fr strange_bare &&
+	mkdir strange_bare &&
+	git clone --local --bare . strange_bare/.git &&
+	git clean -f -d &&
+	test_path_is_missing strange_bare
+
+Cloning into bare repository 'strange_bare/.git'...
+done.
+Skipping repository baz/boo
+Path exists:
+drwxr-xr-x 3 pbuilder2 pbuilder2 60 Jan 30 02:16 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': 
+	rm -fr repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		mkdir -p bar/baz &&
+		test_commit msg bar/baz/hello.world
+	) &&
+	find repo | sort >expect &&
+	git clean -f -d repo/bar/baz &&
+	find repo | sort >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 14dba50] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar/baz/hello.world
+ok 38 - giving path in nested git work tree will NOT remove it
+
+expecting success of 7300.39 'giving path to nested .git will not remove it': 
+	rm -fr repo &&
+	mkdir repo untracked &&
+	(
+		cd repo &&
+		git init &&
+		test_commit msg hello.world
+	) &&
+	find repo | sort >expect &&
+	git clean -f -d repo/.git &&
+	find repo | sort >actual &&
+	test_cmp expect actual &&
+	test_path_is_dir untracked/
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 1af9d3b] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+ok 39 - giving path to nested .git will not remove it
+
+expecting success of 7300.40 'giving path to nested .git/ will NOT remove contents': 
+	rm -fr repo untracked &&
+	mkdir repo untracked &&
+	(
+		cd repo &&
+		git init &&
+		test_commit msg hello.world
+	) &&
+	find repo | sort >expect &&
+	git clean -f -d repo/.git/ &&
+	find repo | sort >actual &&
+	test_cmp expect actual &&
+	test_path_is_dir untracked/
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 1af9d3b] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+ok 40 - giving path to nested .git/ will NOT remove contents
+
+expecting success of 7300.41 'force removal of nested git work tree': 
+	rm -fr foo bar baz &&
+	mkdir -p foo bar baz/boo &&
+	(
+		cd foo &&
+		git init &&
+		test_commit nested hello.world
+	) &&
+	(
+		cd bar &&
+		>goodbye.people
+	) &&
+	(
+		cd baz/boo &&
+		git init &&
+		test_commit deeply.nested deeper.world
+	) &&
+	git clean -f -f -d &&
+	! test -d foo &&
+	! test -d bar &&
+	! test -d baz
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/foo/.git/
+[master (root-commit) abd8674] nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/baz/boo/.git/
+[master (root-commit) 3f7f1fc] deeply.nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deeper.world
+Removing actual
+Removing bar/
+Removing baz/
+Removing empty_repo/
+Removing expect
+Removing foo/
+Removing repo/
+Removing strange_bare/
+Removing sub2/
+Removing untracked/
+ok 41 - force removal of nested git work tree
+
+expecting success of 7300.42 'git clean -e': 
+	rm -fr repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		touch known 1 2 3 &&
+		git add known &&
+		git clean -f -e 1 -e 2 &&
+		test -e 1 &&
+		test -e 2 &&
+		! (test -e 3) &&
+		test -e known
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/repo/.git/
+Removing 3
+ok 42 - git clean -e
+
+expecting success of 7300.43 'git clean -d with an unreadable empty directory': 
+	mkdir foo &&
+	chmod a= foo &&
+	git clean -dfx foo &&
+	! test -d foo
+
+warning: could not open directory 'foo/': Permission denied
+Removing foo/
+ok 43 - git clean -d with an unreadable empty directory
+
+expecting success of 7300.44 'git clean -d respects pathspecs (dir is prefix of pathspec)': 
+	mkdir -p foo &&
+	mkdir -p foobar &&
+	git clean -df foobar &&
+	test_path_is_dir foo &&
+	test_path_is_missing foobar
+
+Removing foobar/
+ok 44 - git clean -d respects pathspecs (dir is prefix of pathspec)
+
+expecting success of 7300.45 'git clean -d respects pathspecs (pathspec is prefix of dir)': 
+	mkdir -p foo &&
+	mkdir -p foobar &&
+	git clean -df foo &&
+	test_path_is_missing foo &&
+	test_path_is_dir foobar
+
+Removing foo/
+ok 45 - git clean -d respects pathspecs (pathspec is prefix of dir)
+
+expecting success of 7300.46 'git clean -d skips untracked dirs containing ignored files': 
+	echo /foo/bar >.gitignore &&
+	echo ignoreme >>.gitignore &&
+	rm -rf foo &&
+	mkdir -p foo/a/aa/aaa foo/b/bb/bbb &&
+	touch foo/bar foo/baz foo/a/aa/ignoreme foo/b/ignoreme foo/b/bb/1 foo/b/bb/2 &&
+	git clean -df &&
+	test_path_is_dir foo &&
+	test_path_is_file foo/bar &&
+	test_path_is_missing foo/baz &&
+	test_path_is_file foo/a/aa/ignoreme &&
+	test_path_is_missing foo/a/aa/aaa &&
+	test_path_is_file foo/b/ignoreme &&
+	test_path_is_missing foo/b/bb
+
+Removing build/
+Removing foo/a/aa/aaa/
+Removing foo/b/bb/
+Removing foo/baz
+Removing foobar/
+Removing obj.o
+ok 46 - git clean -d skips untracked dirs containing ignored files
+
+expecting success of 7300.47 'git clean -d skips nested repo containing ignored files': 
+	test_when_finished "rm -rf nested-repo-with-ignored-file" &&
+
+	git init nested-repo-with-ignored-file &&
+	(
+		cd nested-repo-with-ignored-file &&
+		>file &&
+		git add file &&
+		git commit -m Initial &&
+
+		# This file is ignored by a .gitignore rule in the outer repo
+		# added in the previous test.
+		>ignoreme
+	) &&
+
+	git clean -fd &&
+
+	test_path_is_file nested-repo-with-ignored-file/.git/index &&
+	test_path_is_file nested-repo-with-ignored-file/ignoreme &&
+	test_path_is_file nested-repo-with-ignored-file/file
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/nested-repo-with-ignored-file/.git/
+[master (root-commit) 4208a61] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+ok 47 - git clean -d skips nested repo containing ignored files
+
+expecting success of 7300.48 'git clean handles being told what to clean': 
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -f */ut &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
+
+Removing d1/ut
+Removing d2/ut
+ok 48 - git clean handles being told what to clean
+
+expecting success of 7300.49 'git clean handles being told what to clean, with -d': 
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -ffd */ut &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
+
+Removing d1/ut
+Removing d2/ut
+ok 49 - git clean handles being told what to clean, with -d
+
+expecting success of 7300.50 'git clean works if a glob is passed without -d': 
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -f "*ut" &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
+
+Removing d1/ut
+Removing d2/ut
+ok 50 - git clean works if a glob is passed without -d
+
+expecting success of 7300.51 'git clean works if a glob is passed with -d': 
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -ffd "*ut" &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
+
+Removing d1/ut
+Removing d2/ut
+ok 51 - git clean works if a glob is passed with -d
+
+ok 52 # skip handle clean & core.longpaths = false nicely (missing MINGW)
+
+expecting success of 7300.53 'clean untracked paths by pathspec': 
+	git init untracked &&
+	mkdir untracked/dir &&
+	echo >untracked/dir/file.txt &&
+	git -C untracked clean -f dir/file.txt &&
+	ls untracked/dir >actual &&
+	test_must_be_empty actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/untracked/.git/
+Removing dir/file.txt
+ok 53 - clean untracked paths by pathspec
+
+expecting success of 7300.54 'avoid traversing into ignored directories': 
+	test_when_finished rm -f output error trace.* &&
+	test_create_repo avoid-traversing-deep-hierarchy &&
+	(
+		cd avoid-traversing-deep-hierarchy &&
+
+		mkdir -p untracked/subdir/with/a &&
+		>untracked/subdir/with/a/random-file.txt &&
+
+		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+		git clean -ffdxn -e untracked
+	) &&
+
+	# Make sure we only visited into the top-level directory, and did
+	# not traverse into the "untracked" subdirectory since it was excluded
+	grep data.*read_directo.*directories-visited trace.output |
+		cut -d "|" -f 9 >trace.relevant &&
+	cat >trace.expect <<-EOF &&
+	 ..directories-visited:1
+	EOF
+	test_cmp trace.expect trace.relevant
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/avoid-traversing-deep-hierarchy/.git/
+ok 54 - avoid traversing into ignored directories
+
+expecting success of 7300.55 'traverse into directories that may have ignored entries': 
+	test_when_finished rm -f output &&
+	test_create_repo need-to-traverse-into-hierarchy &&
+	(
+		cd need-to-traverse-into-hierarchy &&
+		mkdir -p modules/foobar/src/generated &&
+		> modules/foobar/src/generated/code.c &&
+		> modules/foobar/Makefile &&
+		echo "/modules/**/src/generated/" >.gitignore &&
+
+		git clean -fX modules/foobar >../output &&
+
+		grep Removing ../output &&
+
+		test_path_is_missing modules/foobar/src/generated/code.c &&
+		test_path_is_file modules/foobar/Makefile
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/need-to-traverse-into-hierarchy/.git/
+Removing modules/foobar/src/
+ok 55 - traverse into directories that may have ignored entries
+
+# still have 2 known breakage(s)
+# passed all remaining 53 test(s)
+1..55
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7006-pager.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7006-pager/.git/
+expecting success of 7006.1 'determine default pager': 
+	test_might_fail git config --unset core.pager &&
+	less=$(
+		sane_unset PAGER GIT_PAGER &&
+		git var GIT_PAGER
+	) &&
+	test -n "$less"
+
+ok 1 - determine default pager
+
+expecting success of 7006.2 'setup': 
+	sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
+	test_unconfig core.pager &&
+
+	PAGER="cat >paginated.out" &&
+	export PAGER &&
+
+	test_commit initial
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 2 - setup
+
+checking prerequisite: TTY
+
+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 7006.3 'some commands use a pager': 
+	rm -f paginated.out &&
+	test_terminal git log &&
+	test_path_is_file paginated.out
+
+ok 3 - some commands use a pager
+
+checking known breakage of 7006.4 'pager runs from subdir': 
+	echo subdir/paginated.out >expected &&
+	mkdir -p subdir &&
+	rm -f paginated.out subdir/paginated.out &&
+	(
+		cd subdir &&
+		test_terminal git log
+	) &&
+	{
+		ls paginated.out subdir/paginated.out ||
+		:
+	} >actual &&
+	test_cmp expected actual
+
+ls: cannot access 'subdir/paginated.out': No such file or directory
+--- expected	2025-01-30 02:15:37.861497216 +0000
++++ actual	2025-01-30 02:15:38.137498871 +0000
+@@ -1 +1 @@
+-subdir/paginated.out
++paginated.out
+not ok 4 - pager runs from subdir # TODO known breakage
+
+expecting success of 7006.5 'LESS and LV envvars are set for pagination': 
+	(
+		sane_unset LESS LV &&
+		PAGER="env >pager-env.out; wc" &&
+		export PAGER &&
+
+		test_terminal git log
+	) &&
+	grep ^LESS= pager-env.out &&
+	grep ^LV= pager-env.out
+
+      5      20     248
+LESS=FRX
+LV=-c
+ok 5 - LESS and LV envvars are set for pagination
+
+expecting success of 7006.6 'LESS and LV envvars set by git-sh-setup': 
+	(
+		sane_unset LESS LV &&
+		PAGER="env >pager-env.out; wc" &&
+		export PAGER &&
+		PATH="$(git --exec-path):$PATH" &&
+		export PATH &&
+		test_terminal sh -c ". git-sh-setup && git_pager"
+	) &&
+	grep ^LESS= pager-env.out &&
+	grep ^LV= pager-env.out
+
+      0       0       0
+LESS=FRX
+LV=-c
+ok 6 - LESS and LV envvars set by git-sh-setup
+
+expecting success of 7006.7 'some commands do not use a pager': 
+	rm -f paginated.out &&
+	test_terminal git rev-list HEAD &&
+	test_path_is_missing paginated.out
+
+24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+ok 7 - some commands do not use a pager
+
+expecting success of 7006.8 'no pager when stdout is a pipe': 
+	rm -f paginated.out &&
+	git log | cat &&
+	test_path_is_missing paginated.out
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 8 - no pager when stdout is a pipe
+
+expecting success of 7006.9 'no pager when stdout is a regular file': 
+	rm -f paginated.out &&
+	git log >file &&
+	test_path_is_missing paginated.out
+
+ok 9 - no pager when stdout is a regular file
+
+expecting success of 7006.10 'git --paginate rev-list uses a pager': 
+	rm -f paginated.out &&
+	test_terminal git --paginate rev-list HEAD &&
+	test_path_is_file paginated.out
+
+ok 10 - git --paginate rev-list uses a pager
+
+expecting success of 7006.11 'no pager even with --paginate when stdout is a pipe': 
+	rm -f file paginated.out &&
+	git --paginate log | cat &&
+	test_path_is_missing paginated.out
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 11 - no pager even with --paginate when stdout is a pipe
+
+expecting success of 7006.12 'no pager with --no-pager': 
+	rm -f paginated.out &&
+	test_terminal git --no-pager log &&
+	test_path_is_missing paginated.out
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380 (HEAD -> master, tag: initial)
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 12 - no pager with --no-pager
+
+expecting success of 7006.13 'configuration can disable pager': 
+	rm -f paginated.out &&
+	test_unconfig pager.grep &&
+	test_terminal git grep initial &&
+	test_path_is_file paginated.out &&
+
+	rm -f paginated.out &&
+	test_config pager.grep false &&
+	test_terminal git grep initial &&
+	test_path_is_missing paginated.out
+
+initial.t:initial
+ok 13 - configuration can disable pager
+
+expecting success of 7006.14 'configuration can enable pager (from subdir)': 
+	rm -f paginated.out &&
+	mkdir -p subdir &&
+	test_config pager.bundle true &&
+
+	git bundle create test.bundle --all &&
+	rm -f paginated.out subdir/paginated.out &&
+	(
+		cd subdir &&
+		test_terminal git bundle unbundle ../test.bundle
+	) &&
+	{
+		test_path_is_file paginated.out ||
+		test_path_is_file subdir/paginated.out
+	}
+
+ok 14 - configuration can enable pager (from subdir)
+
+expecting success of 7006.15 'git tag -l defaults to paging': 
+	rm -f paginated.out &&
+	test_terminal git tag -l &&
+	test_path_is_file paginated.out
+
+ok 15 - git tag -l defaults to paging
+
+expecting success of 7006.16 'git tag -l respects pager.tag': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag=false tag -l &&
+	test_path_is_missing paginated.out
+
+initial
+ok 16 - git tag -l respects pager.tag
+
+expecting success of 7006.17 'git tag -l respects --no-pager': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag --no-pager tag -l &&
+	test_path_is_missing paginated.out
+
+initial
+ok 17 - git tag -l respects --no-pager
+
+expecting success of 7006.18 'git tag with no args defaults to paging': 
+	# no args implies -l so this should page like -l
+	rm -f paginated.out &&
+	test_terminal git tag &&
+	test_path_is_file paginated.out
+
+ok 18 - git tag with no args defaults to paging
+
+expecting success of 7006.19 'git tag with no args respects pager.tag': 
+	# no args implies -l so this should page like -l
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag=false tag &&
+	test_path_is_missing paginated.out
+
+initial
+ok 19 - git tag with no args respects pager.tag
+
+expecting success of 7006.20 'git tag --contains defaults to paging': 
+	# --contains implies -l so this should page like -l
+	rm -f paginated.out &&
+	test_terminal git tag --contains &&
+	test_path_is_file paginated.out
+
+ok 20 - git tag --contains defaults to paging
+
+expecting success of 7006.21 'git tag --contains respects pager.tag': 
+	# --contains implies -l so this should page like -l
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag=false tag --contains &&
+	test_path_is_missing paginated.out
+
+initial
+ok 21 - git tag --contains respects pager.tag
+
+expecting success of 7006.22 'git tag -a defaults to not paging': 
+	test_when_finished "git tag -d newtag" &&
+	rm -f paginated.out &&
+	test_terminal git tag -am message newtag &&
+	test_path_is_missing paginated.out
+
+Deleted tag 'newtag' (was a052248)
+ok 22 - git tag -a defaults to not paging
+
+expecting success of 7006.23 'git tag -a ignores pager.tag': 
+	test_when_finished "git tag -d newtag" &&
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag tag -am message newtag &&
+	test_path_is_missing paginated.out
+
+Deleted tag 'newtag' (was a052248)
+ok 23 - git tag -a ignores pager.tag
+
+expecting success of 7006.24 'git tag -a respects --paginate': 
+	test_when_finished "git tag -d newtag" &&
+	rm -f paginated.out &&
+	test_terminal git --paginate tag -am message newtag &&
+	test_path_is_file paginated.out
+
+Deleted tag 'newtag' (was a052248)
+ok 24 - git tag -a respects --paginate
+
+expecting success of 7006.25 'git tag as alias ignores pager.tag with -a': 
+	test_when_finished "git tag -d newtag" &&
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag -c alias.t=tag t -am message newtag &&
+	test_path_is_missing paginated.out
+
+Deleted tag 'newtag' (was a052248)
+ok 25 - git tag as alias ignores pager.tag with -a
+
+expecting success of 7006.26 'git tag as alias respects pager.tag with -l': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag=false -c alias.t=tag t -l &&
+	test_path_is_missing paginated.out
+
+initial
+ok 26 - git tag as alias respects pager.tag with -l
+
+expecting success of 7006.27 'git branch defaults to paging': 
+	rm -f paginated.out &&
+	test_terminal git branch &&
+	test_path_is_file paginated.out
+
+ok 27 - git branch defaults to paging
+
+expecting success of 7006.28 'git branch respects pager.branch': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.branch=false branch &&
+	test_path_is_missing paginated.out
+
+* master
+ok 28 - git branch respects pager.branch
+
+expecting success of 7006.29 'git branch respects --no-pager': 
+	rm -f paginated.out &&
+	test_terminal git --no-pager branch &&
+	test_path_is_missing paginated.out
+
+* master
+ok 29 - git branch respects --no-pager
+
+expecting success of 7006.30 'git branch --edit-description ignores pager.branch': 
+	rm -f paginated.out editor.used &&
+	write_script editor <<-\EOF &&
+		echo "New description" >"$1"
+		touch editor.used
+	EOF
+	EDITOR=./editor test_terminal git -c pager.branch branch --edit-description &&
+	test_path_is_missing paginated.out &&
+	test_path_is_file editor.used
+
+hint: Waiting for your editor to close the file... 
ok 30 - git branch --edit-description ignores pager.branch
+
+expecting success of 7006.31 'git branch --set-upstream-to ignores pager.branch': 
+	rm -f paginated.out &&
+	git branch other &&
+	test_when_finished "git branch -D other" &&
+	test_terminal git -c pager.branch branch --set-upstream-to=other &&
+	test_when_finished "git branch --unset-upstream" &&
+	test_path_is_missing paginated.out
+
+branch 'master' set up to track 'other'.
+Deleted branch other (was 24b24cf).
+ok 31 - git branch --set-upstream-to ignores pager.branch
+
+expecting success of 7006.32 'git config ignores pager.config when setting': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.config config foo.bar bar &&
+	test_path_is_missing paginated.out
+
+ok 32 - git config ignores pager.config when setting
+
+expecting success of 7006.33 'git config --edit ignores pager.config': 
+	rm -f paginated.out editor.used &&
+	write_script editor <<-\EOF &&
+		touch editor.used
+	EOF
+	EDITOR=./editor test_terminal git -c pager.config config --edit &&
+	test_path_is_missing paginated.out &&
+	test_path_is_file editor.used
+
+hint: Waiting for your editor to close the file... 
ok 33 - git config --edit ignores pager.config
+
+expecting success of 7006.34 'git config --get ignores pager.config': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.config config --get foo.bar &&
+	test_path_is_missing paginated.out
+
+bar
+ok 34 - git config --get ignores pager.config
+
+expecting success of 7006.35 'git config --get-urlmatch defaults to paging': 
+	rm -f paginated.out &&
+	test_terminal git -c http."https://foo.com/".bar=foo \
+			  config --get-urlmatch http https://foo.com &&
+	test_path_is_file paginated.out
+
+ok 35 - git config --get-urlmatch defaults to paging
+
+expecting success of 7006.36 'git config --get-all respects pager.config': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.config=false config --get-all foo.bar &&
+	test_path_is_missing paginated.out
+
+bar
+ok 36 - git config --get-all respects pager.config
+
+expecting success of 7006.37 'git config --list defaults to paging': 
+	rm -f paginated.out &&
+	test_terminal git config --list &&
+	test_path_is_file paginated.out
+
+ok 37 - git config --list defaults to paging
+
+expecting success of 7006.38 'tests can detect color': 
+	rm -f colorful.log colorless.log &&
+	git log --no-color >colorless.log &&
+	git log --color >colorful.log &&
+	! colorful colorless.log &&
+	colorful colorful.log
+
+ok 38 - tests can detect color
+
+expecting success of 7006.39 'no color when stdout is a regular file': 
+	rm -f colorless.log &&
+	test_config color.ui auto &&
+	git log >colorless.log &&
+	! colorful colorless.log
+
+ok 39 - no color when stdout is a regular file
+
+expecting success of 7006.40 'color when writing to a pager': 
+	rm -f paginated.out &&
+	test_config color.ui auto &&
+	test_terminal git log &&
+	colorful paginated.out
+
+ok 40 - color when writing to a pager
+
+expecting success of 7006.41 'colors are suppressed by color.pager': 
+	rm -f paginated.out &&
+	test_config color.ui auto &&
+	test_config color.pager false &&
+	test_terminal git log &&
+	! colorful paginated.out
+
+ok 41 - colors are suppressed by color.pager
+
+expecting success of 7006.42 'color when writing to a file intended for a pager': 
+	rm -f colorful.log &&
+	test_config color.ui auto &&
+	(
+		TERM=vt100 &&
+		GIT_PAGER_IN_USE=true &&
+		export TERM GIT_PAGER_IN_USE &&
+		git log >colorful.log
+	) &&
+	colorful colorful.log
+
+ok 42 - color when writing to a file intended for a pager
+
+expecting success of 7006.43 'colors are sent to pager for external commands': 
+	test_config alias.externallog "!git log" &&
+	test_config color.ui auto &&
+	test_terminal git -p externallog &&
+	colorful paginated.out
+
+ok 43 - colors are sent to pager for external commands
+
+expecting success of 7006.44 'setup: some aliases': 
+	git config alias.aliasedlog log &&
+	git config alias.true "!true"
+
+ok 44 - setup: some aliases
+
+expecting success of 7006.45 'git log - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git log
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 45 - git log - default pager is used by default
+
+expecting success of 7006.46 'git log - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git log &&
+		test_path_is_file PAGER_used
+	
+ok 46 - git log - PAGER overrides default pager
+
+expecting success of 7006.47 'git log - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git log &&
+		test_path_is_file core.pager_used
+	
+ok 47 - git log - repository-local core.pager setting overrides PAGER
+
+expecting success of 7006.48 'git log - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git log
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 48 - git log - core.pager overrides PAGER from subdirectory
+
+expecting success of 7006.49 'git log - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git log &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 49 - git log - GIT_PAGER overrides core.pager
+
+expecting success of 7006.50 'git -p log - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git -p log
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 50 - git -p log - default pager is used by default
+
+expecting success of 7006.51 'git -p log - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git -p log &&
+		test_path_is_file PAGER_used
+	
+ok 51 - git -p log - PAGER overrides default pager
+
+expecting success of 7006.52 'git -p log - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git -p log &&
+		test_path_is_file core.pager_used
+	
+ok 52 - git -p log - repository-local core.pager setting overrides PAGER
+
+expecting success of 7006.53 'git -p log - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git -p log
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 53 - git -p log - core.pager overrides PAGER from subdirectory
+
+expecting success of 7006.54 'git -p log - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git -p log &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 54 - git -p log - GIT_PAGER overrides core.pager
+
+expecting success of 7006.55 'git aliasedlog - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git aliasedlog
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 55 - git aliasedlog - default pager is used by default
+
+expecting success of 7006.56 'git aliasedlog - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git aliasedlog &&
+		test_path_is_file PAGER_used
+	
+ok 56 - git aliasedlog - PAGER overrides default pager
+
+expecting success of 7006.57 'git aliasedlog - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git aliasedlog &&
+		test_path_is_file core.pager_used
+	
+ok 57 - git aliasedlog - repository-local core.pager setting overrides PAGER
+
+expecting success of 7006.58 'git aliasedlog - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git aliasedlog
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 58 - git aliasedlog - core.pager overrides PAGER from subdirectory
+
+expecting success of 7006.59 'git aliasedlog - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git aliasedlog &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 59 - git aliasedlog - GIT_PAGER overrides core.pager
+
+expecting success of 7006.60 'git -p aliasedlog - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git -p aliasedlog
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 60 - git -p aliasedlog - default pager is used by default
+
+expecting success of 7006.61 'git -p aliasedlog - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git -p aliasedlog &&
+		test_path_is_file PAGER_used
+	
+ok 61 - git -p aliasedlog - PAGER overrides default pager
+
+expecting success of 7006.62 'git -p aliasedlog - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git -p aliasedlog &&
+		test_path_is_file core.pager_used
+	
+ok 62 - git -p aliasedlog - repository-local core.pager setting overrides PAGER
+
+expecting success of 7006.63 'git -p aliasedlog - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git -p aliasedlog
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 63 - git -p aliasedlog - core.pager overrides PAGER from subdirectory
+
+expecting success of 7006.64 'git -p aliasedlog - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git -p aliasedlog &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 64 - git -p aliasedlog - GIT_PAGER overrides core.pager
+
+expecting success of 7006.65 'git -p true - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git -p true
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 65 - git -p true - default pager is used by default
+
+expecting success of 7006.66 'git -p true - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git -p true &&
+		test_path_is_file PAGER_used
+	
+ok 66 - git -p true - PAGER overrides default pager
+
+expecting success of 7006.67 'git -p true - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git -p true &&
+		test_path_is_file core.pager_used
+	
+ok 67 - git -p true - repository-local core.pager setting overrides PAGER
+
+expecting success of 7006.68 'git -p true - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git -p true
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 68 - git -p true - core.pager overrides PAGER from subdirectory
+
+expecting success of 7006.69 'git -p true - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git -p true &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 69 - git -p true - GIT_PAGER overrides core.pager
+
+expecting success of 7006.70 'git -p request-pull - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_must_fail test_terminal  git -p request-pull
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 70 - git -p request-pull - default pager is used by default
+
+expecting success of 7006.71 'git -p request-pull - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_must_fail test_terminal  git -p request-pull &&
+		test_path_is_file PAGER_used
+	
+ok 71 - git -p request-pull - PAGER overrides default pager
+
+expecting success of 7006.72 'git -p request-pull - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_must_fail test_terminal  git -p request-pull &&
+		test_path_is_file core.pager_used
+	
+ok 72 - git -p request-pull - repository-local core.pager setting overrides PAGER
+
+expecting success of 7006.73 'git -p request-pull - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_must_fail test_terminal  git -p request-pull
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 73 - git -p request-pull - core.pager overrides PAGER from subdirectory
+
+expecting success of 7006.74 'git -p request-pull - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_must_fail test_terminal  git -p request-pull &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 74 - git -p request-pull - GIT_PAGER overrides core.pager
+
+expecting success of 7006.75 'git -p - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_must_fail test_terminal  git -p
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 75 - git -p - default pager is used by default
+
+expecting success of 7006.76 'git -p - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_must_fail test_terminal  git -p &&
+		test_path_is_file PAGER_used
+	
+ok 76 - git -p - PAGER overrides default pager
+
+checking known breakage of 7006.77 'git -p - repository-local core.pager setting is not used': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_must_fail test_terminal  git -p &&
+		! test_path_is_file core.pager_used
+	
+not ok 77 - git -p - repository-local core.pager setting is not used # TODO known breakage
+
+expecting success of 7006.78 'git -p - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_must_fail test_terminal  git -p &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 78 - git -p - GIT_PAGER overrides core.pager
+
+expecting success of 7006.79 'core.pager in repo config works and retains cwd': 
+	sane_unset GIT_PAGER &&
+	test_config core.pager "cat >cwd-retained" &&
+	(
+		cd sub &&
+		rm -f cwd-retained &&
+		test_terminal git -p rev-parse HEAD &&
+		test_path_is_file cwd-retained
+	)
+
+ok 79 - core.pager in repo config works and retains cwd
+
+expecting success of 7006.80 'core.pager is found via alias in subdirectory': 
+	sane_unset GIT_PAGER &&
+	test_config core.pager "cat >via-alias" &&
+	(
+		cd sub &&
+		rm -f via-alias &&
+		test_terminal git -c alias.r="-p rev-parse" r HEAD &&
+		test_path_is_file via-alias
+	)
+
+ok 80 - core.pager is found via alias in subdirectory
+
+checking known breakage of 7006.81 'no pager for 'git -p nonsense'': 
+		rm -f GIT_PAGER_used &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_must_fail test_terminal  git -p nonsense &&
+		test_path_is_missing GIT_PAGER_used
+	
+Path exists:
+-rw-r--r-- 1 pbuilder2 pbuilder2 24 Jan 30 02:15 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': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git shortlog
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 82 - git shortlog - default pager is used by default
+
+expecting success of 7006.83 'git shortlog - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git shortlog &&
+		test_path_is_file PAGER_used
+	
+ok 83 - git shortlog - PAGER overrides default pager
+
+expecting success of 7006.84 'git shortlog - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git shortlog &&
+		test_path_is_file core.pager_used
+	
+ok 84 - git shortlog - repository-local core.pager setting overrides PAGER
+
+expecting success of 7006.85 'git shortlog - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git shortlog
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 85 - git shortlog - core.pager overrides PAGER from subdirectory
+
+expecting success of 7006.86 'git shortlog - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git shortlog &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 86 - git shortlog - GIT_PAGER overrides core.pager
+
+expecting success of 7006.87 'setup: configure shortlog not to paginate': 
+	git config pager.shortlog false
+
+ok 87 - setup: configure shortlog not to paginate
+
+expecting success of 7006.88 'no pager for 'git shortlog'': 
+		rm -f GIT_PAGER_used &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git shortlog &&
+		test_path_is_missing GIT_PAGER_used
+	
+ok 88 - no pager for 'git shortlog'
+
+expecting success of 7006.89 'git shortlog - core.pager is not used from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git shortlog
+		) &&
+		! test_path_is_file core.pager_used
+	
+File core.pager_used doesn't exist
+ok 89 - git shortlog - core.pager is not used from subdirectory
+
+expecting success of 7006.90 'git -p shortlog - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git -p shortlog
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 90 - git -p shortlog - default pager is used by default
+
+expecting success of 7006.91 'git -p shortlog - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git -p shortlog
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 91 - git -p shortlog - core.pager overrides PAGER from subdirectory
+
+expecting success of 7006.92 'git -p apply </dev/null - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_must_fail test_terminal  git -p apply </dev/null
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 92 - git -p apply </dev/null - core.pager overrides PAGER from subdirectory
+
+expecting success of 7006.93 'command-specific pager': 
+	sane_unset PAGER GIT_PAGER &&
+	echo "foo:initial" >expect &&
+	>actual &&
+	test_unconfig core.pager &&
+	test_config pager.log "sed s/^/foo:/ >actual" &&
+	test_terminal git log --format=%s -1 &&
+	test_cmp expect actual
+
+ok 93 - command-specific pager
+
+expecting success of 7006.94 'command-specific pager overrides core.pager': 
+	sane_unset PAGER GIT_PAGER &&
+	echo "foo:initial" >expect &&
+	>actual &&
+	test_config core.pager "exit 1" &&
+	test_config pager.log "sed s/^/foo:/ >actual" &&
+	test_terminal git log --format=%s -1 &&
+	test_cmp expect actual
+
+ok 94 - command-specific pager overrides core.pager
+
+expecting success of 7006.95 'command-specific pager overridden by environment': 
+	GIT_PAGER="sed s/^/foo:/ >actual" && export GIT_PAGER &&
+	>actual &&
+	echo "foo:initial" >expect &&
+	test_config pager.log "exit 1" &&
+	test_terminal git log --format=%s -1 &&
+	test_cmp expect actual
+
+ok 95 - command-specific pager overridden by environment
+
+expecting success of 7006.96 'setup external command': 
+	cat >git-external <<-\EOF &&
+	#!/bin/sh
+	git "$@"
+	EOF
+	chmod +x git-external
+
+ok 96 - setup external command
+
+expecting success of 7006.97 'command-specific pager works for external commands': 
+	sane_unset PAGER GIT_PAGER &&
+	echo "foo:initial" >expect &&
+	>actual &&
+	test_config pager.external "sed s/^/foo:/ >actual" &&
+	test_terminal git --exec-path="$(pwd)" external log --format=%s -1 &&
+	test_cmp expect actual
+
+ok 97 - command-specific pager works for external commands
+
+expecting success of 7006.98 'sub-commands of externals use their own pager': 
+	sane_unset PAGER GIT_PAGER &&
+	echo "foo:initial" >expect &&
+	>actual &&
+	test_config pager.log "sed s/^/foo:/ >actual" &&
+	test_terminal git --exec-path=. external log --format=%s -1 &&
+	test_cmp expect actual
+
+ok 98 - sub-commands of externals use their own pager
+
+expecting success of 7006.99 'external command pagers override sub-commands': 
+	sane_unset PAGER GIT_PAGER &&
+	>actual &&
+	test_config pager.external false &&
+	test_config pager.log "sed s/^/log:/ >actual" &&
+	test_terminal git --exec-path=. external log --format=%s -1 &&
+	test_must_be_empty actual
+
+initial
+ok 99 - external command pagers override sub-commands
+
+expecting success of 7006.100 'command with underscores does not complain': 
+	write_script git-under_score <<-\EOF &&
+	echo ok
+	EOF
+	git --exec-path=. under_score >actual 2>&1 &&
+	echo ok >expect &&
+	test_cmp expect actual
+
+ok 100 - command with underscores does not complain
+
+expecting success of 7006.101 'git tag with auto-columns ': 
+	test_commit one &&
+	test_commit two &&
+	test_commit three &&
+	test_commit four &&
+	test_commit five &&
+	cat >expect <<-\EOF &&
+	initial  one      two      three    four     five
+	EOF
+	test_terminal env PAGER="cat >actual" COLUMNS=80 \
+		git -c column.ui=auto tag --sort=authordate &&
+	test_cmp expect actual
+
+[master bdf0f03] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master c613728] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master dbd092b] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[master a0ce8ac] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+[master 03bd18b] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+ok 101 - git tag with auto-columns 
+
+expecting success of 7006.102 'setup trace2': 
+	GIT_TRACE2_BRIEF=1 &&
+	export GIT_TRACE2_BRIEF
+
+ok 102 - setup trace2
+
+expecting success of 7006.103 'setup large log output': 
+	perl -e "
+		print \"this is a long commit message\" x 50000
+	" >commit-msg &&
+	git commit --allow-empty -F commit-msg
+
+[master 06d9144] this is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit message
+ Author: A U Thor <author@example.com>
+ok 103 - setup large log output
+
+expecting success of 7006.104 'git returns SIGPIPE on early pager exit': 
+	test_when_finished "rm pager-used trace.normal" &&
+	test_config core.pager ">pager-used; head -n 1; exit 0" &&
+	GIT_TRACE2="$(pwd)/trace.normal" &&
+	export GIT_TRACE2 &&
+	test_when_finished "unset GIT_TRACE2" &&
+
+	if test_have_prereq !MINGW
+	then
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
+		test_match_signal 13 "$OUT"
+	else
+		test_terminal git log
+	fi &&
+
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:0 " child-exits &&
+	test_path_is_file pager-used
+
+died of signal 13 at /build/reproducible-path/git-2.47.2/t/test-terminal.perl line 33.
+child_exit[0] pid:2031108 code:0 elapsed:0.042257
+ok 104 - git returns SIGPIPE on early pager exit
+
+expecting success of 7006.105 'git returns SIGPIPE on early pager non-zero exit': 
+	test_when_finished "rm pager-used trace.normal" &&
+	test_config core.pager ">pager-used; head -n 1; exit 1" &&
+	GIT_TRACE2="$(pwd)/trace.normal" &&
+	export GIT_TRACE2 &&
+	test_when_finished "unset GIT_TRACE2" &&
+
+	if test_have_prereq !MINGW
+	then
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
+		test_match_signal 13 "$OUT"
+	else
+		test_terminal git log
+	fi &&
+
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:1 " child-exits &&
+	test_path_is_file pager-used
+
+died of signal 13 at /build/reproducible-path/git-2.47.2/t/test-terminal.perl line 33.
+child_exit[0] pid:2031391 code:1 elapsed:0.034367
+ok 105 - git returns SIGPIPE on early pager non-zero exit
+
+expecting success of 7006.106 'git discards pager non-zero exit without SIGPIPE': 
+	test_when_finished "rm pager-used trace.normal" &&
+	test_config core.pager "wc >pager-used; exit 1" &&
+	GIT_TRACE2="$(pwd)/trace.normal" &&
+	export GIT_TRACE2 &&
+	test_when_finished "unset GIT_TRACE2" &&
+
+	test_terminal git log &&
+
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:1 " child-exits &&
+	test_path_is_file pager-used
+
+child_exit[0] pid:2031686 code:1 elapsed:0.062992
+ok 106 - git discards pager non-zero exit without SIGPIPE
+
+expecting success of 7006.107 'git errors when asked to execute nonexisting pager': 
+	test_when_finished "rm -f err" &&
+	test_config core.pager "does-not-exist" &&
+	test_must_fail test_terminal git log 2>err &&
+	test_grep "unable to execute pager" err
+
+fatal: unable to execute pager 'does-not-exist'
+ok 107 - git errors when asked to execute nonexisting pager
+
+expecting success of 7006.108 'git returns SIGPIPE on propagated signals from pager': 
+	test_when_finished "rm pager-used trace.normal" &&
+	test_config core.pager ">pager-used; exec test-tool sigchain" &&
+	GIT_TRACE2="$(pwd)/trace.normal" &&
+	export GIT_TRACE2 &&
+	test_when_finished "unset GIT_TRACE2" &&
+
+	if test_have_prereq !MINGW
+	then
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
+		test_match_signal 13 "$OUT"
+	else
+		test_terminal git log
+	fi &&
+
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:143 " child-exits &&
+	test_path_is_file pager-used
+
+died of signal 13 at /build/reproducible-path/git-2.47.2/t/test-terminal.perl line 33.
+child_exit[0] pid:2032155 code:143 elapsed:0.036611
+ok 108 - git returns SIGPIPE on propagated signals from pager
+
+expecting success of 7006.109 'non-existent pager doesnt cause crash': 
+	test_config pager.show invalid-pager &&
+	test_must_fail test_terminal git show
+
+error: cannot run invalid-pager: No such file or directory
+fatal: unable to execute pager 'invalid-pager'
+ok 109 - non-existent pager doesnt cause crash
+
+# still have 3 known breakage(s)
+# passed all remaining 106 test(s)
+1..109
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7201-co.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7201-co/.git/
+expecting success of 7201.1 'setup': 
+	fill x y z >same &&
+	fill 1 2 3 4 5 6 7 8 >one &&
+	fill a b c d e >two &&
+	git add same one two &&
+	git commit -m "Initial A one, A two" &&
+
+	git checkout -b renamer &&
+	rm -f one &&
+	fill 1 3 4 5 6 7 8 >uno &&
+	git add uno &&
+	fill a b c d e f >two &&
+	git commit -a -m "Renamer R one->uno, M two" &&
+
+	git checkout -b side main &&
+	fill 1 2 3 4 5 6 7 >one &&
+	fill A B C D E >three &&
+	rm -f two &&
+	git update-index --add --remove one two three &&
+	git commit -m "Side M one, D two, A three" &&
+
+	git checkout -b simple main &&
+	rm -f one &&
+	fill a c e >two &&
+	git commit -a -m "Simple D one, M two" &&
+
+	git checkout main
+
+[main (root-commit) 7329388] Initial A one, A two
+ Author: A U Thor <author@example.com>
+ 3 files changed, 16 insertions(+)
+ create mode 100644 one
+ create mode 100644 same
+ create mode 100644 two
+Switched to a new branch 'renamer'
+[renamer 0420b41] Renamer R one->uno, M two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename one => uno (87%)
+Switched to a new branch 'side'
+[side ab76817] Side M one, D two, A three
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+), 6 deletions(-)
+ create mode 100644 three
+ delete mode 100644 two
+Switched to a new branch 'simple'
+[simple 022ff9d] Simple D one, M two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 10 deletions(-)
+ delete mode 100644 one
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 7201.2 'checkout from non-existing branch': 
+	git checkout -b delete-me main &&
+	git update-ref -d --no-deref refs/heads/delete-me &&
+	test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
+	git checkout main &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
+
+Switched to a new branch 'delete-me'
+Switched to branch 'main'
+ok 2 - checkout from non-existing branch
+
+expecting success of 7201.3 'checkout with dirty tree without -m': 
+	fill 0 1 2 3 4 5 6 7 8 >one &&
+	if git checkout side
+	then
+		echo Not happy
+		false
+	else
+		echo "happy - failed correctly"
+	fi
+
+error: Your local changes to the following files would be overwritten by checkout:
+	one
+Please commit your changes or stash them before you switch branches.
+Aborting
+happy - failed correctly
+ok 3 - checkout with dirty tree without -m
+
+expecting success of 7201.4 'checkout with unrelated dirty tree without -m': 
+	git checkout -f main &&
+	fill 0 1 2 3 4 5 6 7 8 >same &&
+	cp same kept &&
+	git checkout side >messages &&
+	test_cmp same kept &&
+	printf "M\t%s\n" same >messages.expect &&
+	test_cmp messages.expect messages
+
+Already on 'main'
+Switched to branch 'side'
+ok 4 - checkout with unrelated dirty tree without -m
+
+expecting success of 7201.5 'checkout -m with dirty tree': 
+	git checkout -f main &&
+	git clean -f &&
+
+	fill 0 1 2 3 4 5 6 7 8 >one &&
+	git checkout -m side >messages &&
+
+	test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
+
+	printf "M\t%s\n" one >expect.messages &&
+	test_cmp expect.messages messages &&
+
+	fill "M	one" "A	three" "D	two" >expect.main &&
+	git diff --name-status main >current.main &&
+	test_cmp expect.main current.main &&
+
+	fill "M	one" >expect.side &&
+	git diff --name-status side >current.side &&
+	test_cmp expect.side current.side &&
+
+	git diff --cached >current.index &&
+	test_must_be_empty current.index
+
+Switched to branch 'main'
+Removing kept
+Removing messages
+Removing messages.expect
+Switched to branch 'side'
+ok 5 - checkout -m with dirty tree
+
+expecting success of 7201.6 'checkout -m with dirty tree, renamed': 
+	git checkout -f main && git clean -f &&
+
+	fill 1 2 3 4 5 7 8 >one &&
+	if git checkout renamer
+	then
+		echo Not happy
+		false
+	else
+		echo "happy - failed correctly"
+	fi &&
+
+	git checkout -m renamer &&
+	fill 1 3 4 5 7 8 >expect &&
+	test_cmp expect uno &&
+	! test -f one &&
+	git diff --cached >current &&
+	test_must_be_empty current
+
+Switched to branch 'main'
+Removing current.index
+Removing current.main
+Removing current.side
+Removing expect.main
+Removing expect.messages
+Removing expect.side
+Removing messages
+error: Your local changes to the following files would be overwritten by checkout:
+	one
+Please commit your changes or stash them before you switch branches.
+Aborting
+happy - failed correctly
+Switched to branch 'renamer'
+M	uno
+ok 6 - checkout -m with dirty tree, renamed
+
+expecting success of 7201.7 'checkout -m with merge conflict': 
+	git checkout -f main && git clean -f &&
+
+	fill 1 T 3 4 5 6 S 8 >one &&
+	if git checkout renamer
+	then
+		echo Not happy
+		false
+	else
+		echo "happy - failed correctly"
+	fi &&
+
+	git checkout -m renamer &&
+
+	git diff main:one :3:uno |
+	sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
+	fill d2 aT d7 aS >expect &&
+	test_cmp expect current &&
+	git diff --cached two >current &&
+	test_must_be_empty current
+
+Switched to branch 'main'
+Removing current
+Removing expect
+error: Your local changes to the following files would be overwritten by checkout:
+	one
+Please commit your changes or stash them before you switch branches.
+Aborting
+happy - failed correctly
+Switched to branch 'renamer'
+M	uno
+ok 7 - checkout -m with merge conflict
+
+expecting success of 7201.8 'format of merge conflict from checkout -m': 
+	git checkout -f main &&
+	git clean -f &&
+
+	fill b d >two &&
+	git checkout -m simple &&
+
+	git ls-files >current &&
+	fill same two two two >expect &&
+	test_cmp expect current &&
+
+	cat <<-EOF >expect &&
+	<<<<<<< simple
+	a
+	c
+	e
+	=======
+	b
+	d
+	>>>>>>> local
+	EOF
+	test_cmp expect two
+
+Switched to branch 'main'
+Removing current
+Removing expect
+Switched to branch 'simple'
+M	two
+ok 8 - format of merge conflict from checkout -m
+
+expecting success of 7201.9 'checkout --merge --conflict=diff3 <branch>': 
+	git checkout -f main &&
+	git reset --hard &&
+	git clean -f &&
+
+	fill b d >two &&
+	git checkout --merge --conflict=diff3 simple &&
+
+	cat <<-EOF >expect &&
+	<<<<<<< simple
+	a
+	c
+	e
+	||||||| main
+	a
+	b
+	c
+	d
+	e
+	=======
+	b
+	d
+	>>>>>>> local
+	EOF
+	test_cmp expect two
+
+Switched to branch 'main'
+HEAD is now at 7329388 Initial A one, A two
+Removing current
+Removing expect
+Switched to branch 'simple'
+M	two
+ok 9 - checkout --merge --conflict=diff3 <branch>
+
+expecting success of 7201.10 'switch to another branch while carrying a deletion': 
+	git checkout -f main &&
+	git reset --hard &&
+	git clean -f &&
+	git rm two &&
+
+	test_must_fail git checkout simple 2>errs &&
+	test_grep overwritten errs &&
+
+	test_must_fail git read-tree --quiet -m -u HEAD simple 2>errs &&
+	test_must_be_empty errs
+
+Switched to branch 'main'
+HEAD is now at 7329388 Initial A one, A two
+Removing expect
+rm 'two'
+error: Your local changes to the following files would be overwritten by checkout:
+ok 10 - switch to another branch while carrying a deletion
+
+expecting success of 7201.11 'checkout to detach HEAD (with advice declined)': 
+	git config advice.detachedHead false &&
+	rev=$(git rev-parse --short renamer^) &&
+	git checkout -f renamer &&
+	git clean -f &&
+	git checkout renamer^ 2>messages &&
+	test_grep "HEAD is now at $rev" messages &&
+	test_line_count = 1 messages &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
+
+Switched to branch 'renamer'
+Removing errs
+HEAD is now at 7329388 Initial A one, A two
+ok 11 - checkout to detach HEAD (with advice declined)
+
+expecting success of 7201.12 'checkout to detach HEAD': 
+	git config advice.detachedHead true &&
+	rev=$(git rev-parse --short renamer^) &&
+	git checkout -f renamer &&
+	git clean -f &&
+	git checkout renamer^ 2>messages &&
+	grep "HEAD is now at $rev" messages &&
+	test_line_count -gt 1 messages &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
+
+Previous HEAD position was 7329388 Initial A one, A two
+Switched to branch 'renamer'
+Removing messages
+HEAD is now at 7329388 Initial A one, A two
+ok 12 - checkout to detach HEAD
+
+expecting success of 7201.13 'checkout to detach HEAD with branchname^': 
+	git checkout -f main &&
+	git clean -f &&
+	git checkout renamer^ &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
+
+Switched to branch 'main'
+Removing messages
+Note: switching to 'renamer^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 7329388 Initial A one, A two
+ok 13 - checkout to detach HEAD with branchname^
+
+expecting success of 7201.14 'checkout to detach HEAD with :/message': 
+	git checkout -f main &&
+	git clean -f &&
+	git checkout ":/Initial" &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
+
+Switched to branch 'main'
+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 7329388 Initial A one, A two
+ok 14 - checkout to detach HEAD with :/message
+
+expecting success of 7201.15 'checkout to detach HEAD with HEAD^0': 
+	git checkout -f main &&
+	git clean -f &&
+	git checkout HEAD^0 &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
+
+Switched to branch 'main'
+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 7329388 Initial A one, A two
+ok 15 - checkout to detach HEAD with HEAD^0
+
+expecting success of 7201.16 'checkout with ambiguous tag/branch names': 
+	git tag both side &&
+	git branch both main &&
+	git reset --hard &&
+	git checkout main &&
+
+	git checkout both &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	name=$(git symbolic-ref HEAD 2>/dev/null) &&
+	test "z$name" = zrefs/heads/both
+
+HEAD is now at 7329388 Initial A one, A two
+Switched to branch 'main'
+warning: refname 'both' is ambiguous.
+Switched to branch 'both'
+ok 16 - checkout with ambiguous tag/branch names
+
+expecting success of 7201.17 'checkout with ambiguous tag/branch names': 
+	git reset --hard &&
+	git checkout main &&
+
+	git tag frotz side &&
+	git branch frotz main &&
+	git reset --hard &&
+	git checkout main &&
+
+	git checkout tags/frotz &&
+	H=$(git rev-parse --verify HEAD) &&
+	S=$(git show-ref -s --verify refs/heads/side) &&
+	test "z$H" = "z$S" &&
+	if name=$(git symbolic-ref HEAD 2>/dev/null)
+	then
+		echo "Bad -- should have detached"
+		false
+	else
+		: happy
+	fi
+
+HEAD is now at 7329388 Initial A one, A two
+Switched to branch 'main'
+HEAD is now at 7329388 Initial A one, A two
+Already on 'main'
+Note: switching to 'tags/frotz'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 ab76817 Side M one, D two, A three
+ok 17 - checkout with ambiguous tag/branch names
+
+expecting success of 7201.18 'switch branches while in subdirectory': 
+	git reset --hard &&
+	git checkout main &&
+
+	mkdir subs &&
+	git -C subs checkout side &&
+	! test -f subs/one &&
+	rm -fr subs
+
+HEAD is now at ab76817 Side M one, D two, A three
+Previous HEAD position was ab76817 Side M one, D two, A three
+Switched to branch 'main'
+Switched to branch 'side'
+ok 18 - switch branches while in subdirectory
+
+expecting success of 7201.19 'checkout specific path while in subdirectory': 
+	git reset --hard &&
+	git checkout side &&
+	mkdir subs &&
+	>subs/bero &&
+	git add subs/bero &&
+	git commit -m "add subs/bero" &&
+
+	git checkout main &&
+	mkdir -p subs &&
+	git -C subs checkout side -- bero &&
+	test -f subs/bero
+
+HEAD is now at ab76817 Side M one, D two, A three
+Already on 'side'
+[side bb04aa0] add subs/bero
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 subs/bero
+Switched to branch 'main'
+ok 19 - checkout specific path while in subdirectory
+
+expecting success of 7201.20 'checkout w/--track sets up tracking': 
+	git config branch.autosetupmerge false &&
+	git checkout main &&
+	git checkout --track -b track1 &&
+	test "$(git config branch.track1.remote)" &&
+	test "$(git config branch.track1.merge)"
+
+Already on 'main'
+A	subs/bero
+Switched to a new branch 'track1'
+A	subs/bero
+branch 'track1' set up to track 'main'.
+ok 20 - checkout w/--track sets up tracking
+
+expecting success of 7201.21 'checkout w/autosetupmerge=always sets up tracking': 
+	test_when_finished git config branch.autosetupmerge false &&
+	git config branch.autosetupmerge always &&
+	git checkout main &&
+	git checkout -b track2 &&
+	test "$(git config branch.track2.remote)" &&
+	test "$(git config branch.track2.merge)"
+
+Switched to branch 'main'
+A	subs/bero
+Switched to a new branch 'track2'
+branch 'track2' set up to track 'main'.
+ok 21 - checkout w/autosetupmerge=always sets up tracking
+
+expecting success of 7201.22 'checkout w/--track from non-branch HEAD fails': 
+	git checkout main^0 &&
+	test_must_fail git symbolic-ref HEAD &&
+	test_must_fail git checkout --track -b track &&
+	test_must_fail git rev-parse --verify track &&
+	test_must_fail git symbolic-ref HEAD &&
+	test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
+
+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 7329388 Initial A one, A two
+A	subs/bero
+fatal: ref HEAD is not a symbolic ref
+fatal: cannot set up tracking information; starting point 'HEAD' is not a branch
+A	subs/bero
+fatal: Needed a single revision
+fatal: ref HEAD is not a symbolic ref
+ok 22 - checkout w/--track from non-branch HEAD fails
+
+expecting success of 7201.23 'checkout w/--track from tag fails': 
+	git checkout main^0 &&
+	test_must_fail git symbolic-ref HEAD &&
+	test_must_fail git checkout --track -b track frotz &&
+	test_must_fail git rev-parse --verify track &&
+	test_must_fail git symbolic-ref HEAD &&
+	test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
+
+HEAD is now at 7329388 Initial A one, A two
+A	subs/bero
+fatal: ref HEAD is not a symbolic ref
+warning: refname 'frotz' is ambiguous.
+warning: refname 'frotz' is ambiguous.
+fatal: ambiguous object name: 'frotz'
+A	subs/bero
+fatal: Needed a single revision
+fatal: ref HEAD is not a symbolic ref
+ok 23 - checkout w/--track from tag fails
+
+expecting success of 7201.24 'detach a symbolic link HEAD': 
+	git checkout main &&
+	git config --bool core.prefersymlinkrefs yes &&
+	git checkout side &&
+	git checkout main &&
+	it=$(git symbolic-ref HEAD) &&
+	test "z$it" = zrefs/heads/main &&
+	here=$(git rev-parse --verify refs/heads/main) &&
+	git checkout side^ &&
+	test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
+
+Switched to branch 'main'
+A	subs/bero
+Switched to branch 'side'
+Switched to branch 'main'
+Note: switching to '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.
+
+If you want to create a new branch to retain 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 ab76817 Side M one, D two, A three
+ok 24 - detach a symbolic link HEAD
+
+expecting success of 7201.25 'checkout with --track fakes a sensible -b <name>': 
+	git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
+	git update-ref refs/remotes/origin/koala/bear renamer &&
+
+	git checkout --track origin/koala/bear &&
+	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
+
+	git checkout main && git branch -D koala/bear &&
+
+	git checkout --track refs/remotes/origin/koala/bear &&
+	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
+
+	git checkout main && git branch -D koala/bear &&
+
+	git checkout --track remotes/origin/koala/bear &&
+	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
+
+Previous HEAD position was ab76817 Side M one, D two, A three
+Switched to a new branch 'koala/bear'
+branch 'koala/bear' set up to track 'origin/koala/bear'.
+Switched to branch 'main'
+Deleted branch koala/bear (was 0420b41).
+Switched to a new branch 'koala/bear'
+branch 'koala/bear' set up to track 'origin/koala/bear'.
+Switched to branch 'main'
+Deleted branch koala/bear (was 0420b41).
+Switched to a new branch 'koala/bear'
+branch 'koala/bear' set up to track 'origin/koala/bear'.
+ok 25 - checkout with --track fakes a sensible -b <name>
+
+expecting success of 7201.26 'checkout with --track, but without -b, fails with too short tracked name': 
+	test_must_fail git checkout --track renamer
+
+fatal: missing branch name; try -b
+ok 26 - checkout with --track, but without -b, fails with too short tracked name
+
+expecting success of 7201.27 'checkout an unmerged path should fail': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	test_must_fail git checkout fild file filf &&
+	test_cmp sample fild &&
+	test_cmp sample filf &&
+	test_cmp sample file
+
+error: path 'file' is unmerged
+ok 27 - checkout an unmerged path should fail
+
+expecting success of 7201.28 'checkout with an unmerged path can be ignored': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -f fild file filf &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp sample file
+
+warning: path 'file' is unmerged
+Updated 2 paths from the index
+ok 28 - checkout with an unmerged path can be ignored
+
+expecting success of 7201.29 'checkout unmerged stage': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout --ours . &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp expect file &&
+	git checkout --theirs file &&
+	test ztheirside = "z$(cat file)"
+
+Updated 3 paths from the index
+Updated 1 path from the index
+ok 29 - checkout unmerged stage
+
+expecting success of 7201.30 'checkout --ours is incompatible with switching': 
+	test_must_fail git checkout --ours 2>error &&
+	test_grep "needs the paths to check out" error &&
+
+	test_must_fail git checkout --ours HEAD 2>error &&
+	test_grep "cannot be used with switching" error &&
+
+	test_must_fail git checkout --ours main 2>error &&
+	test_grep "cannot be used with switching" error &&
+
+	git checkout --ours file
+
+fatal: '--ours/--theirs' needs the paths to check out
+fatal: '--ours/--theirs' cannot be used with switching branches
+fatal: '--ours/--theirs' cannot be used with switching branches
+Updated 1 path from the index
+ok 30 - checkout --ours is incompatible with switching
+
+expecting success of 7201.31 'checkout path with --merge from tree-ish is a no-no': 
+	setup_conflicting_index &&
+	test_must_fail git checkout -m HEAD -- file
+
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+ok 31 - checkout path with --merge from tree-ish is a no-no
+
+expecting success of 7201.32 'checkout with --merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -m -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
+
+ok 32 - checkout with --merge
+
+expecting success of 7201.33 'checkout -m works after (mistaken) resolution': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	# resolve to something
+	git add file &&
+	git checkout --merge -- fild file filf &&
+	{
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	} >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
+
+ok 33 - checkout -m works after (mistaken) resolution
+
+expecting success of 7201.34 'checkout -m works after (mistaken) resolution to remove': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	# resolve to remove
+	git rm file &&
+	git checkout --merge -- fild file filf &&
+	{
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	} >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
+
+rm 'file'
+ok 34 - checkout -m works after (mistaken) resolution to remove
+
+expecting success of 7201.35 'checkout with --merge, in diff3 -m style': 
+	git config merge.conflictstyle diff3 &&
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -m -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "||||||| base" &&
+		echo original &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
+
+ok 35 - checkout with --merge, in diff3 -m style
+
+expecting success of 7201.36 'checkout --conflict=merge, overriding config': 
+	git config merge.conflictstyle diff3 &&
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout --conflict=merge -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
+
+ok 36 - checkout --conflict=merge, overriding config
+
+expecting success of 7201.37 'checkout --conflict=diff3': 
+	test_unconfig merge.conflictstyle &&
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout --conflict=diff3 -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "||||||| base" &&
+		echo original &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
+
+ok 37 - checkout --conflict=diff3
+
+expecting success of 7201.38 'checkout --conflict=diff3 --no-conflict does not merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >expect &&
+	cat expect >fild &&
+	cat expect >file &&
+	test_must_fail git checkout --conflict=diff3 --no-conflict -- fild file 2>err &&
+	test_cmp expect file &&
+	test_cmp expect fild &&
+	echo "error: path ${SQ}file${SQ} is unmerged" >expect &&
+	test_cmp expect err
+
+ok 38 - checkout --conflict=diff3 --no-conflict does not merge
+
+expecting success of 7201.39 'checkout --conflict=diff3 --no-merge does not merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >expect &&
+	cat expect >fild &&
+	cat expect >file &&
+	test_must_fail git checkout --conflict=diff3 --no-merge -- fild file 2>err &&
+	test_cmp expect file &&
+	test_cmp expect fild &&
+	echo "error: path ${SQ}file${SQ} is unmerged" >expect &&
+	test_cmp expect err
+
+ok 39 - checkout --conflict=diff3 --no-merge does not merge
+
+expecting success of 7201.40 'checkout --no-merge --conflict=diff3 does merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >fild &&
+	echo "none of the above" >file &&
+	git checkout --no-merge --conflict=diff3 -- fild file &&
+	echo "ourside" >expect &&
+	test_cmp expect fild &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	||||||| base
+	original
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
+
+ok 40 - checkout --no-merge --conflict=diff3 does merge
+
+expecting success of 7201.41 'checkout --merge --conflict=diff3 --no-conflict does merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >fild &&
+	echo "none of the above" >file &&
+	git checkout --merge --conflict=diff3 --no-conflict -- fild file &&
+	echo "ourside" >expect &&
+	test_cmp expect fild &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
+
+ok 41 - checkout --merge --conflict=diff3 --no-conflict does merge
+
+expecting success of 7201.42 'checkout with invalid conflict style': 
+	test_must_fail git checkout --conflict=bad 2>actual -- file &&
+	echo "error: unknown conflict style ${SQ}bad${SQ}" >expect &&
+	test_cmp expect actual
+
+ok 42 - checkout with invalid conflict style
+
+expecting success of 7201.43 'failing checkout -b should not break working tree': 
+	git clean -fd &&  # Remove untracked files in the way
+	git reset --hard main &&
+	git symbolic-ref HEAD refs/heads/main &&
+	test_must_fail git checkout -b renamer side^ &&
+	test $(git symbolic-ref HEAD) = refs/heads/main &&
+	git diff --exit-code &&
+	git diff --cached --exit-code
+
+Removing actual
+Removing err
+Removing error
+Removing expect
+Removing merged
+Removing same
+Removing sample
+Removing two
+Removing uno
+HEAD is now at 7329388 Initial A one, A two
+fatal: a branch named 'renamer' already exists
+ok 43 - failing checkout -b should not break working tree
+
+expecting success of 7201.44 'switch out of non-branch': 
+	git reset --hard main &&
+	git checkout main^0 &&
+	echo modified >one &&
+	test_must_fail git checkout renamer 2>error.log &&
+	! grep "^Previous HEAD" error.log
+
+HEAD is now at 7329388 Initial A one, A two
+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 7329388 Initial A one, A two
+ok 44 - switch out of non-branch
+
+expecting success of 7201.45 'custom merge driver with checkout -m': 
+	git reset --hard &&
+
+	git config merge.filfre.driver "./filfre.sh %O %A %B" &&
+	git config merge.filfre.name "Feel-free merge driver" &&
+	git config merge.filfre.recursive binary &&
+	echo "arm merge=filfre" >.gitattributes &&
+
+	git checkout -b left &&
+	echo neutral >arm &&
+	git add arm .gitattributes &&
+	test_tick &&
+	git commit -m neutral &&
+	git branch right &&
+
+	echo left >arm &&
+	test_tick &&
+	git commit -a -m left &&
+	git checkout right &&
+
+	echo right >arm &&
+	test_tick &&
+	git commit -a -m right &&
+
+	test_must_fail git merge left &&
+	(
+		for t in filfre-common left right
+		do
+			grep $t arm || exit 1
+		done
+	) &&
+
+	mv arm expect &&
+	git checkout -m arm &&
+	test_cmp expect arm
+
+HEAD is now at 7329388 Initial A one, A two
+Switched to a new branch 'left'
+[left b257dc6] neutral
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 arm
+[left 2459c9d] left
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'right'
+[right 6b476b9] right
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging arm
+CONFLICT (content): Merge conflict in arm
+Automatic merge failed; fix conflicts and then commit the result.
+||||||| filfre-common
+left
+right
+Recreated 1 merge conflict
+ok 45 - custom merge driver with checkout -m
+
+expecting success of 7201.46 'tracking info copied with autoSetupMerge=inherit': 
+	git reset --hard main &&
+	# default config does not copy tracking info
+	git checkout -b foo-no-inherit koala/bear &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
+	# with autoSetupMerge=inherit, we copy tracking info from koala/bear
+	test_config branch.autoSetupMerge inherit &&
+	git checkout -b foo koala/bear &&
+	test_cmp_config origin branch.foo.remote &&
+	test_cmp_config refs/heads/koala/bear branch.foo.merge &&
+	# no tracking info to inherit from main
+	git checkout -b main2 main &&
+	test_cmp_config "" --default "" branch.main2.remote &&
+	test_cmp_config "" --default "" branch.main2.merge
+
+HEAD is now at 7329388 Initial A one, A two
+Switched to a new branch 'foo-no-inherit'
+Switched to a new branch 'foo'
+branch 'foo' set up to track 'origin/koala/bear'.
+warning: asked to inherit tracking from 'main', but no remote is set
+Switched to a new branch 'main2'
+ok 46 - tracking info copied with autoSetupMerge=inherit
+
+# passed all 46 test(s)
+1..46
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7063-status-untracked-cache.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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/
 
-expecting success of 7111.41 'check: X U B B --merge B B B': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 41 - check: X U B B --merge B B B
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 47 - setting core.untrackedCache to keep
 
-expecting success of 7111.42 'check: X U B B --keep XXXXX  ': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 42 - check: X U B B --keep XXXXX  
+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
 
-# passed all 42 test(s)
-1..42
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7402-submodule-rebase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7402-submodule-rebase/.git/
-expecting success of 7402.1 'setup': 
+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
 
-	echo file > file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	git clone . submodule &&
-	git add submodule &&
-	test_tick &&
-	git commit -m submodule &&
-	echo second line >> file &&
-	(cd submodule && git pull) &&
-	test_tick &&
-	git commit -m file-and-submodule -a &&
-	git branch added-submodule
+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
 
-[master (root-commit) ffefb50] initial
+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>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'submodule'...
-done.
-warning: adding embedded git repository: submodule
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> submodule
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached submodule
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[master 9bd10db] submodule
+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 160000 submodule
-From /build/reproducible-path/git-2.47.2/t/trash directory.t7402-submodule-rebase/.
-   ffefb50..9bd10db  master     -> origin/master
-Updating ffefb50..9bd10db
-Fast-forward
- submodule | 1 +
- 1 file changed, 1 insertion(+)
- create mode 160000 submodule
-[master 041f541] file-and-submodule
+ 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>
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 1 - setup
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 50 - untracked cache survives a commit
 
-expecting success of 7402.2 'rebase with a dirty submodule': 
+expecting success of 7063.51 'teardown worktree': 
+	cd ..
 
-	(cd submodule &&
-	 echo 3rd line >> file &&
-	 test_tick &&
-	 git commit -m fork -a) &&
-	echo unrelated >> file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m unrelated file2 &&
-	echo other line >> file &&
-	test_tick &&
-	git commit -m update file &&
-	CURRENT=$(cd submodule && git rev-parse HEAD) &&
-	EXPECTED=$(git rev-parse HEAD~2:submodule) &&
-	GIT_TRACE=1 git rebase --onto HEAD~2 HEAD^ &&
-	STORED=$(git rev-parse HEAD:submodule) &&
-	test $EXPECTED = $STORED &&
-	test $CURRENT = $(cd submodule && git rev-parse HEAD)
+ok 51 - teardown worktree
 
+checking prerequisite: SYMLINKS
 
-[master eb5e1a6] fork
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b5e9d7b] unrelated
+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.47.2/t/trash directory.t7063-status-untracked-cache/worktree-symlink/.git/
+[main (root-commit) 294fddc] first commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[master a65f80c] update
+ 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>
- 1 file changed, 1 insertion(+)
-trace: built-in: git rebase --onto 'HEAD~2' HEAD^
-Rebasing (1/1)
trace: run_command: git notes copy --for-rewrite=rebase
-trace: start_command: /build/reproducible-path/git-2.47.2/git notes copy --for-rewrite=rebase
-trace: built-in: git notes copy --for-rewrite=rebase
-Successfully rebased and updated refs/heads/master.
-ok 2 - rebase with a dirty submodule
+ 2 files changed, 1 insertion(+)
+ create mode 120000 one
+ delete mode 100644 one/file
+ok 52 - setup worktree for symlink test
 
-expecting success of 7402.3 'interactive rebase with a dirty submodule': 
+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
 
-	echo submodule >expect &&
-	git diff --name-only >actual &&
-	test_cmp expect actual &&
-	HEAD=$(git rev-parse HEAD) &&
-	GIT_EDITOR="\"$(pwd)/fake-editor.sh\"" EDITOR_TEXT="pick $HEAD" \
-		git rebase -i HEAD^ &&
-	echo submodule >expect &&
-	git diff --name-only >actual &&
-	test_cmp expect actual
+Note: switching to 'HEAD~'.
 
-pick 81a011672801a6d53f73688ebde4d518274102e6
-Successfully rebased and updated refs/heads/master.
-ok 3 - interactive rebase with a dirty submodule
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7402.4 'rebase with dirty file and submodule fails': 
+If you want to 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 yet another line >> file &&
-	test_tick &&
-	git commit -m next file &&
-	echo rewrite > file &&
-	test_tick &&
-	git commit -m rewrite file &&
-	echo dirty > file &&
-	test_must_fail git rebase --onto HEAD~2 HEAD^
+  git switch -c <new-branch-name>
 
+Or undo this operation with:
 
-[master 260764e] next
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 63179b5] rewrite
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-error: cannot rebase: You have unstaged changes.
-error: Please commit or stash them.
-ok 4 - rebase with dirty file and submodule fails
+  git switch -
 
-expecting success of 7402.5 'stash with a dirty submodule': 
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	echo new > file &&
-	CURRENT=$(cd submodule && git rev-parse HEAD) &&
-	git stash &&
-	test new != $(cat file) &&
-	echo submodule >expect &&
-	git diff --name-only >actual &&
-	test_cmp expect actual &&
+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
 
-	echo "$CURRENT" >expect &&
-	git -C submodule rev-parse HEAD >actual &&
-	test_cmp expect actual &&
+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
 
-	git stash apply &&
-	test new = $(cat file) &&
-	echo "$CURRENT" >expect &&
-	git -C submodule rev-parse HEAD >actual &&
-	test_cmp expect 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.
 
-Saved working directory and index state WIP on master: 63179b5 rewrite
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   file
-	modified:   submodule (new commits)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	fake-editor.sh
+  git switch -c <new-branch-name>
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 5 - stash with a dirty submodule
+Or undo this operation with:
 
-expecting success of 7402.6 'rebasing submodule that should conflict': 
-	git reset --hard &&
-	git checkout added-submodule &&
-	git add submodule &&
-	test_tick &&
-	git commit -m third &&
-	(
-		cd submodule &&
-		git commit --allow-empty -m extra
-	) &&
-	git add submodule &&
-	test_tick &&
-	git commit -m fourth &&
+  git switch -
 
-	test_must_fail git rebase --onto HEAD^^ HEAD^ HEAD^0 2>actual_output &&
-	git ls-files -s submodule >actual &&
-	(
-		cd submodule &&
-		echo "160000 $(git rev-parse HEAD^) 1	submodule" &&
-		echo "160000 $(git rev-parse HEAD^^) 2	submodule" &&
-		echo "160000 $(git rev-parse HEAD) 3	submodule"
-	) >expect &&
-	test_cmp expect actual &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-    then
-		sub_expect="go to submodule (submodule), and either merge commit $(git -C submodule rev-parse --short HEAD^0)" &&
-		grep "$sub_expect" actual_output
-	fi
+Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 63179b5 rewrite
-Switched to branch 'added-submodule'
-M	submodule
-[added-submodule 3e80a7a] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 7d89a17] extra
+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.47.2/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>
-[added-submodule b58fe73] fourth
+ 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, 1 insertion(+), 1 deletion(-)
-Failed to merge submodule submodule (commits don't follow merge-base)
-CONFLICT (submodule): Merge conflict in submodule
-hint:  - go to submodule (submodule), and either merge commit 7d89a17
-ok 6 - rebasing submodule that should conflict
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename one/file => one (100%)
+ok 55 - setup worktree for non-symlink test
 
-# passed all 6 test(s)
-1..6
+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.47.2/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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6423-merge-rename-directories.sh ***
@@ -455041,5415 +459720,1719 @@
 [B 9d3c6b5] B
  Author: A U Thor <author@example.com>
  5 files changed, 5 insertions(+)
- create mode 100644 node2/leaf6
- rename {node1 => node2/node1}/leaf1 (75%)
- rename {node1 => node2/node1}/leaf2 (75%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 c671e72 A
-Path updated: node2/leaf6 added in B^0 inside a directory that was renamed in HEAD; moving it to node1/node2/leaf6.
-Path updated: node1/leaf1 renamed to node2/node1/leaf1 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf1.
-Auto-merging node1/node2/node1/leaf1
-CONFLICT (content): Merge conflict in node1/node2/node1/leaf1
-Path updated: node1/leaf2 renamed to node2/node1/leaf2 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf2.
-Auto-merging node1/node2/node1/leaf2
-CONFLICT (content): Merge conflict in node1/node2/node1/leaf2
-Path updated: node1/leaf5 added in HEAD inside a directory that was renamed in B^0; moving it to node2/node1/leaf5.
-Path updated: node2/leaf3 renamed to node1/node2/leaf3 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf3.
-Auto-merging node2/node1/node2/leaf3
-CONFLICT (content): Merge conflict in node2/node1/node2/leaf3
-Path updated: node2/leaf4 renamed to node1/node2/leaf4 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf4.
-Auto-merging node2/node1/node2/leaf4
-CONFLICT (content): Merge conflict in node2/node1/node2/leaf4
-Automatic merge failed; fix conflicts and then commit the result.
-ok 56 - 12c2: Moving one directory hierarchy into another w/ content merge
-
-expecting success of 6423.57 '12d: Rename/merge subdir into the root, variant 1': 
-	test_setup_12d &&
-	(
-		cd 12d &&
-
-		git checkout A^0 &&
-
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-
-		git rev-parse >actual \
-			HEAD:subdir/foo.t   HEAD:bar.t &&
-		git rev-parse >expect \
-			O:a/b/subdir/foo.t  B:a/b/bar.t &&
-		test_cmp expect actual &&
-
-		git hash-object bar.t >actual &&
-		git rev-parse B:a/b/bar.t >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:a/b/subdir/foo.t &&
-		test_must_fail git rev-parse HEAD:a/b/bar.t &&
-		test_path_is_missing a/ &&
-		test_path_is_file bar.t
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12d/.git/
-[master (root-commit) eb8da02] a/b/subdir/foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/b/subdir/foo.t
-Switched to branch 'A'
-[A 65a80b8] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {a/b/subdir => subdir}/foo.t (100%)
-Switched to branch 'B'
-[B f100ab2] a/b/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/b/bar.t
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 65a80b8 A
-Path updated: a/b/bar.t added in B^0 inside a directory that was renamed in HEAD; moving it to bar.t.
-Merge made by the 'ort' strategy.
- bar.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-fatal: path 'a/b/subdir/foo.t' does not exist in 'HEAD'
-HEAD:a/b/subdir/foo.t
-fatal: path 'a/b/bar.t' does not exist in 'HEAD'
-HEAD:a/b/bar.t
-ok 57 - 12d: Rename/merge subdir into the root, variant 1
-
-expecting success of 6423.58 '12e: Rename/merge subdir into the root, variant 2': 
-	test_setup_12e &&
-	(
-		cd 12e &&
-
-		git checkout A^0 &&
-
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-
-		git rev-parse >actual \
-			HEAD:foo.t   HEAD:bar.t &&
-		git rev-parse >expect \
-			O:a/b/foo.t  B:a/b/bar.t &&
-		test_cmp expect actual &&
-
-		git hash-object bar.t >actual &&
-		git rev-parse B:a/b/bar.t >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:a/b/foo.t &&
-		test_must_fail git rev-parse HEAD:a/b/bar.t &&
-		test_path_is_missing a/ &&
-		test_path_is_file bar.t
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12e/.git/
-[master (root-commit) b044d92] a/b/foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/b/foo.t
-Switched to branch 'A'
-[A de696c4] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a/b/foo.t => foo.t (100%)
-Switched to branch 'B'
-[B e3eeb6b] a/b/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/b/bar.t
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 de696c4 A
-Path updated: a/b/bar.t added in B^0 inside a directory that was renamed in HEAD; moving it to bar.t.
-Merge made by the 'ort' strategy.
- bar.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-fatal: path 'a/b/foo.t' does not exist in 'HEAD'
-HEAD:a/b/foo.t
-fatal: path 'a/b/bar.t' does not exist in 'HEAD'
-HEAD:a/b/bar.t
-ok 58 - 12e: Rename/merge subdir into the root, variant 2
-
-expecting success of 6423.59 '12f: Trivial directory resolve, caching, all kinds of fun': 
-	test_setup_12f &&
-	(
-		cd 12f &&
-
-		git checkout A^0 &&
-		git branch Bmod B &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" git -c merge.directoryRenames=true rebase A Bmod &&
-
-		echo Checking the pick of B1... &&
-
-		test_must_fail git rev-parse Bmod~1:dir &&
-
-		git ls-tree -r Bmod~1 >out &&
-		test_line_count = 98 out &&
-
-		git diff --name-status A Bmod~1 >actual &&
-		q_to_tab >expect <<-\EOF &&
-		MQfolder/subdir/Makefile
-		AQfolder/subdir/newfile.c
-		MQfolder/subdir/newsubdir/e
-		AQfolder/subdir/newsubdir/newfile.py
-		MQfolder/subdir/tweaked/Makefile
-		EOF
-		test_cmp expect actual &&
-
-		# Three-way merged files
-		test_seq  2 11 >e_Merge1 &&
-		test_seq 11 21 >Makefile_TOP &&
-		test_seq 21 31 >Makefile_SUB &&
-		git hash-object >expect      \
-			e_Merge1             \
-			Makefile_TOP         \
-			Makefile_SUB         &&
-		git rev-parse >actual              \
-			Bmod~1:folder/subdir/newsubdir/e     \
-			Bmod~1:folder/subdir/Makefile        \
-			Bmod~1:folder/subdir/tweaked/Makefile &&
-		test_cmp expect actual &&
-
-		# New files showed up at the right location with right contents
-		git rev-parse >expect                \
-			B~1:dir/subdir/newfile.c            \
-			B~1:dir/subdir/newsubdir/newfile.py &&
-		git rev-parse >actual                      \
-			Bmod~1:folder/subdir/newfile.c            \
-			Bmod~1:folder/subdir/newsubdir/newfile.py &&
-		test_cmp expect actual &&
-
-		# Removed files
-		test_path_is_missing folder/subdir/tweaked/f &&
-		test_path_is_missing folder/subdir/tweaked/g &&
-
-		# Unchanged files or directories
-		git rev-parse >actual        \
-			Bmod~1:folder/subdir/a          \
-			Bmod~1:folder/subdir/b          \
-			Bmod~1:folder/subdir/c          \
-			Bmod~1:folder/subdir/d          \
-			Bmod~1:folder/unchanged         \
-			Bmod~1:folder/subdir/tweaked/h &&
-		git rev-parse >expect          \
-			O:dir/subdir/a         \
-			O:dir/subdir/b         \
-			O:dir/subdir/c         \
-			O:dir/subdir/d         \
-			O:dir/unchanged        \
-			O:dir/subdir/tweaked/h &&
-		test_cmp expect actual &&
-
-		echo Checking the pick of B2... &&
-
-		test_must_fail git rev-parse Bmod:dir &&
-
-		git ls-tree -r Bmod >out &&
-		test_line_count = 99 out &&
-
-		git diff --name-status Bmod~1 Bmod >actual &&
-		q_to_tab >expect <<-\EOF &&
-		AQfolder/subdir/newfile.rs
-		MQfolder/subdir/newsubdir/e
-		EOF
-		test_cmp expect actual &&
-
-		# Three-way merged file
-		test_seq  2 12 >e_Merge2 &&
-		git hash-object e_Merge2 >expect &&
-		git rev-parse Bmod:folder/subdir/newsubdir/e >actual &&
-		test_cmp expect actual &&
-
-		grep region_enter.*collect_merge_info trace.output >collect &&
-		test_line_count = 4 collect &&
-		grep region_enter.*process_entries$ trace.output >process &&
-		test_line_count = 2 process
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12f/.git/
-[master (root-commit) 362ed3d] O
- Author: A U Thor <author@example.com>
- 98 files changed, 127 insertions(+)
- create mode 100644 dir/subdir/Makefile
- create mode 100644 dir/subdir/a
- create mode 100644 dir/subdir/b
- create mode 100644 dir/subdir/c
- create mode 100644 dir/subdir/d
- create mode 100644 dir/subdir/e
- create mode 100644 dir/subdir/tweaked/Makefile
- create mode 100644 dir/subdir/tweaked/f
- create mode 100644 dir/subdir/tweaked/g
- create mode 100644 dir/subdir/tweaked/h
- create mode 100644 dir/unchanged/file_1
- create mode 100644 dir/unchanged/file_10
- create mode 100644 dir/unchanged/file_11
- create mode 100644 dir/unchanged/file_12
- create mode 100644 dir/unchanged/file_13
- create mode 100644 dir/unchanged/file_14
- create mode 100644 dir/unchanged/file_15
- create mode 100644 dir/unchanged/file_16
- create mode 100644 dir/unchanged/file_17
- create mode 100644 dir/unchanged/file_18
- create mode 100644 dir/unchanged/file_19
- create mode 100644 dir/unchanged/file_2
- create mode 100644 dir/unchanged/file_20
- create mode 100644 dir/unchanged/file_21
- create mode 100644 dir/unchanged/file_22
- create mode 100644 dir/unchanged/file_23
- create mode 100644 dir/unchanged/file_24
- create mode 100644 dir/unchanged/file_25
- create mode 100644 dir/unchanged/file_26
- create mode 100644 dir/unchanged/file_27
- create mode 100644 dir/unchanged/file_28
- create mode 100644 dir/unchanged/file_29
- create mode 100644 dir/unchanged/file_3
- create mode 100644 dir/unchanged/file_30
- create mode 100644 dir/unchanged/file_31
- create mode 100644 dir/unchanged/file_32
- create mode 100644 dir/unchanged/file_33
- create mode 100644 dir/unchanged/file_34
- create mode 100644 dir/unchanged/file_35
- create mode 100644 dir/unchanged/file_36
- create mode 100644 dir/unchanged/file_37
- create mode 100644 dir/unchanged/file_38
- create mode 100644 dir/unchanged/file_39
- create mode 100644 dir/unchanged/file_4
- create mode 100644 dir/unchanged/file_40
- create mode 100644 dir/unchanged/file_41
- create mode 100644 dir/unchanged/file_42
- create mode 100644 dir/unchanged/file_43
- create mode 100644 dir/unchanged/file_44
- create mode 100644 dir/unchanged/file_45
- create mode 100644 dir/unchanged/file_46
- create mode 100644 dir/unchanged/file_47
- create mode 100644 dir/unchanged/file_48
- create mode 100644 dir/unchanged/file_49
- create mode 100644 dir/unchanged/file_5
- create mode 100644 dir/unchanged/file_50
- create mode 100644 dir/unchanged/file_51
- create mode 100644 dir/unchanged/file_52
- create mode 100644 dir/unchanged/file_53
- create mode 100644 dir/unchanged/file_54
- create mode 100644 dir/unchanged/file_55
- create mode 100644 dir/unchanged/file_56
- create mode 100644 dir/unchanged/file_57
- create mode 100644 dir/unchanged/file_58
- create mode 100644 dir/unchanged/file_59
- create mode 100644 dir/unchanged/file_6
- create mode 100644 dir/unchanged/file_60
- create mode 100644 dir/unchanged/file_61
- create mode 100644 dir/unchanged/file_62
- create mode 100644 dir/unchanged/file_63
- create mode 100644 dir/unchanged/file_64
- create mode 100644 dir/unchanged/file_65
- create mode 100644 dir/unchanged/file_66
- create mode 100644 dir/unchanged/file_67
- create mode 100644 dir/unchanged/file_68
- create mode 100644 dir/unchanged/file_69
- create mode 100644 dir/unchanged/file_7
- create mode 100644 dir/unchanged/file_70
- create mode 100644 dir/unchanged/file_71
- create mode 100644 dir/unchanged/file_72
- create mode 100644 dir/unchanged/file_73
- create mode 100644 dir/unchanged/file_74
- create mode 100644 dir/unchanged/file_75
- create mode 100644 dir/unchanged/file_76
- create mode 100644 dir/unchanged/file_77
- create mode 100644 dir/unchanged/file_78
- create mode 100644 dir/unchanged/file_79
- create mode 100644 dir/unchanged/file_8
- create mode 100644 dir/unchanged/file_80
- create mode 100644 dir/unchanged/file_81
- create mode 100644 dir/unchanged/file_82
- create mode 100644 dir/unchanged/file_83
- create mode 100644 dir/unchanged/file_84
- create mode 100644 dir/unchanged/file_85
- create mode 100644 dir/unchanged/file_86
- create mode 100644 dir/unchanged/file_87
- create mode 100644 dir/unchanged/file_88
- create mode 100644 dir/unchanged/file_9
-Switched to branch 'A'
-rm 'dir/subdir/tweaked/f'
-rm 'dir/subdir/tweaked/g'
-[A 9910422] A
- Author: A U Thor <author@example.com>
- 98 files changed, 5 deletions(-)
- delete mode 100644 dir/subdir/tweaked/f
- delete mode 100644 dir/subdir/tweaked/g
- rename {dir => folder}/subdir/Makefile (90%)
- rename {dir => folder}/subdir/a (100%)
- rename {dir => folder}/subdir/b (100%)
- rename {dir => folder}/subdir/c (100%)
- rename {dir => folder}/subdir/d (100%)
- rename {dir/subdir => folder/subdir/newsubdir}/e (90%)
- rename {dir => folder}/subdir/tweaked/Makefile (90%)
- rename {dir => folder}/subdir/tweaked/h (100%)
- rename {dir => folder}/unchanged/file_1 (100%)
- rename {dir => folder}/unchanged/file_10 (100%)
- rename {dir => folder}/unchanged/file_11 (100%)
- rename {dir => folder}/unchanged/file_12 (100%)
- rename {dir => folder}/unchanged/file_13 (100%)
- rename {dir => folder}/unchanged/file_14 (100%)
- rename {dir => folder}/unchanged/file_15 (100%)
- rename {dir => folder}/unchanged/file_16 (100%)
- rename {dir => folder}/unchanged/file_17 (100%)
- rename {dir => folder}/unchanged/file_18 (100%)
- rename {dir => folder}/unchanged/file_19 (100%)
- rename {dir => folder}/unchanged/file_2 (100%)
- rename {dir => folder}/unchanged/file_20 (100%)
- rename {dir => folder}/unchanged/file_21 (100%)
- rename {dir => folder}/unchanged/file_22 (100%)
- rename {dir => folder}/unchanged/file_23 (100%)
- rename {dir => folder}/unchanged/file_24 (100%)
- rename {dir => folder}/unchanged/file_25 (100%)
- rename {dir => folder}/unchanged/file_26 (100%)
- rename {dir => folder}/unchanged/file_27 (100%)
- rename {dir => folder}/unchanged/file_28 (100%)
- rename {dir => folder}/unchanged/file_29 (100%)
- rename {dir => folder}/unchanged/file_3 (100%)
- rename {dir => folder}/unchanged/file_30 (100%)
- rename {dir => folder}/unchanged/file_31 (100%)
- rename {dir => folder}/unchanged/file_32 (100%)
- rename {dir => folder}/unchanged/file_33 (100%)
- rename {dir => folder}/unchanged/file_34 (100%)
- rename {dir => folder}/unchanged/file_35 (100%)
- rename {dir => folder}/unchanged/file_36 (100%)
- rename {dir => folder}/unchanged/file_37 (100%)
- rename {dir => folder}/unchanged/file_38 (100%)
- rename {dir => folder}/unchanged/file_39 (100%)
- rename {dir => folder}/unchanged/file_4 (100%)
- rename {dir => folder}/unchanged/file_40 (100%)
- rename {dir => folder}/unchanged/file_41 (100%)
- rename {dir => folder}/unchanged/file_42 (100%)
- rename {dir => folder}/unchanged/file_43 (100%)
- rename {dir => folder}/unchanged/file_44 (100%)
- rename {dir => folder}/unchanged/file_45 (100%)
- rename {dir => folder}/unchanged/file_46 (100%)
- rename {dir => folder}/unchanged/file_47 (100%)
- rename {dir => folder}/unchanged/file_48 (100%)
- rename {dir => folder}/unchanged/file_49 (100%)
- rename {dir => folder}/unchanged/file_5 (100%)
- rename {dir => folder}/unchanged/file_50 (100%)
- rename {dir => folder}/unchanged/file_51 (100%)
- rename {dir => folder}/unchanged/file_52 (100%)
- rename {dir => folder}/unchanged/file_53 (100%)
- rename {dir => folder}/unchanged/file_54 (100%)
- rename {dir => folder}/unchanged/file_55 (100%)
- rename {dir => folder}/unchanged/file_56 (100%)
- rename {dir => folder}/unchanged/file_57 (100%)
- rename {dir => folder}/unchanged/file_58 (100%)
- rename {dir => folder}/unchanged/file_59 (100%)
- rename {dir => folder}/unchanged/file_6 (100%)
- rename {dir => folder}/unchanged/file_60 (100%)
- rename {dir => folder}/unchanged/file_61 (100%)
- rename {dir => folder}/unchanged/file_62 (100%)
- rename {dir => folder}/unchanged/file_63 (100%)
- rename {dir => folder}/unchanged/file_64 (100%)
- rename {dir => folder}/unchanged/file_65 (100%)
- rename {dir => folder}/unchanged/file_66 (100%)
- rename {dir => folder}/unchanged/file_67 (100%)
- rename {dir => folder}/unchanged/file_68 (100%)
- rename {dir => folder}/unchanged/file_69 (100%)
- rename {dir => folder}/unchanged/file_7 (100%)
- rename {dir => folder}/unchanged/file_70 (100%)
- rename {dir => folder}/unchanged/file_71 (100%)
- rename {dir => folder}/unchanged/file_72 (100%)
- rename {dir => folder}/unchanged/file_73 (100%)
- rename {dir => folder}/unchanged/file_74 (100%)
- rename {dir => folder}/unchanged/file_75 (100%)
- rename {dir => folder}/unchanged/file_76 (100%)
- rename {dir => folder}/unchanged/file_77 (100%)
- rename {dir => folder}/unchanged/file_78 (100%)
- rename {dir => folder}/unchanged/file_79 (100%)
- rename {dir => folder}/unchanged/file_8 (100%)
- rename {dir => folder}/unchanged/file_80 (100%)
- rename {dir => folder}/unchanged/file_81 (100%)
- rename {dir => folder}/unchanged/file_82 (100%)
- rename {dir => folder}/unchanged/file_83 (100%)
- rename {dir => folder}/unchanged/file_84 (100%)
- rename {dir => folder}/unchanged/file_85 (100%)
- rename {dir => folder}/unchanged/file_86 (100%)
- rename {dir => folder}/unchanged/file_87 (100%)
- rename {dir => folder}/unchanged/file_88 (100%)
- rename {dir => folder}/unchanged/file_9 (100%)
-Switched to branch 'B'
-[B 9770da3] B1
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 dir/subdir/newfile.c
- create mode 100644 dir/subdir/newsubdir/newfile.py
-[B 0eecb62] B2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 dir/subdir/newfile.rs
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 9910422 A
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/Bmod.
-Checking the pick of B1...
-fatal: path 'dir' does not exist in 'Bmod~1'
-Bmod~1:dir
-Checking the pick of B2...
-fatal: path 'dir' does not exist in 'Bmod'
-Bmod:dir
-ok 59 - 12f: Trivial directory resolve, caching, all kinds of fun
-
-expecting success of 6423.60 '12g: Testcase with two kinds of "relevant" renames': 
-	test_setup_12g &&
-	(
-		cd 12g &&
-
-		git checkout A^0 &&
-
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
-
-		test_write_lines once upon a time there was a repo >expect &&
-		test_cmp expect newfile &&
-
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-
-		git rev-parse >actual \
-			HEAD:newdir/a  HEAD:newdir/b   HEAD:newdir/c &&
-		git rev-parse >expect \
-			B:newdir/a     B:newdir/b      A:subdir/c &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:subdir/a &&
-		test_must_fail git rev-parse HEAD:subdir/b &&
-		test_must_fail git rev-parse HEAD:subdir/c &&
-		test_path_is_missing subdir/ &&
-		test_path_is_file newdir/c
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12g/.git/
-[master (root-commit) 4f375a3] O
- Author: A U Thor <author@example.com>
- 3 files changed, 22 insertions(+)
- create mode 100644 somefile
- create mode 100644 subdir/a
- create mode 100644 subdir/b
-Switched to branch 'A'
-[A 0338b5a] A
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 subdir/c
-Switched to branch 'B'
-[B a6ab9df] B
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- rename {subdir => newdir}/a (87%)
- rename {subdir => newdir}/b (82%)
- rename somefile => newfile (82%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 0338b5a A
-Path updated: subdir/c added in HEAD inside a directory that was renamed in B^0; moving it to newdir/c.
-Auto-merging newfile
-Merge made by the 'ort' strategy.
- {subdir => newdir}/a | 1 +
- {subdir => newdir}/b | 1 +
- {subdir => newdir}/c | 0
- somefile => newfile  | 1 +
- 4 files changed, 3 insertions(+)
- rename {subdir => newdir}/a (87%)
- rename {subdir => newdir}/b (82%)
- rename {subdir => newdir}/c (100%)
- rename somefile => newfile (85%)
-fatal: path 'subdir/a' does not exist in 'HEAD'
-HEAD:subdir/a
-fatal: path 'subdir/b' does not exist in 'HEAD'
-HEAD:subdir/b
-fatal: path 'subdir/c' does not exist in 'HEAD'
-HEAD:subdir/c
-ok 60 - 12g: Testcase with two kinds of "relevant" renames
-
-checking known breakage of 6423.61 '12h: renaming a file within a renamed directory': 
-	test_setup_12h &&
-	(
-		cd 12h &&
-
-		git checkout A^0 &&
-
-		test_might_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
-
-		git ls-files >tracked &&
-		test_line_count = 2 tracked &&
-
-		test_path_is_missing olddir/a &&
-		test_path_is_file newdir/alpha &&
-		test_path_is_file newdir/b &&
-
-		git rev-parse >actual \
-			HEAD:newdir/alpha  HEAD:newdir/b &&
-		git rev-parse >expect \
-			A:newdir/a         O:oldir/b &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12h/.git/
-[master (root-commit) 94e6431] orig
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 olddir/a
- create mode 100644 olddir/b
-Switched to branch 'A'
-[A 9bdc996] A
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- rename {olddir => newdir}/a (70%)
- rename {olddir => newdir}/b (100%)
-Switched to branch 'B'
-[B bec6409] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename olddir/{a => alpha} (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 9bdc996 A
-Path updated: olddir/a renamed to olddir/alpha in B^0, inside a directory that was renamed in HEAD; moving it to newdir/alpha.
-CONFLICT (rename/rename): olddir/a renamed to newdir/a in HEAD and to newdir/alpha in B^0.
-Automatic merge failed; fix conflicts and then commit the result.
-test_line_count: line count for tracked != 2
-newdir/a
-newdir/alpha
-newdir/b
-olddir/a
-not ok 61 - 12h: renaming a file within a renamed directory # TODO known breakage
-
-expecting success of 6423.62 '12i: Directory rename causes rename-to-self': 
-	test_setup_12i &&
-	(
-		cd 12i &&
-
-		git checkout A^0 &&
-
-		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
-
-		test_path_is_missing source/subdir &&
-		test_path_is_file source/bar &&
-		test_path_is_file source/baz &&
-
-		git ls-files | uniq >tracked &&
-		test_line_count = 3 tracked &&
-
-		git status --porcelain -uno >actual &&
-		cat >expect <<-\EOF &&
-		UU source/bar
-		 M source/baz
-		EOF
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12i/.git/
-[master (root-commit) 552586d] orig
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 source/bar
- create mode 100644 source/baz
- create mode 100644 source/subdir/foo
-Switched to branch 'A'
-[A 46a9eed] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename source/{subdir => }/foo (100%)
-Switched to branch 'B'
-[B 50b462a] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename source/{ => subdir}/bar (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain 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 46a9eed A
-M	source/baz
-CONFLICT (file location): source/subdir/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to source/bar.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 62 - 12i: Directory rename causes rename-to-self
-
-expecting success of 6423.63 '12j: Directory rename to root causes rename-to-self': 
-	test_setup_12j &&
-	(
-		cd 12j &&
-
-		git checkout A^0 &&
-
-		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
-
-		test_path_is_missing subdir &&
-		test_path_is_file bar &&
-		test_path_is_file baz &&
-
-		git ls-files | uniq >tracked &&
-		test_line_count = 3 tracked &&
-
-		git status --porcelain -uno >actual &&
-		cat >expect <<-\EOF &&
-		UU bar
-		 M baz
-		EOF
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12j/.git/
-[master (root-commit) 59aeda9] orig
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 bar
- create mode 100644 baz
- create mode 100644 subdir/foo
-Switched to branch 'A'
-[A 493a8b6] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename subdir/foo => foo (100%)
-Switched to branch 'B'
-[B b7d0322] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename bar => subdir/bar (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain 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 493a8b6 A
-M	baz
-CONFLICT (file location): subdir/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to bar.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 63 - 12j: Directory rename to root causes rename-to-self
-
-expecting success of 6423.64 '12k: Directory rename with sibling causes rename-to-self': 
-	test_setup_12k &&
-	(
-		cd 12k &&
-
-		git checkout A^0 &&
-
-		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
-
-		test_path_is_missing dirB &&
-		test_path_is_file dirA/bar &&
-		test_path_is_file dirA/baz &&
-
-		git ls-files | uniq >tracked &&
-		test_line_count = 3 tracked &&
-
-		git status --porcelain -uno >actual &&
-		cat >expect <<-\EOF &&
-		UU dirA/bar
-		 M dirA/baz
-		EOF
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12k/.git/
-[master (root-commit) d90d96e] orig
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 dirA/bar
- create mode 100644 dirA/baz
- create mode 100644 dirB/foo
-Switched to branch 'A'
-[A 1e2e223] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {dirB => dirA}/foo (100%)
-Switched to branch 'B'
-[B 8f7e5e2] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {dirA => dirB}/bar (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 1e2e223 A
-M	dirA/baz
-CONFLICT (file location): dirB/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to dirA/bar.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 64 - 12k: Directory rename with sibling causes rename-to-self
-
-expecting success of 6423.65 '12l (B into A): Rename into each other + add/add conflict': 
-	test_setup_12l BintoA &&
-	(
-		cd 12l_BintoA &&
-
-		git checkout -q A^0 &&
-
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
-
-		test_stdout_line_count = 5 git ls-files -s &&
-
-		git rev-parse >actual \
-			:0:sub3/file :0:sub3/newfile :0:sub3/sub2/other \
-			:2:sub1/sub2/new_add_add_file \
-			:3:sub1/sub2/new_add_add_file &&
-		git rev-parse >expect \
-			O:sub1/file  B:sub1/newfile O:sub2/other \
-			A:sub2/new_add_add_file \
-			B:sub1/sub2/new_add_add_file &&
-		test_cmp expect actual &&
-
-		git ls-files -o >actual &&
-		test_write_lines actual expect >expect &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12l_BintoA/.git/
-[master (root-commit) 3d69f53] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 sub1/file
- create mode 100644 sub2/other
-Switched to branch 'A'
-[A e3180ab] A
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 sub2/new_add_add_file
- rename {sub1 => sub3}/file (100%)
-Switched to branch 'B'
-[B 4fbab5b] B
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 sub1/newfile
- create mode 100644 sub1/sub2/new_add_add_file
- rename {sub2 => sub1/sub2}/other (100%)
-Path updated: sub2/new_add_add_file added in HEAD inside a directory that was renamed in B^0; moving it to sub1/sub2/new_add_add_file.
-Auto-merging sub1/sub2/new_add_add_file
-CONFLICT (add/add): Merge conflict in sub1/sub2/new_add_add_file
-Path updated: sub1/newfile added in B^0 inside a directory that was renamed in HEAD; moving it to sub3/newfile.
-Path updated: sub2/other renamed to sub1/sub2/other in B^0, inside a directory that was renamed in HEAD; moving it to sub3/sub2/other.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 65 - 12l (B into A): Rename into each other + add/add conflict
-
-expecting success of 6423.66 '12l (A into B): Rename into each other + add/add conflict': 
-	test_setup_12l AintoB &&
-	(
-		cd 12l_AintoB &&
-
-		git checkout -q B^0 &&
-
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive A^0 &&
-
-		test_stdout_line_count = 5 git ls-files -s &&
-
-		git rev-parse >actual \
-			:0:sub3/file :0:sub3/newfile :0:sub3/sub2/other \
-			:2:sub1/sub2/new_add_add_file \
-			:3:sub1/sub2/new_add_add_file &&
-		git rev-parse >expect \
-			O:sub1/file  B:sub1/newfile O:sub2/other \
-			B:sub1/sub2/new_add_add_file \
-			A:sub2/new_add_add_file &&
-		test_cmp expect actual &&
-
-		git ls-files -o >actual &&
-		test_write_lines actual expect >expect &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12l_AintoB/.git/
-[master (root-commit) 3d69f53] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 sub1/file
- create mode 100644 sub2/other
-Switched to branch 'A'
-[A e3180ab] A
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 sub2/new_add_add_file
- rename {sub1 => sub3}/file (100%)
-Switched to branch 'B'
-[B 4fbab5b] B
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 sub1/newfile
- create mode 100644 sub1/sub2/new_add_add_file
- rename {sub2 => sub1/sub2}/other (100%)
-Path updated: sub2/new_add_add_file added in A^0 inside a directory that was renamed in HEAD; moving it to sub1/sub2/new_add_add_file.
-Auto-merging sub1/sub2/new_add_add_file
-CONFLICT (add/add): Merge conflict in sub1/sub2/new_add_add_file
-Path updated: sub1/newfile added in HEAD inside a directory that was renamed in A^0; moving it to sub3/newfile.
-Path updated: sub2/other renamed to sub1/sub2/other in HEAD, inside a directory that was renamed in A^0; moving it to sub3/sub2/other.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 66 - 12l (A into B): Rename into each other + add/add conflict
-
-expecting success of 6423.67 '12m: Change parent of renamed-dir to symlink on other side': 
-	test_setup_12m &&
-	(
-		cd 12m &&
-
-		git checkout -q A^0 &&
-
-		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
-
-		test_stdout_line_count = 3 git ls-files -s &&
-		test_stdout_line_count = 2 ls -1 renamed-dir &&
-		test_path_is_missing dir
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12m/.git/
-[master (root-commit) c5527ce] O
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/subdir/file
-Switched to branch 'A'
-[A 4ee9449] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {dir => renamed-dir}/subdir/file (100%)
-Switched to branch 'B'
-rm 'dir/subdir/file'
-[B 7225d2a] B
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 120000 dir/subdir
- delete mode 100644 dir/subdir/file
-CONFLICT (file location): dir/subdir added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to renamed-dir/subdir.
-CONFLICT (rename/delete): dir/subdir/file renamed to renamed-dir/subdir/file in HEAD, but deleted in B^0.
-CONFLICT (file/directory): directory in the way of renamed-dir/subdir from B^0; moving it to renamed-dir/subdir~B^0 instead.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 67 - 12m: Change parent of renamed-dir to symlink on other side
-
-expecting success of 6423.68 '13a(conflict): messages for newly added files': 
-	test_setup_13a conflict &&
-	(
-		cd 13a_conflict &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-
-		test_grep CONFLICT..file.location.*z/e/f.added.in.B^0.*y/e/f out &&
-		test_grep CONFLICT..file.location.*z/d.added.in.B^0.*y/d out &&
-
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/[de]" paths &&
-
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d &&
-		test_path_is_missing z/e/f &&
-		test_path_is_file    y/e/f
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13a_conflict/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B aa97264] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/d
- create mode 100644 z/e/f
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 4e9f86d A
-CONFLICT (file location): z/e/f added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/e/f.
-CONFLICT (file location): z/d added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
-y/d
-y/e/f
-ok 68 - 13a(conflict): messages for newly added files
-
-expecting success of 6423.69 '13a(info): messages for newly added files': 
-	test_setup_13a info &&
-	(
-		cd 13a_info &&
-
-		git reset --hard &&
-		git checkout A^0 &&
-
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-
-		test_grep Path.updated:.*z/e/f.added.in.B^0.*y/e/f out &&
-		test_grep Path.updated:.*z/d.added.in.B^0.*y/d out &&
-
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/[de]" paths &&
-
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d &&
-		test_path_is_missing z/e/f &&
-		test_path_is_file    y/e/f
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13a_info/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B aa97264] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/d
- create mode 100644 z/e/f
-HEAD is now at aa97264 B
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 4e9f86d A
-Path updated: z/e/f added in B^0 inside a directory that was renamed in HEAD; moving it to y/e/f.
-Path updated: z/d added in B^0 inside a directory that was renamed in HEAD; moving it to y/d.
-y/d
-y/e/f
-ok 69 - 13a(info): messages for newly added files
-
-expecting success of 6423.70 '13b(conflict): messages for transitive rename with conflicted content': 
-	test_setup_13b conflict &&
-	(
-		cd 13b_conflict &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-
-		test_grep CONFLICT.*content.*Merge.conflict.in.y/d out &&
-		test_grep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
-
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/d" paths &&
-
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13b_conflict/.git/
-[master (root-commit) f84ec32] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A a2010ab] A
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B cd61ab0] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename {x => z}/d (75%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at a2010ab A
-CONFLICT (content): Merge conflict in y/d
-CONFLICT (file location): x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
-y/d
-y/d
-y/d
-ok 70 - 13b(conflict): messages for transitive rename with conflicted content
-
-expecting success of 6423.71 '13b(info): messages for transitive rename with conflicted content': 
-	test_setup_13b info &&
-	(
-		cd 13b_info &&
-
-		git reset --hard &&
-		git checkout A^0 &&
-
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-
-		test_grep CONFLICT.*content.*Merge.conflict.in.y/d out &&
-		test_grep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
-
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/d" paths &&
-
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13b_info/.git/
-[master (root-commit) f84ec32] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A a2010ab] A
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B cd61ab0] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename {x => z}/d (75%)
-HEAD is now at cd61ab0 B
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at a2010ab A
-CONFLICT (content): Merge conflict in y/d
-Path updated: x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD; moving it to y/d.
-y/d
-y/d
-y/d
-ok 71 - 13b(info): messages for transitive rename with conflicted content
-
-expecting success of 6423.72 '13c(conflict): messages for rename/rename(1to1) via transitive rename': 
-	test_setup_13c conflict &&
-	(
-		cd 13c_conflict &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-
-		test_grep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
-
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/d" paths &&
-
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13c_conflict/.git/
-[master (root-commit) 868129a] O
- Author: A U Thor <author@example.com>
- 4 files changed, 13 insertions(+)
- create mode 100644 x/d
- create mode 100644 x/e
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 230cc6a] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {x => y}/d (100%)
-Switched to branch 'B'
-[B e9512b7] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 230cc6a A
-CONFLICT (file location): x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
-y/d
-y/d
-y/d
-ok 72 - 13c(conflict): messages for rename/rename(1to1) via transitive rename
-
-expecting success of 6423.73 '13c(info): messages for rename/rename(1to1) via transitive rename': 
-	test_setup_13c info &&
-	(
-		cd 13c_info &&
-
-		git reset --hard &&
-		git checkout A^0 &&
-
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-
-		test_grep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
-
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/d" paths &&
-
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13c_info/.git/
-[master (root-commit) 868129a] O
- Author: A U Thor <author@example.com>
- 4 files changed, 13 insertions(+)
- create mode 100644 x/d
- create mode 100644 x/e
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 230cc6a] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {x => y}/d (100%)
-Switched to branch 'B'
-[B e9512b7] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-HEAD is now at e9512b7 B
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 230cc6a A
-Path updated: x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD; moving it to y/d.
-y/d
-ok 73 - 13c(info): messages for rename/rename(1to1) via transitive rename
-
-expecting success of 6423.74 '13d(conflict): messages for rename/rename(1to1) via dual transitive rename': 
-	test_setup_13d conflict &&
-	(
-		cd 13d_conflict &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-
-		test_grep CONFLICT..file.location.*a/y.renamed.to.b/y.*moved.to.d/y out &&
-		test_grep CONFLICT..file.location.*a/y.renamed.to.c/y.*moved.to.d/y out &&
-
-		git ls-files >paths &&
-		! grep b/ paths &&
-		! grep c/ paths &&
-		grep "d/y" paths &&
-
-		test_path_is_missing b/y &&
-		test_path_is_missing c/y &&
-		test_path_is_file    d/y
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13d_conflict/.git/
-[master (root-commit) c14d00a] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 a/y
- create mode 100644 a/z
- create mode 100644 b/x
- create mode 100644 c/w
-Switched to branch 'A'
-[A e246998] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {a => b}/y (100%)
- rename {c => d}/w (100%)
-Switched to branch 'B'
-[B 0624e26] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {a => c}/y (100%)
- rename {b => d}/x (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 e246998 A
-CONFLICT (file location): a/y renamed to b/y in HEAD, inside a directory that was renamed in B^0, suggesting it should perhaps be moved to d/y.
-CONFLICT (file location): a/y renamed to c/y in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to d/y.
-d/y
-d/y
-d/y
-ok 74 - 13d(conflict): messages for rename/rename(1to1) via dual transitive rename
-
-expecting success of 6423.75 '13d(info): messages for rename/rename(1to1) via dual transitive rename': 
-	test_setup_13d info &&
-	(
-		cd 13d_info &&
-
-		git reset --hard &&
-		git checkout A^0 &&
-
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-
-		test_grep Path.updated.*a/y.renamed.to.b/y.*moving.it.to.d/y out &&
-		test_grep Path.updated.*a/y.renamed.to.c/y.*moving.it.to.d/y out &&
-
-		git ls-files >paths &&
-		! grep b/ paths &&
-		! grep c/ paths &&
-		grep "d/y" paths &&
-
-		test_path_is_missing b/y &&
-		test_path_is_missing c/y &&
-		test_path_is_file    d/y
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13d_info/.git/
-[master (root-commit) c14d00a] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 a/y
- create mode 100644 a/z
- create mode 100644 b/x
- create mode 100644 c/w
-Switched to branch 'A'
-[A e246998] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {a => b}/y (100%)
- rename {c => d}/w (100%)
-Switched to branch 'B'
-[B 0624e26] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {a => c}/y (100%)
- rename {b => d}/x (100%)
-HEAD is now at 0624e26 B
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 e246998 A
-Path updated: a/y renamed to b/y in HEAD, inside a directory that was renamed in B^0; moving it to d/y.
-Path updated: a/y renamed to c/y in B^0, inside a directory that was renamed in HEAD; moving it to d/y.
-d/y
-ok 75 - 13d(info): messages for rename/rename(1to1) via dual transitive rename
-
-expecting success of 6423.76 '13e: directory rename detection in recursive case': 
-	test_setup_13e &&
-	(
-		cd 13e &&
-
-		git checkout --quiet D^0 &&
-
-		git -c merge.directoryRenames=conflict merge -s recursive C^0 >out 2>err &&
-
-		test_grep ! CONFLICT out &&
-		test_grep ! BUG: err &&
-		test_grep ! core.dumped err &&
-		test_must_be_empty err &&
-
-		git ls-files >paths &&
-		! grep a/x paths &&
-		grep b/x paths
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13e/.git/
-[master (root-commit) 3de9c0f] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a/y
- create mode 100644 a/z
-Switched to branch 'A'
-[A 8654583] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {a => b}/y (100%)
- rename {a => b}/z (100%)
-Switched to branch 'B'
-[B 4f343f5] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/x
-Switched to branch 'C'
-CONFLICT (file location): a/x added in B inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to b/x.
-Automatic merge failed; fix conflicts and then commit the result.
-[C 95c9ae8] C
- Author: A U Thor <author@example.com>
-Switched to branch 'D'
-CONFLICT (file location): a/x added in HEAD inside a directory that was renamed in A, suggesting it should perhaps be moved to b/x.
-Automatic merge failed; fix conflicts and then commit the result.
-[D e07996f] D
- Author: A U Thor <author@example.com>
-b/x
-ok 76 - 13e: directory rename detection in recursive case
-
-# still have 2 known breakage(s)
-# passed all remaining 74 test(s)
-1..76
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7201-co.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7201-co/.git/
-expecting success of 7201.1 'setup': 
-	fill x y z >same &&
-	fill 1 2 3 4 5 6 7 8 >one &&
-	fill a b c d e >two &&
-	git add same one two &&
-	git commit -m "Initial A one, A two" &&
-
-	git checkout -b renamer &&
-	rm -f one &&
-	fill 1 3 4 5 6 7 8 >uno &&
-	git add uno &&
-	fill a b c d e f >two &&
-	git commit -a -m "Renamer R one->uno, M two" &&
-
-	git checkout -b side main &&
-	fill 1 2 3 4 5 6 7 >one &&
-	fill A B C D E >three &&
-	rm -f two &&
-	git update-index --add --remove one two three &&
-	git commit -m "Side M one, D two, A three" &&
-
-	git checkout -b simple main &&
-	rm -f one &&
-	fill a c e >two &&
-	git commit -a -m "Simple D one, M two" &&
-
-	git checkout main
-
-[main (root-commit) 7329388] Initial A one, A two
- Author: A U Thor <author@example.com>
- 3 files changed, 16 insertions(+)
- create mode 100644 one
- create mode 100644 same
- create mode 100644 two
-Switched to a new branch 'renamer'
-[renamer 0420b41] Renamer R one->uno, M two
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename one => uno (87%)
-Switched to a new branch 'side'
-[side ab76817] Side M one, D two, A three
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+), 6 deletions(-)
- create mode 100644 three
- delete mode 100644 two
-Switched to a new branch 'simple'
-[simple 022ff9d] Simple D one, M two
- Author: A U Thor <author@example.com>
- 2 files changed, 10 deletions(-)
- delete mode 100644 one
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 7201.2 'checkout from non-existing branch': 
-	git checkout -b delete-me main &&
-	git update-ref -d --no-deref refs/heads/delete-me &&
-	test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
-	git checkout main &&
-	test refs/heads/main = "$(git symbolic-ref HEAD)"
-
-Switched to a new branch 'delete-me'
-Switched to branch 'main'
-ok 2 - checkout from non-existing branch
-
-expecting success of 7201.3 'checkout with dirty tree without -m': 
-	fill 0 1 2 3 4 5 6 7 8 >one &&
-	if git checkout side
-	then
-		echo Not happy
-		false
-	else
-		echo "happy - failed correctly"
-	fi
-
-error: Your local changes to the following files would be overwritten by checkout:
-	one
-Please commit your changes or stash them before you switch branches.
-Aborting
-happy - failed correctly
-ok 3 - checkout with dirty tree without -m
-
-expecting success of 7201.4 'checkout with unrelated dirty tree without -m': 
-	git checkout -f main &&
-	fill 0 1 2 3 4 5 6 7 8 >same &&
-	cp same kept &&
-	git checkout side >messages &&
-	test_cmp same kept &&
-	printf "M\t%s\n" same >messages.expect &&
-	test_cmp messages.expect messages
-
-Already on 'main'
-Switched to branch 'side'
-ok 4 - checkout with unrelated dirty tree without -m
-
-expecting success of 7201.5 'checkout -m with dirty tree': 
-	git checkout -f main &&
-	git clean -f &&
-
-	fill 0 1 2 3 4 5 6 7 8 >one &&
-	git checkout -m side >messages &&
-
-	test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
-
-	printf "M\t%s\n" one >expect.messages &&
-	test_cmp expect.messages messages &&
-
-	fill "M	one" "A	three" "D	two" >expect.main &&
-	git diff --name-status main >current.main &&
-	test_cmp expect.main current.main &&
-
-	fill "M	one" >expect.side &&
-	git diff --name-status side >current.side &&
-	test_cmp expect.side current.side &&
-
-	git diff --cached >current.index &&
-	test_must_be_empty current.index
-
-Switched to branch 'main'
-Removing kept
-Removing messages
-Removing messages.expect
-Switched to branch 'side'
-ok 5 - checkout -m with dirty tree
-
-expecting success of 7201.6 'checkout -m with dirty tree, renamed': 
-	git checkout -f main && git clean -f &&
-
-	fill 1 2 3 4 5 7 8 >one &&
-	if git checkout renamer
-	then
-		echo Not happy
-		false
-	else
-		echo "happy - failed correctly"
-	fi &&
-
-	git checkout -m renamer &&
-	fill 1 3 4 5 7 8 >expect &&
-	test_cmp expect uno &&
-	! test -f one &&
-	git diff --cached >current &&
-	test_must_be_empty current
-
-Switched to branch 'main'
-Removing current.index
-Removing current.main
-Removing current.side
-Removing expect.main
-Removing expect.messages
-Removing expect.side
-Removing messages
-error: Your local changes to the following files would be overwritten by checkout:
-	one
-Please commit your changes or stash them before you switch branches.
-Aborting
-happy - failed correctly
-Switched to branch 'renamer'
-M	uno
-ok 6 - checkout -m with dirty tree, renamed
-
-expecting success of 7201.7 'checkout -m with merge conflict': 
-	git checkout -f main && git clean -f &&
-
-	fill 1 T 3 4 5 6 S 8 >one &&
-	if git checkout renamer
-	then
-		echo Not happy
-		false
-	else
-		echo "happy - failed correctly"
-	fi &&
-
-	git checkout -m renamer &&
-
-	git diff main:one :3:uno |
-	sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
-	fill d2 aT d7 aS >expect &&
-	test_cmp expect current &&
-	git diff --cached two >current &&
-	test_must_be_empty current
-
-Switched to branch 'main'
-Removing current
-Removing expect
-error: Your local changes to the following files would be overwritten by checkout:
-	one
-Please commit your changes or stash them before you switch branches.
-Aborting
-happy - failed correctly
-Switched to branch 'renamer'
-M	uno
-ok 7 - checkout -m with merge conflict
-
-expecting success of 7201.8 'format of merge conflict from checkout -m': 
-	git checkout -f main &&
-	git clean -f &&
-
-	fill b d >two &&
-	git checkout -m simple &&
-
-	git ls-files >current &&
-	fill same two two two >expect &&
-	test_cmp expect current &&
-
-	cat <<-EOF >expect &&
-	<<<<<<< simple
-	a
-	c
-	e
-	=======
-	b
-	d
-	>>>>>>> local
-	EOF
-	test_cmp expect two
-
-Switched to branch 'main'
-Removing current
-Removing expect
-Switched to branch 'simple'
-M	two
-ok 8 - format of merge conflict from checkout -m
-
-expecting success of 7201.9 'checkout --merge --conflict=diff3 <branch>': 
-	git checkout -f main &&
-	git reset --hard &&
-	git clean -f &&
-
-	fill b d >two &&
-	git checkout --merge --conflict=diff3 simple &&
-
-	cat <<-EOF >expect &&
-	<<<<<<< simple
-	a
-	c
-	e
-	||||||| main
-	a
-	b
-	c
-	d
-	e
-	=======
-	b
-	d
-	>>>>>>> local
-	EOF
-	test_cmp expect two
-
-Switched to branch 'main'
-HEAD is now at 7329388 Initial A one, A two
-Removing current
-Removing expect
-Switched to branch 'simple'
-M	two
-ok 9 - checkout --merge --conflict=diff3 <branch>
-
-expecting success of 7201.10 'switch to another branch while carrying a deletion': 
-	git checkout -f main &&
-	git reset --hard &&
-	git clean -f &&
-	git rm two &&
-
-	test_must_fail git checkout simple 2>errs &&
-	test_grep overwritten errs &&
-
-	test_must_fail git read-tree --quiet -m -u HEAD simple 2>errs &&
-	test_must_be_empty errs
-
-Switched to branch 'main'
-HEAD is now at 7329388 Initial A one, A two
-Removing expect
-rm 'two'
-error: Your local changes to the following files would be overwritten by checkout:
-ok 10 - switch to another branch while carrying a deletion
-
-expecting success of 7201.11 'checkout to detach HEAD (with advice declined)': 
-	git config advice.detachedHead false &&
-	rev=$(git rev-parse --short renamer^) &&
-	git checkout -f renamer &&
-	git clean -f &&
-	git checkout renamer^ 2>messages &&
-	test_grep "HEAD is now at $rev" messages &&
-	test_line_count = 1 messages &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
-
-Switched to branch 'renamer'
-Removing errs
-HEAD is now at 7329388 Initial A one, A two
-ok 11 - checkout to detach HEAD (with advice declined)
-
-expecting success of 7201.12 'checkout to detach HEAD': 
-	git config advice.detachedHead true &&
-	rev=$(git rev-parse --short renamer^) &&
-	git checkout -f renamer &&
-	git clean -f &&
-	git checkout renamer^ 2>messages &&
-	grep "HEAD is now at $rev" messages &&
-	test_line_count -gt 1 messages &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
-
-Previous HEAD position was 7329388 Initial A one, A two
-Switched to branch 'renamer'
-Removing messages
-HEAD is now at 7329388 Initial A one, A two
-ok 12 - checkout to detach HEAD
-
-expecting success of 7201.13 'checkout to detach HEAD with branchname^': 
-	git checkout -f main &&
-	git clean -f &&
-	git checkout renamer^ &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
-
-Switched to branch 'main'
-Removing messages
-Note: switching to 'renamer^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 7329388 Initial A one, A two
-ok 13 - checkout to detach HEAD with branchname^
-
-expecting success of 7201.14 'checkout to detach HEAD with :/message': 
-	git checkout -f main &&
-	git clean -f &&
-	git checkout ":/Initial" &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
-
-Switched to branch 'main'
-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 7329388 Initial A one, A two
-ok 14 - checkout to detach HEAD with :/message
-
-expecting success of 7201.15 'checkout to detach HEAD with HEAD^0': 
-	git checkout -f main &&
-	git clean -f &&
-	git checkout HEAD^0 &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
-
-Switched to branch 'main'
-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 7329388 Initial A one, A two
-ok 15 - checkout to detach HEAD with HEAD^0
-
-expecting success of 7201.16 'checkout with ambiguous tag/branch names': 
-	git tag both side &&
-	git branch both main &&
-	git reset --hard &&
-	git checkout main &&
-
-	git checkout both &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	name=$(git symbolic-ref HEAD 2>/dev/null) &&
-	test "z$name" = zrefs/heads/both
-
-HEAD is now at 7329388 Initial A one, A two
-Switched to branch 'main'
-warning: refname 'both' is ambiguous.
-Switched to branch 'both'
-ok 16 - checkout with ambiguous tag/branch names
-
-expecting success of 7201.17 'checkout with ambiguous tag/branch names': 
-	git reset --hard &&
-	git checkout main &&
-
-	git tag frotz side &&
-	git branch frotz main &&
-	git reset --hard &&
-	git checkout main &&
-
-	git checkout tags/frotz &&
-	H=$(git rev-parse --verify HEAD) &&
-	S=$(git show-ref -s --verify refs/heads/side) &&
-	test "z$H" = "z$S" &&
-	if name=$(git symbolic-ref HEAD 2>/dev/null)
-	then
-		echo "Bad -- should have detached"
-		false
-	else
-		: happy
-	fi
-
-HEAD is now at 7329388 Initial A one, A two
-Switched to branch 'main'
-HEAD is now at 7329388 Initial A one, A two
-Already on 'main'
-Note: switching to 'tags/frotz'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 ab76817 Side M one, D two, A three
-ok 17 - checkout with ambiguous tag/branch names
-
-expecting success of 7201.18 'switch branches while in subdirectory': 
-	git reset --hard &&
-	git checkout main &&
-
-	mkdir subs &&
-	git -C subs checkout side &&
-	! test -f subs/one &&
-	rm -fr subs
-
-HEAD is now at ab76817 Side M one, D two, A three
-Previous HEAD position was ab76817 Side M one, D two, A three
-Switched to branch 'main'
-Switched to branch 'side'
-ok 18 - switch branches while in subdirectory
-
-expecting success of 7201.19 'checkout specific path while in subdirectory': 
-	git reset --hard &&
-	git checkout side &&
-	mkdir subs &&
-	>subs/bero &&
-	git add subs/bero &&
-	git commit -m "add subs/bero" &&
-
-	git checkout main &&
-	mkdir -p subs &&
-	git -C subs checkout side -- bero &&
-	test -f subs/bero
-
-HEAD is now at ab76817 Side M one, D two, A three
-Already on 'side'
-[side bb04aa0] add subs/bero
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 subs/bero
-Switched to branch 'main'
-ok 19 - checkout specific path while in subdirectory
-
-expecting success of 7201.20 'checkout w/--track sets up tracking': 
-	git config branch.autosetupmerge false &&
-	git checkout main &&
-	git checkout --track -b track1 &&
-	test "$(git config branch.track1.remote)" &&
-	test "$(git config branch.track1.merge)"
-
-Already on 'main'
-A	subs/bero
-Switched to a new branch 'track1'
-A	subs/bero
-branch 'track1' set up to track 'main'.
-ok 20 - checkout w/--track sets up tracking
-
-expecting success of 7201.21 'checkout w/autosetupmerge=always sets up tracking': 
-	test_when_finished git config branch.autosetupmerge false &&
-	git config branch.autosetupmerge always &&
-	git checkout main &&
-	git checkout -b track2 &&
-	test "$(git config branch.track2.remote)" &&
-	test "$(git config branch.track2.merge)"
-
-Switched to branch 'main'
-A	subs/bero
-Switched to a new branch 'track2'
-branch 'track2' set up to track 'main'.
-ok 21 - checkout w/autosetupmerge=always sets up tracking
-
-expecting success of 7201.22 'checkout w/--track from non-branch HEAD fails': 
-	git checkout main^0 &&
-	test_must_fail git symbolic-ref HEAD &&
-	test_must_fail git checkout --track -b track &&
-	test_must_fail git rev-parse --verify track &&
-	test_must_fail git symbolic-ref HEAD &&
-	test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
-
-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 7329388 Initial A one, A two
-A	subs/bero
-fatal: ref HEAD is not a symbolic ref
-fatal: cannot set up tracking information; starting point 'HEAD' is not a branch
-A	subs/bero
-fatal: Needed a single revision
-fatal: ref HEAD is not a symbolic ref
-ok 22 - checkout w/--track from non-branch HEAD fails
-
-expecting success of 7201.23 'checkout w/--track from tag fails': 
-	git checkout main^0 &&
-	test_must_fail git symbolic-ref HEAD &&
-	test_must_fail git checkout --track -b track frotz &&
-	test_must_fail git rev-parse --verify track &&
-	test_must_fail git symbolic-ref HEAD &&
-	test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
-
-HEAD is now at 7329388 Initial A one, A two
-A	subs/bero
-fatal: ref HEAD is not a symbolic ref
-warning: refname 'frotz' is ambiguous.
-warning: refname 'frotz' is ambiguous.
-fatal: ambiguous object name: 'frotz'
-A	subs/bero
-fatal: Needed a single revision
-fatal: ref HEAD is not a symbolic ref
-ok 23 - checkout w/--track from tag fails
-
-expecting success of 7201.24 'detach a symbolic link HEAD': 
-	git checkout main &&
-	git config --bool core.prefersymlinkrefs yes &&
-	git checkout side &&
-	git checkout main &&
-	it=$(git symbolic-ref HEAD) &&
-	test "z$it" = zrefs/heads/main &&
-	here=$(git rev-parse --verify refs/heads/main) &&
-	git checkout side^ &&
-	test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
-
-Switched to branch 'main'
-A	subs/bero
-Switched to branch 'side'
-Switched to branch 'main'
-Note: switching to '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.
-
-If you want to create a new branch to retain 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 ab76817 Side M one, D two, A three
-ok 24 - detach a symbolic link HEAD
-
-expecting success of 7201.25 'checkout with --track fakes a sensible -b <name>': 
-	git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
-	git update-ref refs/remotes/origin/koala/bear renamer &&
-
-	git checkout --track origin/koala/bear &&
-	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
-
-	git checkout main && git branch -D koala/bear &&
-
-	git checkout --track refs/remotes/origin/koala/bear &&
-	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
-
-	git checkout main && git branch -D koala/bear &&
-
-	git checkout --track remotes/origin/koala/bear &&
-	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
-
-Previous HEAD position was ab76817 Side M one, D two, A three
-Switched to a new branch 'koala/bear'
-branch 'koala/bear' set up to track 'origin/koala/bear'.
-Switched to branch 'main'
-Deleted branch koala/bear (was 0420b41).
-Switched to a new branch 'koala/bear'
-branch 'koala/bear' set up to track 'origin/koala/bear'.
-Switched to branch 'main'
-Deleted branch koala/bear (was 0420b41).
-Switched to a new branch 'koala/bear'
-branch 'koala/bear' set up to track 'origin/koala/bear'.
-ok 25 - checkout with --track fakes a sensible -b <name>
-
-expecting success of 7201.26 'checkout with --track, but without -b, fails with too short tracked name': 
-	test_must_fail git checkout --track renamer
-
-fatal: missing branch name; try -b
-ok 26 - checkout with --track, but without -b, fails with too short tracked name
-
-expecting success of 7201.27 'checkout an unmerged path should fail': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	test_must_fail git checkout fild file filf &&
-	test_cmp sample fild &&
-	test_cmp sample filf &&
-	test_cmp sample file
-
-error: path 'file' is unmerged
-ok 27 - checkout an unmerged path should fail
-
-expecting success of 7201.28 'checkout with an unmerged path can be ignored': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout -f fild file filf &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp sample file
-
-warning: path 'file' is unmerged
-Updated 2 paths from the index
-ok 28 - checkout with an unmerged path can be ignored
-
-expecting success of 7201.29 'checkout unmerged stage': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout --ours . &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp expect file &&
-	git checkout --theirs file &&
-	test ztheirside = "z$(cat file)"
-
-Updated 3 paths from the index
-Updated 1 path from the index
-ok 29 - checkout unmerged stage
-
-expecting success of 7201.30 'checkout --ours is incompatible with switching': 
-	test_must_fail git checkout --ours 2>error &&
-	test_grep "needs the paths to check out" error &&
-
-	test_must_fail git checkout --ours HEAD 2>error &&
-	test_grep "cannot be used with switching" error &&
-
-	test_must_fail git checkout --ours main 2>error &&
-	test_grep "cannot be used with switching" error &&
-
-	git checkout --ours file
-
-fatal: '--ours/--theirs' needs the paths to check out
-fatal: '--ours/--theirs' cannot be used with switching branches
-fatal: '--ours/--theirs' cannot be used with switching branches
-Updated 1 path from the index
-ok 30 - checkout --ours is incompatible with switching
-
-expecting success of 7201.31 'checkout path with --merge from tree-ish is a no-no': 
-	setup_conflicting_index &&
-	test_must_fail git checkout -m HEAD -- file
-
-fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
-ok 31 - checkout path with --merge from tree-ish is a no-no
-
-expecting success of 7201.32 'checkout with --merge': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout -m -- fild file filf &&
-	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
-
-ok 32 - checkout with --merge
-
-expecting success of 7201.33 'checkout -m works after (mistaken) resolution': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	# resolve to something
-	git add file &&
-	git checkout --merge -- fild file filf &&
-	{
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	} >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
-
-ok 33 - checkout -m works after (mistaken) resolution
-
-expecting success of 7201.34 'checkout -m works after (mistaken) resolution to remove': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	# resolve to remove
-	git rm file &&
-	git checkout --merge -- fild file filf &&
-	{
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	} >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
-
-rm 'file'
-ok 34 - checkout -m works after (mistaken) resolution to remove
-
-expecting success of 7201.35 'checkout with --merge, in diff3 -m style': 
-	git config merge.conflictstyle diff3 &&
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout -m -- fild file filf &&
-	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "||||||| base" &&
-		echo original &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
-
-ok 35 - checkout with --merge, in diff3 -m style
-
-expecting success of 7201.36 'checkout --conflict=merge, overriding config': 
-	git config merge.conflictstyle diff3 &&
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout --conflict=merge -- fild file filf &&
-	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
-
-ok 36 - checkout --conflict=merge, overriding config
-
-expecting success of 7201.37 'checkout --conflict=diff3': 
-	test_unconfig merge.conflictstyle &&
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout --conflict=diff3 -- fild file filf &&
-	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "||||||| base" &&
-		echo original &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
-
-ok 37 - checkout --conflict=diff3
-
-expecting success of 7201.38 'checkout --conflict=diff3 --no-conflict does not merge': 
-	setup_conflicting_index &&
-	echo "none of the above" >expect &&
-	cat expect >fild &&
-	cat expect >file &&
-	test_must_fail git checkout --conflict=diff3 --no-conflict -- fild file 2>err &&
-	test_cmp expect file &&
-	test_cmp expect fild &&
-	echo "error: path ${SQ}file${SQ} is unmerged" >expect &&
-	test_cmp expect err
-
-ok 38 - checkout --conflict=diff3 --no-conflict does not merge
-
-expecting success of 7201.39 'checkout --conflict=diff3 --no-merge does not merge': 
-	setup_conflicting_index &&
-	echo "none of the above" >expect &&
-	cat expect >fild &&
-	cat expect >file &&
-	test_must_fail git checkout --conflict=diff3 --no-merge -- fild file 2>err &&
-	test_cmp expect file &&
-	test_cmp expect fild &&
-	echo "error: path ${SQ}file${SQ} is unmerged" >expect &&
-	test_cmp expect err
-
-ok 39 - checkout --conflict=diff3 --no-merge does not merge
-
-expecting success of 7201.40 'checkout --no-merge --conflict=diff3 does merge': 
-	setup_conflicting_index &&
-	echo "none of the above" >fild &&
-	echo "none of the above" >file &&
-	git checkout --no-merge --conflict=diff3 -- fild file &&
-	echo "ourside" >expect &&
-	test_cmp expect fild &&
-	cat >expect <<-\EOF &&
-	<<<<<<< ours
-	ourside
-	||||||| base
-	original
-	=======
-	theirside
-	>>>>>>> theirs
-	EOF
-	test_cmp expect file
-
-ok 40 - checkout --no-merge --conflict=diff3 does merge
-
-expecting success of 7201.41 'checkout --merge --conflict=diff3 --no-conflict does merge': 
-	setup_conflicting_index &&
-	echo "none of the above" >fild &&
-	echo "none of the above" >file &&
-	git checkout --merge --conflict=diff3 --no-conflict -- fild file &&
-	echo "ourside" >expect &&
-	test_cmp expect fild &&
-	cat >expect <<-\EOF &&
-	<<<<<<< ours
-	ourside
-	=======
-	theirside
-	>>>>>>> theirs
-	EOF
-	test_cmp expect file
-
-ok 41 - checkout --merge --conflict=diff3 --no-conflict does merge
-
-expecting success of 7201.42 'checkout with invalid conflict style': 
-	test_must_fail git checkout --conflict=bad 2>actual -- file &&
-	echo "error: unknown conflict style ${SQ}bad${SQ}" >expect &&
-	test_cmp expect actual
-
-ok 42 - checkout with invalid conflict style
-
-expecting success of 7201.43 'failing checkout -b should not break working tree': 
-	git clean -fd &&  # Remove untracked files in the way
-	git reset --hard main &&
-	git symbolic-ref HEAD refs/heads/main &&
-	test_must_fail git checkout -b renamer side^ &&
-	test $(git symbolic-ref HEAD) = refs/heads/main &&
-	git diff --exit-code &&
-	git diff --cached --exit-code
-
-Removing actual
-Removing err
-Removing error
-Removing expect
-Removing merged
-Removing same
-Removing sample
-Removing two
-Removing uno
-HEAD is now at 7329388 Initial A one, A two
-fatal: a branch named 'renamer' already exists
-ok 43 - failing checkout -b should not break working tree
-
-expecting success of 7201.44 'switch out of non-branch': 
-	git reset --hard main &&
-	git checkout main^0 &&
-	echo modified >one &&
-	test_must_fail git checkout renamer 2>error.log &&
-	! grep "^Previous HEAD" error.log
-
-HEAD is now at 7329388 Initial A one, A two
-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 7329388 Initial A one, A two
-ok 44 - switch out of non-branch
-
-expecting success of 7201.45 'custom merge driver with checkout -m': 
-	git reset --hard &&
-
-	git config merge.filfre.driver "./filfre.sh %O %A %B" &&
-	git config merge.filfre.name "Feel-free merge driver" &&
-	git config merge.filfre.recursive binary &&
-	echo "arm merge=filfre" >.gitattributes &&
-
-	git checkout -b left &&
-	echo neutral >arm &&
-	git add arm .gitattributes &&
-	test_tick &&
-	git commit -m neutral &&
-	git branch right &&
-
-	echo left >arm &&
-	test_tick &&
-	git commit -a -m left &&
-	git checkout right &&
-
-	echo right >arm &&
-	test_tick &&
-	git commit -a -m right &&
-
-	test_must_fail git merge left &&
-	(
-		for t in filfre-common left right
-		do
-			grep $t arm || exit 1
-		done
-	) &&
-
-	mv arm expect &&
-	git checkout -m arm &&
-	test_cmp expect arm
-
-HEAD is now at 7329388 Initial A one, A two
-Switched to a new branch 'left'
-[left b257dc6] neutral
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 arm
-[left 2459c9d] left
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'right'
-[right 6b476b9] right
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging arm
-CONFLICT (content): Merge conflict in arm
-Automatic merge failed; fix conflicts and then commit the result.
-||||||| filfre-common
-left
-right
-Recreated 1 merge conflict
-ok 45 - custom merge driver with checkout -m
-
-expecting success of 7201.46 'tracking info copied with autoSetupMerge=inherit': 
-	git reset --hard main &&
-	# default config does not copy tracking info
-	git checkout -b foo-no-inherit koala/bear &&
-	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
-	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
-	# with autoSetupMerge=inherit, we copy tracking info from koala/bear
-	test_config branch.autoSetupMerge inherit &&
-	git checkout -b foo koala/bear &&
-	test_cmp_config origin branch.foo.remote &&
-	test_cmp_config refs/heads/koala/bear branch.foo.merge &&
-	# no tracking info to inherit from main
-	git checkout -b main2 main &&
-	test_cmp_config "" --default "" branch.main2.remote &&
-	test_cmp_config "" --default "" branch.main2.merge
-
-HEAD is now at 7329388 Initial A one, A two
-Switched to a new branch 'foo-no-inherit'
-Switched to a new branch 'foo'
-branch 'foo' set up to track 'origin/koala/bear'.
-warning: asked to inherit tracking from 'main', but no remote is set
-Switched to a new branch 'main2'
-ok 46 - tracking info copied with autoSetupMerge=inherit
-
-# passed all 46 test(s)
-1..46
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7300-clean.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/.git/
-expecting success of 7300.1 'setup': 
-
-	mkdir -p src &&
-	touch src/part1.c Makefile &&
-	echo build >.gitignore &&
-	echo \*.o >>.gitignore &&
-	git add . &&
-	git commit -m setup &&
-	touch src/part2.c README &&
-	git add .
-
-
-[master (root-commit) c1a48e2] setup
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 Makefile
- create mode 100644 src/part1.c
-ok 1 - setup
-
-expecting success of 7300.2 'git clean with skip-worktree .gitignore': 
-	git update-index --skip-worktree .gitignore &&
-	rm .gitignore &&
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so &&
-	git update-index --no-skip-worktree .gitignore &&
-	git checkout .gitignore
-
-Removing a.out
-Removing src/part3.c
-Updated 1 path from the index
-ok 2 - git clean with skip-worktree .gitignore
-
-expecting success of 7300.3 'git clean': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Removing a.out
-Removing src/part3.c
-ok 3 - git clean
-
-expecting success of 7300.4 'git clean src/': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean src/ &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Removing src/part3.c
-ok 4 - git clean src/
-
-expecting success of 7300.5 'git clean src/ src/': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean src/ src/ &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Removing src/part3.c
-ok 5 - git clean src/ src/
-
-expecting success of 7300.6 'git clean with prefix': 
-
-	mkdir -p build docs src/test &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
-	(cd src/ && git clean) &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f src/part3.c &&
-	test -f src/test/1.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Removing part3.c
-ok 6 - git clean with prefix
-
-expecting success of 7300.7 'git clean with relative prefix': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	would_clean=$(
-		cd docs &&
-		git clean -n ../src |
-		grep part3 |
-		sed -n -e "s|^Would remove ||p"
-	) &&
-	test "$would_clean" = ../src/part3.c
-
-ok 7 - git clean with relative prefix
-
-expecting success of 7300.8 'git clean with absolute path': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	would_clean=$(
-		cd docs &&
-		git clean -n "$(pwd)/../src" |
-		grep part3 |
-		sed -n -e "s|^Would remove ||p"
-	) &&
-	test "$would_clean" = ../src/part3.c
-
-ok 8 - git clean with absolute path
-
-expecting success of 7300.9 'git clean with out of work tree relative path': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	(
-		cd docs &&
-		test_must_fail git clean -n ../..
-	)
-
-fatal: ../..: '../..' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean'
-ok 9 - git clean with out of work tree relative path
-
-expecting success of 7300.10 'git clean with out of work tree absolute path': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	dd=$(cd .. && pwd) &&
-	(
-		cd docs &&
-		test_must_fail git clean -n $dd
-	)
-
-fatal: /build/reproducible-path/git-2.47.2/t: '/build/reproducible-path/git-2.47.2/t' is outside repository at '/build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean'
-ok 10 - git clean with out of work tree absolute path
-
-expecting success of 7300.11 'git clean -d with prefix and path': 
-
-	mkdir -p build docs src/feature &&
-	touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
-	(cd src/ && git clean -d feature/) &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f src/part3.c &&
-	test ! -f src/feature/file.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Removing feature/
-ok 11 - git clean -d with prefix and path
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 7300.12 'git clean symbolic link': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	ln -s docs/manual.txt src/part4.c &&
-	git clean &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test ! -f src/part4.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Removing a.out
-Removing src/part3.c
-Removing src/part4.c
-ok 12 - git clean symbolic link
-
-expecting success of 7300.13 'git clean with wildcard': 
-
-	touch a.clean b.clean other.c &&
-	git clean "*.clean" &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.clean &&
-	test ! -f b.clean &&
-	test -f other.c
-
-
-Removing a.clean
-Removing b.clean
-ok 13 - git clean with wildcard
-
-expecting success of 7300.14 'git clean -n': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -n &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove a.out
-Would remove other.c
-Would remove src/part3.c
-ok 14 - git clean -n
-
-expecting success of 7300.15 'git clean -d': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test ! -d docs &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Removing a.out
-Removing docs/
-Removing other.c
-Removing src/part3.c
-Removing src/test/
-ok 15 - git clean -d
-
-expecting success of 7300.16 'git clean -d src/ examples/': 
-
-	mkdir -p build docs examples &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
-	git clean -d src/ examples/ &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f src/part3.c &&
-	test ! -f examples/1.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Removing examples/
-Removing src/part3.c
-ok 16 - git clean -d src/ examples/
-
-expecting success of 7300.17 'git clean -x': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -x &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test ! -f obj.o &&
-	test -f build/lib.so
-
-
-Removing a.out
-Removing obj.o
-Removing src/part3.c
-ok 17 - git clean -x
-
-expecting success of 7300.18 'git clean -d -x': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -x &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test ! -d docs &&
-	test ! -f obj.o &&
-	test ! -d build
-
-
-Removing a.out
-Removing build/
-Removing docs/
-Removing obj.o
-Removing src/part3.c
-ok 18 - git clean -d -x
-
-expecting success of 7300.19 'git clean -d -x with ignored tracked directory': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -x -e src &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test -f src/part3.c &&
-	test ! -d docs &&
-	test ! -f obj.o &&
-	test ! -d build
-
-
-Removing a.out
-Removing build/
-Removing docs/
-Removing obj.o
-ok 19 - git clean -d -x with ignored tracked directory
-
-expecting success of 7300.20 'git clean -X': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -X &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test ! -f obj.o &&
-	test -f build/lib.so
-
-
-Removing obj.o
-ok 20 - git clean -X
-
-expecting success of 7300.21 'git clean -d -X': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -X &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test ! -f obj.o &&
-	test ! -d build
-
-
-Removing build/
-Removing obj.o
-ok 21 - git clean -d -X
-
-expecting success of 7300.22 'git clean -d -X with ignored tracked directory': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -X -e src &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test ! -f obj.o &&
-	test ! -d build
-
-
-Removing build/
-Removing obj.o
-Removing src/part3.c
-ok 22 - git clean -d -X with ignored tracked directory
-
-expecting success of 7300.23 'clean.requireForce defaults to true': 
-
-	git config --unset clean.requireForce &&
-	test_must_fail git clean
-
-
-fatal: clean.requireForce is true and -f not given: refusing to clean
-ok 23 - clean.requireForce defaults to true
-
-expecting success of 7300.24 'clean.requireForce': 
-
-	git config clean.requireForce true &&
-	test_must_fail git clean
-
-
-fatal: clean.requireForce is true and -f not given: refusing to clean
-ok 24 - clean.requireForce
-
-expecting success of 7300.25 'clean.requireForce and -n': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -n &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove a.out
-Would remove src/part3.c
-ok 25 - clean.requireForce and -n
-
-expecting success of 7300.26 'clean.requireForce and -f': 
-
-	git clean -f &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Removing a.out
-Removing src/part3.c
-ok 26 - clean.requireForce and -f
-
-expecting success of 7300.27 'clean.requireForce and --interactive': 
-	git clean --interactive </dev/null >output 2>error &&
-	test_grep ! "requireForce is true and" error &&
-	test_grep "\*\*\* Commands \*\*\*" output
-
-*** Commands ***
-ok 27 - clean.requireForce and --interactive
-
-expecting success of 7300.28 'core.excludesfile': 
-
-	echo excludes >excludes &&
-	echo included >included &&
-	git config core.excludesfile excludes &&
-	output=$(git clean -n excludes included 2>&1) &&
-	expr "$output" : ".*included" >/dev/null &&
-	! expr "$output" : ".*excludes" >/dev/null
-
-
-ok 28 - core.excludesfile
-
-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 7300.29 'removal failure': 
-
-	mkdir foo &&
-	touch foo/bar &&
-	test_when_finished "chmod 755 foo" &&
-	(exec <foo/bar &&
-	 chmod 0 foo &&
-	 test_must_fail git clean -f -d)
-
-warning: could not open directory 'foo/': Permission denied
-warning: failed to remove foo/: Directory not empty
-Removing docs/
-Removing error
-Removing included
-Removing output
-ok 29 - removal failure
-
-expecting success of 7300.30 'nested git work tree': 
-	rm -fr foo bar baz &&
-	mkdir -p foo bar baz/boo &&
-	(
-		cd foo &&
-		git init &&
-		test_commit nested hello.world
-	) &&
-	(
-		cd bar &&
-		>goodbye.people
-	) &&
-	(
-		cd baz/boo &&
-		git init &&
-		test_commit deeply.nested deeper.world
-	) &&
-	git clean -f -d &&
-	test -f foo/.git/index &&
-	test -f foo/hello.world &&
-	test -f baz/boo/.git/index &&
-	test -f baz/boo/deeper.world &&
-	! test -d bar
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/foo/.git/
-[master (root-commit) abd8674] nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/baz/boo/.git/
-[master (root-commit) 3f7f1fc] deeply.nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deeper.world
-Removing bar/
-Skipping repository baz/boo
-ok 30 - nested git work tree
-
-expecting success of 7300.31 'should clean things that almost look like git but are not': 
-	rm -fr almost_git almost_bare_git almost_submodule &&
-	mkdir -p almost_git/.git/objects &&
-	mkdir -p almost_git/.git/refs &&
-	cat >almost_git/.git/HEAD <<-\EOF &&
-	garbage
-	EOF
-	cp -r almost_git/.git/ almost_bare_git &&
-	mkdir almost_submodule/ &&
-	cat >almost_submodule/.git <<-\EOF &&
-	garbage
-	EOF
-	test_when_finished "rm -rf almost_*" &&
-	git clean -f -d &&
-	test_path_is_missing almost_git &&
-	test_path_is_missing almost_bare_git &&
-	test_path_is_missing almost_submodule
-
-Removing almost_bare_git/
-Removing almost_git/
-Removing almost_submodule/
-Skipping repository baz/boo
-ok 31 - should clean things that almost look like git but are not
-
-expecting success of 7300.32 'should not clean submodules': 
-	rm -fr repo to_clean sub1 sub2 &&
-	mkdir repo to_clean &&
-	(
-		cd repo &&
-		git init &&
-		test_commit msg hello.world
-	) &&
-	test_config_global protocol.file.allow always &&
-	git submodule add ./repo/.git sub1 &&
-	git commit -m "sub1" &&
-	git branch before_sub2 &&
-	git submodule add ./repo/.git sub2 &&
-	git commit -m "sub2" &&
-	git checkout before_sub2 &&
-	>to_clean/should_clean.this &&
-	git clean -f -d &&
-	test_path_is_file repo/.git/index &&
-	test_path_is_file repo/hello.world &&
-	test_path_is_file sub1/.git &&
-	test_path_is_file sub1/hello.world &&
-	test_path_is_file sub2/.git &&
-	test_path_is_file sub2/hello.world &&
-	test_path_is_missing to_clean
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 1af9d3b] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/sub1'...
-done.
-[master a5d0902] sub1
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 README
- create mode 100644 src/part2.c
- create mode 160000 sub1
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/sub2'...
-done.
-[master 8525980] sub2
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub2
-warning: unable to rmdir 'sub2': Directory not empty
-Switched to branch 'before_sub2'
-Removing .gitconfig
-Skipping repository baz/boo
-Removing to_clean/
-ok 32 - should not clean submodules
-
-expecting success of 7300.33 'should avoid cleaning possible submodules': 
-	rm -fr to_clean possible_sub1 &&
-	mkdir to_clean possible_sub1 &&
-	test_when_finished "rm -rf possible_sub*" &&
-	echo "gitdir: foo" >possible_sub1/.git &&
-	>possible_sub1/hello.world &&
-	chmod 0 possible_sub1/.git &&
-	>to_clean/should_clean.this &&
-	git clean -f -d &&
-	test_path_is_file possible_sub1/.git &&
-	test_path_is_file possible_sub1/hello.world &&
-	test_path_is_missing to_clean
-
-Skipping repository baz/boo
-Removing to_clean/
-ok 33 - should avoid cleaning possible submodules
-
-expecting success of 7300.34 'nested (empty) git should be kept': 
-	rm -fr empty_repo to_clean &&
-	git init empty_repo &&
-	mkdir to_clean &&
-	>to_clean/should_clean.this &&
-	# Note that we put the expect file in the .git directory so that it
-	# does not get cleaned.
-	find empty_repo | sort >.git/expect &&
-	git clean -f -d &&
-	find empty_repo | sort >actual &&
-	test_cmp .git/expect actual &&
-	test_path_is_missing to_clean
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/empty_repo/.git/
-Skipping repository baz/boo
-Removing to_clean/
-ok 34 - nested (empty) git should be kept
-
-expecting success of 7300.35 'nested bare repositories should be cleaned': 
-	rm -fr bare1 bare2 subdir &&
-	git init --bare bare1 &&
-	git clone --local --bare . bare2 &&
-	mkdir subdir &&
-	cp -r bare2 subdir/bare3 &&
-	git clean -f -d &&
-	test_path_is_missing bare1 &&
-	test_path_is_missing bare2 &&
-	test_path_is_missing subdir
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/bare1/
-Cloning into bare repository 'bare2'...
-done.
-Removing actual
-Removing bare1/
-Removing bare2/
-Skipping repository baz/boo
-Removing subdir/
-ok 35 - nested bare repositories should be cleaned
-
-checking known breakage of 7300.36 'nested (empty) bare repositories should be cleaned even when in .git': 
-	rm -fr strange_bare &&
-	mkdir strange_bare &&
-	git init --bare strange_bare/.git &&
-	git clean -f -d &&
-	test_path_is_missing strange_bare
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/strange_bare/.git/
-Skipping repository baz/boo
-Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 60 Mar  4 08:02 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': 
-	rm -fr strange_bare &&
-	mkdir strange_bare &&
-	git clone --local --bare . strange_bare/.git &&
-	git clean -f -d &&
-	test_path_is_missing strange_bare
-
-Cloning into bare repository 'strange_bare/.git'...
-done.
-Skipping repository baz/boo
-Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 60 Mar  4 08:02 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': 
-	rm -fr repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		mkdir -p bar/baz &&
-		test_commit msg bar/baz/hello.world
-	) &&
-	find repo | sort >expect &&
-	git clean -f -d repo/bar/baz &&
-	find repo | sort >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 14dba50] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar/baz/hello.world
-ok 38 - giving path in nested git work tree will NOT remove it
-
-expecting success of 7300.39 'giving path to nested .git will not remove it': 
-	rm -fr repo &&
-	mkdir repo untracked &&
-	(
-		cd repo &&
-		git init &&
-		test_commit msg hello.world
-	) &&
-	find repo | sort >expect &&
-	git clean -f -d repo/.git &&
-	find repo | sort >actual &&
-	test_cmp expect actual &&
-	test_path_is_dir untracked/
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 1af9d3b] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-ok 39 - giving path to nested .git will not remove it
-
-expecting success of 7300.40 'giving path to nested .git/ will NOT remove contents': 
-	rm -fr repo untracked &&
-	mkdir repo untracked &&
-	(
-		cd repo &&
-		git init &&
-		test_commit msg hello.world
-	) &&
-	find repo | sort >expect &&
-	git clean -f -d repo/.git/ &&
-	find repo | sort >actual &&
-	test_cmp expect actual &&
-	test_path_is_dir untracked/
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 1af9d3b] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-ok 40 - giving path to nested .git/ will NOT remove contents
-
-expecting success of 7300.41 'force removal of nested git work tree': 
-	rm -fr foo bar baz &&
-	mkdir -p foo bar baz/boo &&
-	(
-		cd foo &&
-		git init &&
-		test_commit nested hello.world
-	) &&
-	(
-		cd bar &&
-		>goodbye.people
-	) &&
-	(
-		cd baz/boo &&
-		git init &&
-		test_commit deeply.nested deeper.world
-	) &&
-	git clean -f -f -d &&
-	! test -d foo &&
-	! test -d bar &&
-	! test -d baz
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/foo/.git/
-[master (root-commit) abd8674] nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/baz/boo/.git/
-[master (root-commit) 3f7f1fc] deeply.nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deeper.world
-Removing actual
-Removing bar/
-Removing baz/
-Removing empty_repo/
-Removing expect
-Removing foo/
-Removing repo/
-Removing strange_bare/
-Removing sub2/
-Removing untracked/
-ok 41 - force removal of nested git work tree
-
-expecting success of 7300.42 'git clean -e': 
-	rm -fr repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		touch known 1 2 3 &&
-		git add known &&
-		git clean -f -e 1 -e 2 &&
-		test -e 1 &&
-		test -e 2 &&
-		! (test -e 3) &&
-		test -e known
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/repo/.git/
-Removing 3
-ok 42 - git clean -e
-
-expecting success of 7300.43 'git clean -d with an unreadable empty directory': 
-	mkdir foo &&
-	chmod a= foo &&
-	git clean -dfx foo &&
-	! test -d foo
-
-warning: could not open directory 'foo/': Permission denied
-Removing foo/
-ok 43 - git clean -d with an unreadable empty directory
+ create mode 100644 node2/leaf6
+ rename {node1 => node2/node1}/leaf1 (75%)
+ rename {node1 => node2/node1}/leaf2 (75%)
+Note: switching to 'A^0'.
 
-expecting success of 7300.44 'git clean -d respects pathspecs (dir is prefix of pathspec)': 
-	mkdir -p foo &&
-	mkdir -p foobar &&
-	git clean -df foobar &&
-	test_path_is_dir foo &&
-	test_path_is_missing foobar
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Removing foobar/
-ok 44 - git clean -d respects pathspecs (dir is prefix of pathspec)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7300.45 'git clean -d respects pathspecs (pathspec is prefix of dir)': 
-	mkdir -p foo &&
-	mkdir -p foobar &&
-	git clean -df foo &&
-	test_path_is_missing foo &&
-	test_path_is_dir foobar
+  git switch -c <new-branch-name>
 
-Removing foo/
-ok 45 - git clean -d respects pathspecs (pathspec is prefix of dir)
+Or undo this operation with:
 
-expecting success of 7300.46 'git clean -d skips untracked dirs containing ignored files': 
-	echo /foo/bar >.gitignore &&
-	echo ignoreme >>.gitignore &&
-	rm -rf foo &&
-	mkdir -p foo/a/aa/aaa foo/b/bb/bbb &&
-	touch foo/bar foo/baz foo/a/aa/ignoreme foo/b/ignoreme foo/b/bb/1 foo/b/bb/2 &&
-	git clean -df &&
-	test_path_is_dir foo &&
-	test_path_is_file foo/bar &&
-	test_path_is_missing foo/baz &&
-	test_path_is_file foo/a/aa/ignoreme &&
-	test_path_is_missing foo/a/aa/aaa &&
-	test_path_is_file foo/b/ignoreme &&
-	test_path_is_missing foo/b/bb
+  git switch -
 
-Removing build/
-Removing foo/a/aa/aaa/
-Removing foo/b/bb/
-Removing foo/baz
-Removing foobar/
-Removing obj.o
-ok 46 - git clean -d skips untracked dirs containing ignored files
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7300.47 'git clean -d skips nested repo containing ignored files': 
-	test_when_finished "rm -rf nested-repo-with-ignored-file" &&
+HEAD is now at c671e72 A
+Path updated: node2/leaf6 added in B^0 inside a directory that was renamed in HEAD; moving it to node1/node2/leaf6.
+Path updated: node1/leaf1 renamed to node2/node1/leaf1 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf1.
+Auto-merging node1/node2/node1/leaf1
+CONFLICT (content): Merge conflict in node1/node2/node1/leaf1
+Path updated: node1/leaf2 renamed to node2/node1/leaf2 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf2.
+Auto-merging node1/node2/node1/leaf2
+CONFLICT (content): Merge conflict in node1/node2/node1/leaf2
+Path updated: node1/leaf5 added in HEAD inside a directory that was renamed in B^0; moving it to node2/node1/leaf5.
+Path updated: node2/leaf3 renamed to node1/node2/leaf3 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf3.
+Auto-merging node2/node1/node2/leaf3
+CONFLICT (content): Merge conflict in node2/node1/node2/leaf3
+Path updated: node2/leaf4 renamed to node1/node2/leaf4 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf4.
+Auto-merging node2/node1/node2/leaf4
+CONFLICT (content): Merge conflict in node2/node1/node2/leaf4
+Automatic merge failed; fix conflicts and then commit the result.
+ok 56 - 12c2: Moving one directory hierarchy into another w/ content merge
 
-	git init nested-repo-with-ignored-file &&
+expecting success of 6423.57 '12d: Rename/merge subdir into the root, variant 1': 
+	test_setup_12d &&
 	(
-		cd nested-repo-with-ignored-file &&
-		>file &&
-		git add file &&
-		git commit -m Initial &&
-
-		# This file is ignored by a .gitignore rule in the outer repo
-		# added in the previous test.
-		>ignoreme
-	) &&
+		cd 12d &&
 
-	git clean -fd &&
+		git checkout A^0 &&
 
-	test_path_is_file nested-repo-with-ignored-file/.git/index &&
-	test_path_is_file nested-repo-with-ignored-file/ignoreme &&
-	test_path_is_file nested-repo-with-ignored-file/file
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/nested-repo-with-ignored-file/.git/
-[master (root-commit) 4208a61] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-ok 47 - git clean -d skips nested repo containing ignored files
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
 
-expecting success of 7300.48 'git clean handles being told what to clean': 
-	mkdir -p d1 d2 &&
-	touch d1/ut d2/ut &&
-	git clean -f */ut &&
-	test_path_is_missing d1/ut &&
-	test_path_is_missing d2/ut
+		git rev-parse >actual \
+			HEAD:subdir/foo.t   HEAD:bar.t &&
+		git rev-parse >expect \
+			O:a/b/subdir/foo.t  B:a/b/bar.t &&
+		test_cmp expect actual &&
 
-Removing d1/ut
-Removing d2/ut
-ok 48 - git clean handles being told what to clean
+		git hash-object bar.t >actual &&
+		git rev-parse B:a/b/bar.t >expect &&
+		test_cmp expect actual &&
 
-expecting success of 7300.49 'git clean handles being told what to clean, with -d': 
-	mkdir -p d1 d2 &&
-	touch d1/ut d2/ut &&
-	git clean -ffd */ut &&
-	test_path_is_missing d1/ut &&
-	test_path_is_missing d2/ut
+		test_must_fail git rev-parse HEAD:a/b/subdir/foo.t &&
+		test_must_fail git rev-parse HEAD:a/b/bar.t &&
+		test_path_is_missing a/ &&
+		test_path_is_file bar.t
+	)
 
-Removing d1/ut
-Removing d2/ut
-ok 49 - git clean handles being told what to clean, with -d
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12d/.git/
+[master (root-commit) eb8da02] a/b/subdir/foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/b/subdir/foo.t
+Switched to branch 'A'
+[A 65a80b8] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {a/b/subdir => subdir}/foo.t (100%)
+Switched to branch 'B'
+[B f100ab2] a/b/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/b/bar.t
+Note: switching to 'A^0'.
 
-expecting success of 7300.50 'git clean works if a glob is passed without -d': 
-	mkdir -p d1 d2 &&
-	touch d1/ut d2/ut &&
-	git clean -f "*ut" &&
-	test_path_is_missing d1/ut &&
-	test_path_is_missing d2/ut
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Removing d1/ut
-Removing d2/ut
-ok 50 - git clean works if a glob is passed without -d
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7300.51 'git clean works if a glob is passed with -d': 
-	mkdir -p d1 d2 &&
-	touch d1/ut d2/ut &&
-	git clean -ffd "*ut" &&
-	test_path_is_missing d1/ut &&
-	test_path_is_missing d2/ut
+  git switch -c <new-branch-name>
 
-Removing d1/ut
-Removing d2/ut
-ok 51 - git clean works if a glob is passed with -d
+Or undo this operation with:
 
-ok 52 # skip handle clean & core.longpaths = false nicely (missing MINGW)
+  git switch -
 
-expecting success of 7300.53 'clean untracked paths by pathspec': 
-	git init untracked &&
-	mkdir untracked/dir &&
-	echo >untracked/dir/file.txt &&
-	git -C untracked clean -f dir/file.txt &&
-	ls untracked/dir >actual &&
-	test_must_be_empty actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/untracked/.git/
-Removing dir/file.txt
-ok 53 - clean untracked paths by pathspec
+HEAD is now at 65a80b8 A
+Path updated: a/b/bar.t added in B^0 inside a directory that was renamed in HEAD; moving it to bar.t.
+Merge made by the 'ort' strategy.
+ bar.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+fatal: path 'a/b/subdir/foo.t' does not exist in 'HEAD'
+HEAD:a/b/subdir/foo.t
+fatal: path 'a/b/bar.t' does not exist in 'HEAD'
+HEAD:a/b/bar.t
+ok 57 - 12d: Rename/merge subdir into the root, variant 1
 
-expecting success of 7300.54 'avoid traversing into ignored directories': 
-	test_when_finished rm -f output error trace.* &&
-	test_create_repo avoid-traversing-deep-hierarchy &&
+expecting success of 6423.58 '12e: Rename/merge subdir into the root, variant 2': 
+	test_setup_12e &&
 	(
-		cd avoid-traversing-deep-hierarchy &&
-
-		mkdir -p untracked/subdir/with/a &&
-		>untracked/subdir/with/a/random-file.txt &&
-
-		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-		git clean -ffdxn -e untracked
-	) &&
+		cd 12e &&
 
-	# Make sure we only visited into the top-level directory, and did
-	# not traverse into the "untracked" subdirectory since it was excluded
-	grep data.*read_directo.*directories-visited trace.output |
-		cut -d "|" -f 9 >trace.relevant &&
-	cat >trace.expect <<-EOF &&
-	 ..directories-visited:1
-	EOF
-	test_cmp trace.expect trace.relevant
+		git checkout A^0 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/avoid-traversing-deep-hierarchy/.git/
-ok 54 - avoid traversing into ignored directories
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-expecting success of 7300.55 'traverse into directories that may have ignored entries': 
-	test_when_finished rm -f output &&
-	test_create_repo need-to-traverse-into-hierarchy &&
-	(
-		cd need-to-traverse-into-hierarchy &&
-		mkdir -p modules/foobar/src/generated &&
-		> modules/foobar/src/generated/code.c &&
-		> modules/foobar/Makefile &&
-		echo "/modules/**/src/generated/" >.gitignore &&
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
 
-		git clean -fX modules/foobar >../output &&
+		git rev-parse >actual \
+			HEAD:foo.t   HEAD:bar.t &&
+		git rev-parse >expect \
+			O:a/b/foo.t  B:a/b/bar.t &&
+		test_cmp expect actual &&
 
-		grep Removing ../output &&
+		git hash-object bar.t >actual &&
+		git rev-parse B:a/b/bar.t >expect &&
+		test_cmp expect actual &&
 
-		test_path_is_missing modules/foobar/src/generated/code.c &&
-		test_path_is_file modules/foobar/Makefile
+		test_must_fail git rev-parse HEAD:a/b/foo.t &&
+		test_must_fail git rev-parse HEAD:a/b/bar.t &&
+		test_path_is_missing a/ &&
+		test_path_is_file bar.t
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7300-clean/need-to-traverse-into-hierarchy/.git/
-Removing modules/foobar/src/
-ok 55 - traverse into directories that may have ignored entries
-
-# still have 2 known breakage(s)
-# passed all remaining 53 test(s)
-1..55
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7006-pager.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7006-pager/.git/
-expecting success of 7006.1 'determine default pager': 
-	test_might_fail git config --unset core.pager &&
-	less=$(
-		sane_unset PAGER GIT_PAGER &&
-		git var GIT_PAGER
-	) &&
-	test -n "$less"
-
-ok 1 - determine default pager
-
-expecting success of 7006.2 'setup': 
-	sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
-	test_unconfig core.pager &&
-
-	PAGER="cat >paginated.out" &&
-	export PAGER &&
-
-	test_commit initial
-
-[master (root-commit) 24b24cf] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12e/.git/
+[master (root-commit) b044d92] a/b/foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 2 - setup
-
-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"
+ create mode 100644 a/b/foo.t
+Switched to branch 'A'
+[A de696c4] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a/b/foo.t => foo.t (100%)
+Switched to branch 'B'
+[B e3eeb6b] a/b/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/b/bar.t
+Note: switching to 'A^0'.
 
-)
-prerequisite TTY ok
-expecting success of 7006.3 'some commands use a pager': 
-	rm -f paginated.out &&
-	test_terminal git log &&
-	test_path_is_file paginated.out
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 - some commands use a pager
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-checking known breakage of 7006.4 'pager runs from subdir': 
-	echo subdir/paginated.out >expected &&
-	mkdir -p subdir &&
-	rm -f paginated.out subdir/paginated.out &&
-	(
-		cd subdir &&
-		test_terminal git log
-	) &&
-	{
-		ls paginated.out subdir/paginated.out ||
-		:
-	} >actual &&
-	test_cmp expected actual
+  git switch -c <new-branch-name>
 
-ls: cannot access 'subdir/paginated.out': No such file or directory
---- expected	2026-03-04 08:01:53.551352315 +0000
-+++ actual	2026-03-04 08:01:53.747352315 +0000
-@@ -1 +1 @@
--subdir/paginated.out
-+paginated.out
-not ok 4 - pager runs from subdir # TODO known breakage
+Or undo this operation with:
 
-expecting success of 7006.5 'LESS and LV envvars are set for pagination': 
-	(
-		sane_unset LESS LV &&
-		PAGER="env >pager-env.out; wc" &&
-		export PAGER &&
+  git switch -
 
-		test_terminal git log
-	) &&
-	grep ^LESS= pager-env.out &&
-	grep ^LV= pager-env.out
+Turn off this advice by setting config variable advice.detachedHead to false
 
-      5      20     248
-LESS=FRX
-LV=-c
-ok 5 - LESS and LV envvars are set for pagination
+HEAD is now at de696c4 A
+Path updated: a/b/bar.t added in B^0 inside a directory that was renamed in HEAD; moving it to bar.t.
+Merge made by the 'ort' strategy.
+ bar.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+fatal: path 'a/b/foo.t' does not exist in 'HEAD'
+HEAD:a/b/foo.t
+fatal: path 'a/b/bar.t' does not exist in 'HEAD'
+HEAD:a/b/bar.t
+ok 58 - 12e: Rename/merge subdir into the root, variant 2
 
-expecting success of 7006.6 'LESS and LV envvars set by git-sh-setup': 
+expecting success of 6423.59 '12f: Trivial directory resolve, caching, all kinds of fun': 
+	test_setup_12f &&
 	(
-		sane_unset LESS LV &&
-		PAGER="env >pager-env.out; wc" &&
-		export PAGER &&
-		PATH="$(git --exec-path):$PATH" &&
-		export PATH &&
-		test_terminal sh -c ". git-sh-setup && git_pager"
-	) &&
-	grep ^LESS= pager-env.out &&
-	grep ^LV= pager-env.out
-
-      0       0       0
-LESS=FRX
-LV=-c
-ok 6 - LESS and LV envvars set by git-sh-setup
+		cd 12f &&
 
-expecting success of 7006.7 'some commands do not use a pager': 
-	rm -f paginated.out &&
-	test_terminal git rev-list HEAD &&
-	test_path_is_missing paginated.out
+		git checkout A^0 &&
+		git branch Bmod B &&
 
-24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-ok 7 - some commands do not use a pager
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git -c merge.directoryRenames=true rebase A Bmod &&
 
-expecting success of 7006.8 'no pager when stdout is a pipe': 
-	rm -f paginated.out &&
-	git log | cat &&
-	test_path_is_missing paginated.out
+		echo Checking the pick of B1... &&
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+		test_must_fail git rev-parse Bmod~1:dir &&
 
-    initial
-ok 8 - no pager when stdout is a pipe
+		git ls-tree -r Bmod~1 >out &&
+		test_line_count = 98 out &&
 
-expecting success of 7006.9 'no pager when stdout is a regular file': 
-	rm -f paginated.out &&
-	git log >file &&
-	test_path_is_missing paginated.out
+		git diff --name-status A Bmod~1 >actual &&
+		q_to_tab >expect <<-\EOF &&
+		MQfolder/subdir/Makefile
+		AQfolder/subdir/newfile.c
+		MQfolder/subdir/newsubdir/e
+		AQfolder/subdir/newsubdir/newfile.py
+		MQfolder/subdir/tweaked/Makefile
+		EOF
+		test_cmp expect actual &&
 
-ok 9 - no pager when stdout is a regular file
+		# Three-way merged files
+		test_seq  2 11 >e_Merge1 &&
+		test_seq 11 21 >Makefile_TOP &&
+		test_seq 21 31 >Makefile_SUB &&
+		git hash-object >expect      \
+			e_Merge1             \
+			Makefile_TOP         \
+			Makefile_SUB         &&
+		git rev-parse >actual              \
+			Bmod~1:folder/subdir/newsubdir/e     \
+			Bmod~1:folder/subdir/Makefile        \
+			Bmod~1:folder/subdir/tweaked/Makefile &&
+		test_cmp expect actual &&
 
-expecting success of 7006.10 'git --paginate rev-list uses a pager': 
-	rm -f paginated.out &&
-	test_terminal git --paginate rev-list HEAD &&
-	test_path_is_file paginated.out
+		# New files showed up at the right location with right contents
+		git rev-parse >expect                \
+			B~1:dir/subdir/newfile.c            \
+			B~1:dir/subdir/newsubdir/newfile.py &&
+		git rev-parse >actual                      \
+			Bmod~1:folder/subdir/newfile.c            \
+			Bmod~1:folder/subdir/newsubdir/newfile.py &&
+		test_cmp expect actual &&
 
-ok 10 - git --paginate rev-list uses a pager
+		# Removed files
+		test_path_is_missing folder/subdir/tweaked/f &&
+		test_path_is_missing folder/subdir/tweaked/g &&
 
-expecting success of 7006.11 'no pager even with --paginate when stdout is a pipe': 
-	rm -f file paginated.out &&
-	git --paginate log | cat &&
-	test_path_is_missing paginated.out
+		# Unchanged files or directories
+		git rev-parse >actual        \
+			Bmod~1:folder/subdir/a          \
+			Bmod~1:folder/subdir/b          \
+			Bmod~1:folder/subdir/c          \
+			Bmod~1:folder/subdir/d          \
+			Bmod~1:folder/unchanged         \
+			Bmod~1:folder/subdir/tweaked/h &&
+		git rev-parse >expect          \
+			O:dir/subdir/a         \
+			O:dir/subdir/b         \
+			O:dir/subdir/c         \
+			O:dir/subdir/d         \
+			O:dir/unchanged        \
+			O:dir/subdir/tweaked/h &&
+		test_cmp expect actual &&
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+		echo Checking the pick of B2... &&
 
-    initial
-ok 11 - no pager even with --paginate when stdout is a pipe
+		test_must_fail git rev-parse Bmod:dir &&
 
-expecting success of 7006.12 'no pager with --no-pager': 
-	rm -f paginated.out &&
-	test_terminal git --no-pager log &&
-	test_path_is_missing paginated.out
+		git ls-tree -r Bmod >out &&
+		test_line_count = 99 out &&
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380 (HEAD -> master, tag: initial)
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+		git diff --name-status Bmod~1 Bmod >actual &&
+		q_to_tab >expect <<-\EOF &&
+		AQfolder/subdir/newfile.rs
+		MQfolder/subdir/newsubdir/e
+		EOF
+		test_cmp expect actual &&
 
-    initial
-ok 12 - no pager with --no-pager
+		# Three-way merged file
+		test_seq  2 12 >e_Merge2 &&
+		git hash-object e_Merge2 >expect &&
+		git rev-parse Bmod:folder/subdir/newsubdir/e >actual &&
+		test_cmp expect actual &&
 
-expecting success of 7006.13 'configuration can disable pager': 
-	rm -f paginated.out &&
-	test_unconfig pager.grep &&
-	test_terminal git grep initial &&
-	test_path_is_file paginated.out &&
+		grep region_enter.*collect_merge_info trace.output >collect &&
+		test_line_count = 4 collect &&
+		grep region_enter.*process_entries$ trace.output >process &&
+		test_line_count = 2 process
+	)
 
-	rm -f paginated.out &&
-	test_config pager.grep false &&
-	test_terminal git grep initial &&
-	test_path_is_missing paginated.out
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12f/.git/
+[master (root-commit) 362ed3d] O
+ Author: A U Thor <author@example.com>
+ 98 files changed, 127 insertions(+)
+ create mode 100644 dir/subdir/Makefile
+ create mode 100644 dir/subdir/a
+ create mode 100644 dir/subdir/b
+ create mode 100644 dir/subdir/c
+ create mode 100644 dir/subdir/d
+ create mode 100644 dir/subdir/e
+ create mode 100644 dir/subdir/tweaked/Makefile
+ create mode 100644 dir/subdir/tweaked/f
+ create mode 100644 dir/subdir/tweaked/g
+ create mode 100644 dir/subdir/tweaked/h
+ create mode 100644 dir/unchanged/file_1
+ create mode 100644 dir/unchanged/file_10
+ create mode 100644 dir/unchanged/file_11
+ create mode 100644 dir/unchanged/file_12
+ create mode 100644 dir/unchanged/file_13
+ create mode 100644 dir/unchanged/file_14
+ create mode 100644 dir/unchanged/file_15
+ create mode 100644 dir/unchanged/file_16
+ create mode 100644 dir/unchanged/file_17
+ create mode 100644 dir/unchanged/file_18
+ create mode 100644 dir/unchanged/file_19
+ create mode 100644 dir/unchanged/file_2
+ create mode 100644 dir/unchanged/file_20
+ create mode 100644 dir/unchanged/file_21
+ create mode 100644 dir/unchanged/file_22
+ create mode 100644 dir/unchanged/file_23
+ create mode 100644 dir/unchanged/file_24
+ create mode 100644 dir/unchanged/file_25
+ create mode 100644 dir/unchanged/file_26
+ create mode 100644 dir/unchanged/file_27
+ create mode 100644 dir/unchanged/file_28
+ create mode 100644 dir/unchanged/file_29
+ create mode 100644 dir/unchanged/file_3
+ create mode 100644 dir/unchanged/file_30
+ create mode 100644 dir/unchanged/file_31
+ create mode 100644 dir/unchanged/file_32
+ create mode 100644 dir/unchanged/file_33
+ create mode 100644 dir/unchanged/file_34
+ create mode 100644 dir/unchanged/file_35
+ create mode 100644 dir/unchanged/file_36
+ create mode 100644 dir/unchanged/file_37
+ create mode 100644 dir/unchanged/file_38
+ create mode 100644 dir/unchanged/file_39
+ create mode 100644 dir/unchanged/file_4
+ create mode 100644 dir/unchanged/file_40
+ create mode 100644 dir/unchanged/file_41
+ create mode 100644 dir/unchanged/file_42
+ create mode 100644 dir/unchanged/file_43
+ create mode 100644 dir/unchanged/file_44
+ create mode 100644 dir/unchanged/file_45
+ create mode 100644 dir/unchanged/file_46
+ create mode 100644 dir/unchanged/file_47
+ create mode 100644 dir/unchanged/file_48
+ create mode 100644 dir/unchanged/file_49
+ create mode 100644 dir/unchanged/file_5
+ create mode 100644 dir/unchanged/file_50
+ create mode 100644 dir/unchanged/file_51
+ create mode 100644 dir/unchanged/file_52
+ create mode 100644 dir/unchanged/file_53
+ create mode 100644 dir/unchanged/file_54
+ create mode 100644 dir/unchanged/file_55
+ create mode 100644 dir/unchanged/file_56
+ create mode 100644 dir/unchanged/file_57
+ create mode 100644 dir/unchanged/file_58
+ create mode 100644 dir/unchanged/file_59
+ create mode 100644 dir/unchanged/file_6
+ create mode 100644 dir/unchanged/file_60
+ create mode 100644 dir/unchanged/file_61
+ create mode 100644 dir/unchanged/file_62
+ create mode 100644 dir/unchanged/file_63
+ create mode 100644 dir/unchanged/file_64
+ create mode 100644 dir/unchanged/file_65
+ create mode 100644 dir/unchanged/file_66
+ create mode 100644 dir/unchanged/file_67
+ create mode 100644 dir/unchanged/file_68
+ create mode 100644 dir/unchanged/file_69
+ create mode 100644 dir/unchanged/file_7
+ create mode 100644 dir/unchanged/file_70
+ create mode 100644 dir/unchanged/file_71
+ create mode 100644 dir/unchanged/file_72
+ create mode 100644 dir/unchanged/file_73
+ create mode 100644 dir/unchanged/file_74
+ create mode 100644 dir/unchanged/file_75
+ create mode 100644 dir/unchanged/file_76
+ create mode 100644 dir/unchanged/file_77
+ create mode 100644 dir/unchanged/file_78
+ create mode 100644 dir/unchanged/file_79
+ create mode 100644 dir/unchanged/file_8
+ create mode 100644 dir/unchanged/file_80
+ create mode 100644 dir/unchanged/file_81
+ create mode 100644 dir/unchanged/file_82
+ create mode 100644 dir/unchanged/file_83
+ create mode 100644 dir/unchanged/file_84
+ create mode 100644 dir/unchanged/file_85
+ create mode 100644 dir/unchanged/file_86
+ create mode 100644 dir/unchanged/file_87
+ create mode 100644 dir/unchanged/file_88
+ create mode 100644 dir/unchanged/file_9
+Switched to branch 'A'
+rm 'dir/subdir/tweaked/f'
+rm 'dir/subdir/tweaked/g'
+[A 9910422] A
+ Author: A U Thor <author@example.com>
+ 98 files changed, 5 deletions(-)
+ delete mode 100644 dir/subdir/tweaked/f
+ delete mode 100644 dir/subdir/tweaked/g
+ rename {dir => folder}/subdir/Makefile (90%)
+ rename {dir => folder}/subdir/a (100%)
+ rename {dir => folder}/subdir/b (100%)
+ rename {dir => folder}/subdir/c (100%)
+ rename {dir => folder}/subdir/d (100%)
+ rename {dir/subdir => folder/subdir/newsubdir}/e (90%)
+ rename {dir => folder}/subdir/tweaked/Makefile (90%)
+ rename {dir => folder}/subdir/tweaked/h (100%)
+ rename {dir => folder}/unchanged/file_1 (100%)
+ rename {dir => folder}/unchanged/file_10 (100%)
+ rename {dir => folder}/unchanged/file_11 (100%)
+ rename {dir => folder}/unchanged/file_12 (100%)
+ rename {dir => folder}/unchanged/file_13 (100%)
+ rename {dir => folder}/unchanged/file_14 (100%)
+ rename {dir => folder}/unchanged/file_15 (100%)
+ rename {dir => folder}/unchanged/file_16 (100%)
+ rename {dir => folder}/unchanged/file_17 (100%)
+ rename {dir => folder}/unchanged/file_18 (100%)
+ rename {dir => folder}/unchanged/file_19 (100%)
+ rename {dir => folder}/unchanged/file_2 (100%)
+ rename {dir => folder}/unchanged/file_20 (100%)
+ rename {dir => folder}/unchanged/file_21 (100%)
+ rename {dir => folder}/unchanged/file_22 (100%)
+ rename {dir => folder}/unchanged/file_23 (100%)
+ rename {dir => folder}/unchanged/file_24 (100%)
+ rename {dir => folder}/unchanged/file_25 (100%)
+ rename {dir => folder}/unchanged/file_26 (100%)
+ rename {dir => folder}/unchanged/file_27 (100%)
+ rename {dir => folder}/unchanged/file_28 (100%)
+ rename {dir => folder}/unchanged/file_29 (100%)
+ rename {dir => folder}/unchanged/file_3 (100%)
+ rename {dir => folder}/unchanged/file_30 (100%)
+ rename {dir => folder}/unchanged/file_31 (100%)
+ rename {dir => folder}/unchanged/file_32 (100%)
+ rename {dir => folder}/unchanged/file_33 (100%)
+ rename {dir => folder}/unchanged/file_34 (100%)
+ rename {dir => folder}/unchanged/file_35 (100%)
+ rename {dir => folder}/unchanged/file_36 (100%)
+ rename {dir => folder}/unchanged/file_37 (100%)
+ rename {dir => folder}/unchanged/file_38 (100%)
+ rename {dir => folder}/unchanged/file_39 (100%)
+ rename {dir => folder}/unchanged/file_4 (100%)
+ rename {dir => folder}/unchanged/file_40 (100%)
+ rename {dir => folder}/unchanged/file_41 (100%)
+ rename {dir => folder}/unchanged/file_42 (100%)
+ rename {dir => folder}/unchanged/file_43 (100%)
+ rename {dir => folder}/unchanged/file_44 (100%)
+ rename {dir => folder}/unchanged/file_45 (100%)
+ rename {dir => folder}/unchanged/file_46 (100%)
+ rename {dir => folder}/unchanged/file_47 (100%)
+ rename {dir => folder}/unchanged/file_48 (100%)
+ rename {dir => folder}/unchanged/file_49 (100%)
+ rename {dir => folder}/unchanged/file_5 (100%)
+ rename {dir => folder}/unchanged/file_50 (100%)
+ rename {dir => folder}/unchanged/file_51 (100%)
+ rename {dir => folder}/unchanged/file_52 (100%)
+ rename {dir => folder}/unchanged/file_53 (100%)
+ rename {dir => folder}/unchanged/file_54 (100%)
+ rename {dir => folder}/unchanged/file_55 (100%)
+ rename {dir => folder}/unchanged/file_56 (100%)
+ rename {dir => folder}/unchanged/file_57 (100%)
+ rename {dir => folder}/unchanged/file_58 (100%)
+ rename {dir => folder}/unchanged/file_59 (100%)
+ rename {dir => folder}/unchanged/file_6 (100%)
+ rename {dir => folder}/unchanged/file_60 (100%)
+ rename {dir => folder}/unchanged/file_61 (100%)
+ rename {dir => folder}/unchanged/file_62 (100%)
+ rename {dir => folder}/unchanged/file_63 (100%)
+ rename {dir => folder}/unchanged/file_64 (100%)
+ rename {dir => folder}/unchanged/file_65 (100%)
+ rename {dir => folder}/unchanged/file_66 (100%)
+ rename {dir => folder}/unchanged/file_67 (100%)
+ rename {dir => folder}/unchanged/file_68 (100%)
+ rename {dir => folder}/unchanged/file_69 (100%)
+ rename {dir => folder}/unchanged/file_7 (100%)
+ rename {dir => folder}/unchanged/file_70 (100%)
+ rename {dir => folder}/unchanged/file_71 (100%)
+ rename {dir => folder}/unchanged/file_72 (100%)
+ rename {dir => folder}/unchanged/file_73 (100%)
+ rename {dir => folder}/unchanged/file_74 (100%)
+ rename {dir => folder}/unchanged/file_75 (100%)
+ rename {dir => folder}/unchanged/file_76 (100%)
+ rename {dir => folder}/unchanged/file_77 (100%)
+ rename {dir => folder}/unchanged/file_78 (100%)
+ rename {dir => folder}/unchanged/file_79 (100%)
+ rename {dir => folder}/unchanged/file_8 (100%)
+ rename {dir => folder}/unchanged/file_80 (100%)
+ rename {dir => folder}/unchanged/file_81 (100%)
+ rename {dir => folder}/unchanged/file_82 (100%)
+ rename {dir => folder}/unchanged/file_83 (100%)
+ rename {dir => folder}/unchanged/file_84 (100%)
+ rename {dir => folder}/unchanged/file_85 (100%)
+ rename {dir => folder}/unchanged/file_86 (100%)
+ rename {dir => folder}/unchanged/file_87 (100%)
+ rename {dir => folder}/unchanged/file_88 (100%)
+ rename {dir => folder}/unchanged/file_9 (100%)
+Switched to branch 'B'
+[B 9770da3] B1
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 dir/subdir/newfile.c
+ create mode 100644 dir/subdir/newsubdir/newfile.py
+[B 0eecb62] B2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 dir/subdir/newfile.rs
+Note: switching to 'A^0'.
 
-initial.t:initial
-ok 13 - configuration can disable pager
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.14 'configuration can enable pager (from subdir)': 
-	rm -f paginated.out &&
-	mkdir -p subdir &&
-	test_config pager.bundle true &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	git bundle create test.bundle --all &&
-	rm -f paginated.out subdir/paginated.out &&
-	(
-		cd subdir &&
-		test_terminal git bundle unbundle ../test.bundle
-	) &&
-	{
-		test_path_is_file paginated.out ||
-		test_path_is_file subdir/paginated.out
-	}
+  git switch -c <new-branch-name>
 
-ok 14 - configuration can enable pager (from subdir)
+Or undo this operation with:
 
-expecting success of 7006.15 'git tag -l defaults to paging': 
-	rm -f paginated.out &&
-	test_terminal git tag -l &&
-	test_path_is_file paginated.out
+  git switch -
 
-ok 15 - git tag -l defaults to paging
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7006.16 'git tag -l respects pager.tag': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag=false tag -l &&
-	test_path_is_missing paginated.out
+HEAD is now at 9910422 A
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/Bmod.
+Checking the pick of B1...
+fatal: path 'dir' does not exist in 'Bmod~1'
+Bmod~1:dir
+Checking the pick of B2...
+fatal: path 'dir' does not exist in 'Bmod'
+Bmod:dir
+ok 59 - 12f: Trivial directory resolve, caching, all kinds of fun
 
-initial
-ok 16 - git tag -l respects pager.tag
+expecting success of 6423.60 '12g: Testcase with two kinds of "relevant" renames': 
+	test_setup_12g &&
+	(
+		cd 12g &&
 
-expecting success of 7006.17 'git tag -l respects --no-pager': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag --no-pager tag -l &&
-	test_path_is_missing paginated.out
+		git checkout A^0 &&
 
-initial
-ok 17 - git tag -l respects --no-pager
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-expecting success of 7006.18 'git tag with no args defaults to paging': 
-	# no args implies -l so this should page like -l
-	rm -f paginated.out &&
-	test_terminal git tag &&
-	test_path_is_file paginated.out
+		test_write_lines once upon a time there was a repo >expect &&
+		test_cmp expect newfile &&
 
-ok 18 - git tag with no args defaults to paging
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
 
-expecting success of 7006.19 'git tag with no args respects pager.tag': 
-	# no args implies -l so this should page like -l
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag=false tag &&
-	test_path_is_missing paginated.out
+		git rev-parse >actual \
+			HEAD:newdir/a  HEAD:newdir/b   HEAD:newdir/c &&
+		git rev-parse >expect \
+			B:newdir/a     B:newdir/b      A:subdir/c &&
+		test_cmp expect actual &&
 
-initial
-ok 19 - git tag with no args respects pager.tag
+		test_must_fail git rev-parse HEAD:subdir/a &&
+		test_must_fail git rev-parse HEAD:subdir/b &&
+		test_must_fail git rev-parse HEAD:subdir/c &&
+		test_path_is_missing subdir/ &&
+		test_path_is_file newdir/c
+	)
 
-expecting success of 7006.20 'git tag --contains defaults to paging': 
-	# --contains implies -l so this should page like -l
-	rm -f paginated.out &&
-	test_terminal git tag --contains &&
-	test_path_is_file paginated.out
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12g/.git/
+[master (root-commit) 4f375a3] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 22 insertions(+)
+ create mode 100644 somefile
+ create mode 100644 subdir/a
+ create mode 100644 subdir/b
+Switched to branch 'A'
+[A 0338b5a] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 subdir/c
+Switched to branch 'B'
+[B a6ab9df] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ rename {subdir => newdir}/a (87%)
+ rename {subdir => newdir}/b (82%)
+ rename somefile => newfile (82%)
+Note: switching to 'A^0'.
 
-ok 20 - git tag --contains defaults to paging
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.21 'git tag --contains respects pager.tag': 
-	# --contains implies -l so this should page like -l
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag=false tag --contains &&
-	test_path_is_missing paginated.out
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-initial
-ok 21 - git tag --contains respects pager.tag
+  git switch -c <new-branch-name>
 
-expecting success of 7006.22 'git tag -a defaults to not paging': 
-	test_when_finished "git tag -d newtag" &&
-	rm -f paginated.out &&
-	test_terminal git tag -am message newtag &&
-	test_path_is_missing paginated.out
+Or undo this operation with:
 
-Deleted tag 'newtag' (was a052248)
-ok 22 - git tag -a defaults to not paging
+  git switch -
 
-expecting success of 7006.23 'git tag -a ignores pager.tag': 
-	test_when_finished "git tag -d newtag" &&
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag tag -am message newtag &&
-	test_path_is_missing paginated.out
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Deleted tag 'newtag' (was a052248)
-ok 23 - git tag -a ignores pager.tag
+HEAD is now at 0338b5a A
+Path updated: subdir/c added in HEAD inside a directory that was renamed in B^0; moving it to newdir/c.
+Auto-merging newfile
+Merge made by the 'ort' strategy.
+ {subdir => newdir}/a | 1 +
+ {subdir => newdir}/b | 1 +
+ {subdir => newdir}/c | 0
+ somefile => newfile  | 1 +
+ 4 files changed, 3 insertions(+)
+ rename {subdir => newdir}/a (87%)
+ rename {subdir => newdir}/b (82%)
+ rename {subdir => newdir}/c (100%)
+ rename somefile => newfile (85%)
+fatal: path 'subdir/a' does not exist in 'HEAD'
+HEAD:subdir/a
+fatal: path 'subdir/b' does not exist in 'HEAD'
+HEAD:subdir/b
+fatal: path 'subdir/c' does not exist in 'HEAD'
+HEAD:subdir/c
+ok 60 - 12g: Testcase with two kinds of "relevant" renames
 
-expecting success of 7006.24 'git tag -a respects --paginate': 
-	test_when_finished "git tag -d newtag" &&
-	rm -f paginated.out &&
-	test_terminal git --paginate tag -am message newtag &&
-	test_path_is_file paginated.out
+checking known breakage of 6423.61 '12h: renaming a file within a renamed directory': 
+	test_setup_12h &&
+	(
+		cd 12h &&
 
-Deleted tag 'newtag' (was a052248)
-ok 24 - git tag -a respects --paginate
+		git checkout A^0 &&
 
-expecting success of 7006.25 'git tag as alias ignores pager.tag with -a': 
-	test_when_finished "git tag -d newtag" &&
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag -c alias.t=tag t -am message newtag &&
-	test_path_is_missing paginated.out
+		test_might_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-Deleted tag 'newtag' (was a052248)
-ok 25 - git tag as alias ignores pager.tag with -a
+		git ls-files >tracked &&
+		test_line_count = 2 tracked &&
 
-expecting success of 7006.26 'git tag as alias respects pager.tag with -l': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag=false -c alias.t=tag t -l &&
-	test_path_is_missing paginated.out
+		test_path_is_missing olddir/a &&
+		test_path_is_file newdir/alpha &&
+		test_path_is_file newdir/b &&
 
-initial
-ok 26 - git tag as alias respects pager.tag with -l
+		git rev-parse >actual \
+			HEAD:newdir/alpha  HEAD:newdir/b &&
+		git rev-parse >expect \
+			A:newdir/a         O:oldir/b &&
+		test_cmp expect actual
+	)
 
-expecting success of 7006.27 'git branch defaults to paging': 
-	rm -f paginated.out &&
-	test_terminal git branch &&
-	test_path_is_file paginated.out
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12h/.git/
+[master (root-commit) 94e6431] orig
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 olddir/a
+ create mode 100644 olddir/b
+Switched to branch 'A'
+[A 9bdc996] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ rename {olddir => newdir}/a (70%)
+ rename {olddir => newdir}/b (100%)
+Switched to branch 'B'
+[B bec6409] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename olddir/{a => alpha} (100%)
+Note: switching to 'A^0'.
 
-ok 27 - git branch defaults to paging
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.28 'git branch respects pager.branch': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.branch=false branch &&
-	test_path_is_missing paginated.out
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-* master
-ok 28 - git branch respects pager.branch
+  git switch -c <new-branch-name>
 
-expecting success of 7006.29 'git branch respects --no-pager': 
-	rm -f paginated.out &&
-	test_terminal git --no-pager branch &&
-	test_path_is_missing paginated.out
+Or undo this operation with:
 
-* master
-ok 29 - git branch respects --no-pager
+  git switch -
 
-expecting success of 7006.30 'git branch --edit-description ignores pager.branch': 
-	rm -f paginated.out editor.used &&
-	write_script editor <<-\EOF &&
-		echo "New description" >"$1"
-		touch editor.used
-	EOF
-	EDITOR=./editor test_terminal git -c pager.branch branch --edit-description &&
-	test_path_is_missing paginated.out &&
-	test_path_is_file editor.used
+Turn off this advice by setting config variable advice.detachedHead to false
 
-hint: Waiting for your editor to close the file... 
ok 30 - git branch --edit-description ignores pager.branch
+HEAD is now at 9bdc996 A
+Path updated: olddir/a renamed to olddir/alpha in B^0, inside a directory that was renamed in HEAD; moving it to newdir/alpha.
+CONFLICT (rename/rename): olddir/a renamed to newdir/a in HEAD and to newdir/alpha in B^0.
+Automatic merge failed; fix conflicts and then commit the result.
+test_line_count: line count for tracked != 2
+newdir/a
+newdir/alpha
+newdir/b
+olddir/a
+not ok 61 - 12h: renaming a file within a renamed directory # TODO known breakage
 
-expecting success of 7006.31 'git branch --set-upstream-to ignores pager.branch': 
-	rm -f paginated.out &&
-	git branch other &&
-	test_when_finished "git branch -D other" &&
-	test_terminal git -c pager.branch branch --set-upstream-to=other &&
-	test_when_finished "git branch --unset-upstream" &&
-	test_path_is_missing paginated.out
+expecting success of 6423.62 '12i: Directory rename causes rename-to-self': 
+	test_setup_12i &&
+	(
+		cd 12i &&
 
-branch 'master' set up to track 'other'.
-Deleted branch other (was 24b24cf).
-ok 31 - git branch --set-upstream-to ignores pager.branch
+		git checkout A^0 &&
 
-expecting success of 7006.32 'git config ignores pager.config when setting': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.config config foo.bar bar &&
-	test_path_is_missing paginated.out
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
 
-ok 32 - git config ignores pager.config when setting
+		test_path_is_missing source/subdir &&
+		test_path_is_file source/bar &&
+		test_path_is_file source/baz &&
 
-expecting success of 7006.33 'git config --edit ignores pager.config': 
-	rm -f paginated.out editor.used &&
-	write_script editor <<-\EOF &&
-		touch editor.used
-	EOF
-	EDITOR=./editor test_terminal git -c pager.config config --edit &&
-	test_path_is_missing paginated.out &&
-	test_path_is_file editor.used
+		git ls-files | uniq >tracked &&
+		test_line_count = 3 tracked &&
 
-hint: Waiting for your editor to close the file... 
ok 33 - git config --edit ignores pager.config
+		git status --porcelain -uno >actual &&
+		cat >expect <<-\EOF &&
+		UU source/bar
+		 M source/baz
+		EOF
+		test_cmp expect actual
+	)
 
-expecting success of 7006.34 'git config --get ignores pager.config': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.config config --get foo.bar &&
-	test_path_is_missing paginated.out
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12i/.git/
+[master (root-commit) 552586d] orig
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 source/bar
+ create mode 100644 source/baz
+ create mode 100644 source/subdir/foo
+Switched to branch 'A'
+[A 46a9eed] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename source/{subdir => }/foo (100%)
+Switched to branch 'B'
+[B 50b462a] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename source/{ => subdir}/bar (100%)
+Note: switching to 'A^0'.
 
-bar
-ok 34 - git config --get ignores pager.config
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.35 'git config --get-urlmatch defaults to paging': 
-	rm -f paginated.out &&
-	test_terminal git -c http."https://foo.com/".bar=foo \
-			  config --get-urlmatch http https://foo.com &&
-	test_path_is_file paginated.out
+If you want to 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 35 - git config --get-urlmatch defaults to paging
+  git switch -c <new-branch-name>
 
-expecting success of 7006.36 'git config --get-all respects pager.config': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.config=false config --get-all foo.bar &&
-	test_path_is_missing paginated.out
+Or undo this operation with:
 
-bar
-ok 36 - git config --get-all respects pager.config
+  git switch -
 
-expecting success of 7006.37 'git config --list defaults to paging': 
-	rm -f paginated.out &&
-	test_terminal git config --list &&
-	test_path_is_file paginated.out
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 37 - git config --list defaults to paging
+HEAD is now at 46a9eed A
+M	source/baz
+CONFLICT (file location): source/subdir/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to source/bar.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 62 - 12i: Directory rename causes rename-to-self
 
-expecting success of 7006.38 'tests can detect color': 
-	rm -f colorful.log colorless.log &&
-	git log --no-color >colorless.log &&
-	git log --color >colorful.log &&
-	! colorful colorless.log &&
-	colorful colorful.log
+expecting success of 6423.63 '12j: Directory rename to root causes rename-to-self': 
+	test_setup_12j &&
+	(
+		cd 12j &&
 
-ok 38 - tests can detect color
+		git checkout A^0 &&
 
-expecting success of 7006.39 'no color when stdout is a regular file': 
-	rm -f colorless.log &&
-	test_config color.ui auto &&
-	git log >colorless.log &&
-	! colorful colorless.log
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
 
-ok 39 - no color when stdout is a regular file
+		test_path_is_missing subdir &&
+		test_path_is_file bar &&
+		test_path_is_file baz &&
 
-expecting success of 7006.40 'color when writing to a pager': 
-	rm -f paginated.out &&
-	test_config color.ui auto &&
-	test_terminal git log &&
-	colorful paginated.out
+		git ls-files | uniq >tracked &&
+		test_line_count = 3 tracked &&
 
-ok 40 - color when writing to a pager
+		git status --porcelain -uno >actual &&
+		cat >expect <<-\EOF &&
+		UU bar
+		 M baz
+		EOF
+		test_cmp expect actual
+	)
 
-expecting success of 7006.41 'colors are suppressed by color.pager': 
-	rm -f paginated.out &&
-	test_config color.ui auto &&
-	test_config color.pager false &&
-	test_terminal git log &&
-	! colorful paginated.out
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12j/.git/
+[master (root-commit) 59aeda9] orig
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 bar
+ create mode 100644 baz
+ create mode 100644 subdir/foo
+Switched to branch 'A'
+[A 493a8b6] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename subdir/foo => foo (100%)
+Switched to branch 'B'
+[B b7d0322] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename bar => subdir/bar (100%)
+Note: switching to 'A^0'.
 
-ok 41 - colors are suppressed by color.pager
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.42 'color when writing to a file intended for a pager': 
-	rm -f colorful.log &&
-	test_config color.ui auto &&
-	(
-		TERM=vt100 &&
-		GIT_PAGER_IN_USE=true &&
-		export TERM GIT_PAGER_IN_USE &&
-		git log >colorful.log
-	) &&
-	colorful colorful.log
+If you want to 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 42 - color when writing to a file intended for a pager
+  git switch -c <new-branch-name>
 
-expecting success of 7006.43 'colors are sent to pager for external commands': 
-	test_config alias.externallog "!git log" &&
-	test_config color.ui auto &&
-	test_terminal git -p externallog &&
-	colorful paginated.out
+Or undo this operation with:
 
-ok 43 - colors are sent to pager for external commands
+  git switch -
 
-expecting success of 7006.44 'setup: some aliases': 
-	git config alias.aliasedlog log &&
-	git config alias.true "!true"
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 44 - setup: some aliases
+HEAD is now at 493a8b6 A
+M	baz
+CONFLICT (file location): subdir/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to bar.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 63 - 12j: Directory rename to root causes rename-to-self
 
-expecting success of 7006.45 'git log - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git log
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 45 - git log - default pager is used by default
+expecting success of 6423.64 '12k: Directory rename with sibling causes rename-to-self': 
+	test_setup_12k &&
+	(
+		cd 12k &&
 
-expecting success of 7006.46 'git log - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git log &&
-		test_path_is_file PAGER_used
-	
-ok 46 - git log - PAGER overrides default pager
+		git checkout A^0 &&
 
-expecting success of 7006.47 'git log - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git log &&
-		test_path_is_file core.pager_used
-	
-ok 47 - git log - repository-local core.pager setting overrides PAGER
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
 
-expecting success of 7006.48 'git log - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git log
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 48 - git log - core.pager overrides PAGER from subdirectory
+		test_path_is_missing dirB &&
+		test_path_is_file dirA/bar &&
+		test_path_is_file dirA/baz &&
 
-expecting success of 7006.49 'git log - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git log &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 49 - git log - GIT_PAGER overrides core.pager
+		git ls-files | uniq >tracked &&
+		test_line_count = 3 tracked &&
 
-expecting success of 7006.50 'git -p log - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
+		git status --porcelain -uno >actual &&
+		cat >expect <<-\EOF &&
+		UU dirA/bar
+		 M dirA/baz
 		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git -p log
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 50 - git -p log - default pager is used by default
-
-expecting success of 7006.51 'git -p log - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git -p log &&
-		test_path_is_file PAGER_used
-	
-ok 51 - git -p log - PAGER overrides default pager
+		test_cmp expect actual
+	)
 
-expecting success of 7006.52 'git -p log - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git -p log &&
-		test_path_is_file core.pager_used
-	
-ok 52 - git -p log - repository-local core.pager setting overrides PAGER
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12k/.git/
+[master (root-commit) d90d96e] orig
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 dirA/bar
+ create mode 100644 dirA/baz
+ create mode 100644 dirB/foo
+Switched to branch 'A'
+[A 1e2e223] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {dirB => dirA}/foo (100%)
+Switched to branch 'B'
+[B 8f7e5e2] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {dirA => dirB}/bar (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7006.53 'git -p log - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git -p log
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 53 - git -p log - core.pager overrides PAGER from subdirectory
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.54 'git -p log - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git -p log &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 54 - git -p log - GIT_PAGER overrides core.pager
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7006.55 'git aliasedlog - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git aliasedlog
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 55 - git aliasedlog - default pager is used by default
+  git switch -c <new-branch-name>
 
-expecting success of 7006.56 'git aliasedlog - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git aliasedlog &&
-		test_path_is_file PAGER_used
-	
-ok 56 - git aliasedlog - PAGER overrides default pager
+Or undo this operation with:
 
-expecting success of 7006.57 'git aliasedlog - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git aliasedlog &&
-		test_path_is_file core.pager_used
-	
-ok 57 - git aliasedlog - repository-local core.pager setting overrides PAGER
+  git switch -
 
-expecting success of 7006.58 'git aliasedlog - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git aliasedlog
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 58 - git aliasedlog - core.pager overrides PAGER from subdirectory
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7006.59 'git aliasedlog - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git aliasedlog &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 59 - git aliasedlog - GIT_PAGER overrides core.pager
+HEAD is now at 1e2e223 A
+M	dirA/baz
+CONFLICT (file location): dirB/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to dirA/bar.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 64 - 12k: Directory rename with sibling causes rename-to-self
 
-expecting success of 7006.60 'git -p aliasedlog - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git -p aliasedlog
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 60 - git -p aliasedlog - default pager is used by default
+expecting success of 6423.65 '12l (B into A): Rename into each other + add/add conflict': 
+	test_setup_12l BintoA &&
+	(
+		cd 12l_BintoA &&
 
-expecting success of 7006.61 'git -p aliasedlog - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git -p aliasedlog &&
-		test_path_is_file PAGER_used
-	
-ok 61 - git -p aliasedlog - PAGER overrides default pager
+		git checkout -q A^0 &&
 
-expecting success of 7006.62 'git -p aliasedlog - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git -p aliasedlog &&
-		test_path_is_file core.pager_used
-	
-ok 62 - git -p aliasedlog - repository-local core.pager setting overrides PAGER
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-expecting success of 7006.63 'git -p aliasedlog - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git -p aliasedlog
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 63 - git -p aliasedlog - core.pager overrides PAGER from subdirectory
+		test_stdout_line_count = 5 git ls-files -s &&
 
-expecting success of 7006.64 'git -p aliasedlog - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git -p aliasedlog &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 64 - git -p aliasedlog - GIT_PAGER overrides core.pager
+		git rev-parse >actual \
+			:0:sub3/file :0:sub3/newfile :0:sub3/sub2/other \
+			:2:sub1/sub2/new_add_add_file \
+			:3:sub1/sub2/new_add_add_file &&
+		git rev-parse >expect \
+			O:sub1/file  B:sub1/newfile O:sub2/other \
+			A:sub2/new_add_add_file \
+			B:sub1/sub2/new_add_add_file &&
+		test_cmp expect actual &&
 
-expecting success of 7006.65 'git -p true - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git -p true
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 65 - git -p true - default pager is used by default
+		git ls-files -o >actual &&
+		test_write_lines actual expect >expect &&
+		test_cmp expect actual
+	)
 
-expecting success of 7006.66 'git -p true - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git -p true &&
-		test_path_is_file PAGER_used
-	
-ok 66 - git -p true - PAGER overrides default pager
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12l_BintoA/.git/
+[master (root-commit) 3d69f53] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 sub1/file
+ create mode 100644 sub2/other
+Switched to branch 'A'
+[A e3180ab] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 sub2/new_add_add_file
+ rename {sub1 => sub3}/file (100%)
+Switched to branch 'B'
+[B 4fbab5b] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ create mode 100644 sub1/newfile
+ create mode 100644 sub1/sub2/new_add_add_file
+ rename {sub2 => sub1/sub2}/other (100%)
+Path updated: sub2/new_add_add_file added in HEAD inside a directory that was renamed in B^0; moving it to sub1/sub2/new_add_add_file.
+Auto-merging sub1/sub2/new_add_add_file
+CONFLICT (add/add): Merge conflict in sub1/sub2/new_add_add_file
+Path updated: sub1/newfile added in B^0 inside a directory that was renamed in HEAD; moving it to sub3/newfile.
+Path updated: sub2/other renamed to sub1/sub2/other in B^0, inside a directory that was renamed in HEAD; moving it to sub3/sub2/other.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 65 - 12l (B into A): Rename into each other + add/add conflict
 
-expecting success of 7006.67 'git -p true - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git -p true &&
-		test_path_is_file core.pager_used
-	
-ok 67 - git -p true - repository-local core.pager setting overrides PAGER
+expecting success of 6423.66 '12l (A into B): Rename into each other + add/add conflict': 
+	test_setup_12l AintoB &&
+	(
+		cd 12l_AintoB &&
 
-expecting success of 7006.68 'git -p true - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git -p true
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 68 - git -p true - core.pager overrides PAGER from subdirectory
+		git checkout -q B^0 &&
 
-expecting success of 7006.69 'git -p true - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git -p true &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 69 - git -p true - GIT_PAGER overrides core.pager
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive A^0 &&
 
-expecting success of 7006.70 'git -p request-pull - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_must_fail test_terminal  git -p request-pull
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 70 - git -p request-pull - default pager is used by default
+		test_stdout_line_count = 5 git ls-files -s &&
 
-expecting success of 7006.71 'git -p request-pull - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_must_fail test_terminal  git -p request-pull &&
-		test_path_is_file PAGER_used
-	
-ok 71 - git -p request-pull - PAGER overrides default pager
+		git rev-parse >actual \
+			:0:sub3/file :0:sub3/newfile :0:sub3/sub2/other \
+			:2:sub1/sub2/new_add_add_file \
+			:3:sub1/sub2/new_add_add_file &&
+		git rev-parse >expect \
+			O:sub1/file  B:sub1/newfile O:sub2/other \
+			B:sub1/sub2/new_add_add_file \
+			A:sub2/new_add_add_file &&
+		test_cmp expect actual &&
 
-expecting success of 7006.72 'git -p request-pull - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_must_fail test_terminal  git -p request-pull &&
-		test_path_is_file core.pager_used
-	
-ok 72 - git -p request-pull - repository-local core.pager setting overrides PAGER
+		git ls-files -o >actual &&
+		test_write_lines actual expect >expect &&
+		test_cmp expect actual
+	)
 
-expecting success of 7006.73 'git -p request-pull - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_must_fail test_terminal  git -p request-pull
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 73 - git -p request-pull - core.pager overrides PAGER from subdirectory
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12l_AintoB/.git/
+[master (root-commit) 3d69f53] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 sub1/file
+ create mode 100644 sub2/other
+Switched to branch 'A'
+[A e3180ab] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 sub2/new_add_add_file
+ rename {sub1 => sub3}/file (100%)
+Switched to branch 'B'
+[B 4fbab5b] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ create mode 100644 sub1/newfile
+ create mode 100644 sub1/sub2/new_add_add_file
+ rename {sub2 => sub1/sub2}/other (100%)
+Path updated: sub2/new_add_add_file added in A^0 inside a directory that was renamed in HEAD; moving it to sub1/sub2/new_add_add_file.
+Auto-merging sub1/sub2/new_add_add_file
+CONFLICT (add/add): Merge conflict in sub1/sub2/new_add_add_file
+Path updated: sub1/newfile added in HEAD inside a directory that was renamed in A^0; moving it to sub3/newfile.
+Path updated: sub2/other renamed to sub1/sub2/other in HEAD, inside a directory that was renamed in A^0; moving it to sub3/sub2/other.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 66 - 12l (A into B): Rename into each other + add/add conflict
 
-expecting success of 7006.74 'git -p request-pull - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_must_fail test_terminal  git -p request-pull &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 74 - git -p request-pull - GIT_PAGER overrides core.pager
+expecting success of 6423.67 '12m: Change parent of renamed-dir to symlink on other side': 
+	test_setup_12m &&
+	(
+		cd 12m &&
 
-expecting success of 7006.75 'git -p - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_must_fail test_terminal  git -p
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 75 - git -p - default pager is used by default
+		git checkout -q A^0 &&
 
-expecting success of 7006.76 'git -p - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_must_fail test_terminal  git -p &&
-		test_path_is_file PAGER_used
-	
-ok 76 - git -p - PAGER overrides default pager
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
 
-checking known breakage of 7006.77 'git -p - repository-local core.pager setting is not used': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_must_fail test_terminal  git -p &&
-		! test_path_is_file core.pager_used
-	
-not ok 77 - git -p - repository-local core.pager setting is not used # TODO known breakage
+		test_stdout_line_count = 3 git ls-files -s &&
+		test_stdout_line_count = 2 ls -1 renamed-dir &&
+		test_path_is_missing dir
+	)
 
-expecting success of 7006.78 'git -p - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_must_fail test_terminal  git -p &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 78 - git -p - GIT_PAGER overrides core.pager
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/12m/.git/
+[master (root-commit) c5527ce] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/subdir/file
+Switched to branch 'A'
+[A 4ee9449] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {dir => renamed-dir}/subdir/file (100%)
+Switched to branch 'B'
+rm 'dir/subdir/file'
+[B 7225d2a] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 120000 dir/subdir
+ delete mode 100644 dir/subdir/file
+CONFLICT (file location): dir/subdir added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to renamed-dir/subdir.
+CONFLICT (rename/delete): dir/subdir/file renamed to renamed-dir/subdir/file in HEAD, but deleted in B^0.
+CONFLICT (file/directory): directory in the way of renamed-dir/subdir from B^0; moving it to renamed-dir/subdir~B^0 instead.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 67 - 12m: Change parent of renamed-dir to symlink on other side
 
-expecting success of 7006.79 'core.pager in repo config works and retains cwd': 
-	sane_unset GIT_PAGER &&
-	test_config core.pager "cat >cwd-retained" &&
+expecting success of 6423.68 '13a(conflict): messages for newly added files': 
+	test_setup_13a conflict &&
 	(
-		cd sub &&
-		rm -f cwd-retained &&
-		test_terminal git -p rev-parse HEAD &&
-		test_path_is_file cwd-retained
-	)
+		cd 13a_conflict &&
 
-ok 79 - core.pager in repo config works and retains cwd
+		git checkout A^0 &&
 
-expecting success of 7006.80 'core.pager is found via alias in subdirectory': 
-	sane_unset GIT_PAGER &&
-	test_config core.pager "cat >via-alias" &&
-	(
-		cd sub &&
-		rm -f via-alias &&
-		test_terminal git -c alias.r="-p rev-parse" r HEAD &&
-		test_path_is_file via-alias
-	)
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-ok 80 - core.pager is found via alias in subdirectory
+		test_grep CONFLICT..file.location.*z/e/f.added.in.B^0.*y/e/f out &&
+		test_grep CONFLICT..file.location.*z/d.added.in.B^0.*y/d out &&
 
-checking known breakage of 7006.81 'no pager for 'git -p nonsense'': 
-		rm -f GIT_PAGER_used &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_must_fail test_terminal  git -p nonsense &&
-		test_path_is_missing GIT_PAGER_used
-	
-Path exists:
--rw-r--r-- 1 pbuilder1 pbuilder1 24 Mar  4 08:02 GIT_PAGER_used
-not ok 81 - no pager for 'git -p nonsense' # TODO known breakage
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/[de]" paths &&
 
-expecting success of 7006.82 'git shortlog - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git shortlog
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 82 - git shortlog - default pager is used by default
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d &&
+		test_path_is_missing z/e/f &&
+		test_path_is_file    y/e/f
+	)
 
-expecting success of 7006.83 'git shortlog - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git shortlog &&
-		test_path_is_file PAGER_used
-	
-ok 83 - git shortlog - PAGER overrides default pager
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13a_conflict/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B aa97264] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/d
+ create mode 100644 z/e/f
+Note: switching to 'A^0'.
 
-expecting success of 7006.84 'git shortlog - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git shortlog &&
-		test_path_is_file core.pager_used
-	
-ok 84 - git shortlog - repository-local core.pager setting overrides PAGER
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.85 'git shortlog - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git shortlog
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 85 - git shortlog - core.pager overrides PAGER from subdirectory
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7006.86 'git shortlog - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git shortlog &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 86 - git shortlog - GIT_PAGER overrides core.pager
+  git switch -c <new-branch-name>
 
-expecting success of 7006.87 'setup: configure shortlog not to paginate': 
-	git config pager.shortlog false
+Or undo this operation with:
 
-ok 87 - setup: configure shortlog not to paginate
+  git switch -
 
-expecting success of 7006.88 'no pager for 'git shortlog'': 
-		rm -f GIT_PAGER_used &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git shortlog &&
-		test_path_is_missing GIT_PAGER_used
-	
-ok 88 - no pager for 'git shortlog'
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7006.89 'git shortlog - core.pager is not used from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git shortlog
-		) &&
-		! test_path_is_file core.pager_used
-	
-File core.pager_used doesn't exist
-ok 89 - git shortlog - core.pager is not used from subdirectory
+HEAD is now at 4e9f86d A
+CONFLICT (file location): z/e/f added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/e/f.
+CONFLICT (file location): z/d added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
+y/d
+y/e/f
+ok 68 - 13a(conflict): messages for newly added files
 
-expecting success of 7006.90 'git -p shortlog - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git -p shortlog
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 90 - git -p shortlog - default pager is used by default
+expecting success of 6423.69 '13a(info): messages for newly added files': 
+	test_setup_13a info &&
+	(
+		cd 13a_info &&
 
-expecting success of 7006.91 'git -p shortlog - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git -p shortlog
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 91 - git -p shortlog - core.pager overrides PAGER from subdirectory
+		git reset --hard &&
+		git checkout A^0 &&
 
-expecting success of 7006.92 'git -p apply </dev/null - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_must_fail test_terminal  git -p apply </dev/null
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 92 - git -p apply </dev/null - core.pager overrides PAGER from subdirectory
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-expecting success of 7006.93 'command-specific pager': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_unconfig core.pager &&
-	test_config pager.log "sed s/^/foo:/ >actual" &&
-	test_terminal git log --format=%s -1 &&
-	test_cmp expect actual
+		test_grep Path.updated:.*z/e/f.added.in.B^0.*y/e/f out &&
+		test_grep Path.updated:.*z/d.added.in.B^0.*y/d out &&
 
-ok 93 - command-specific pager
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/[de]" paths &&
 
-expecting success of 7006.94 'command-specific pager overrides core.pager': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_config core.pager "exit 1" &&
-	test_config pager.log "sed s/^/foo:/ >actual" &&
-	test_terminal git log --format=%s -1 &&
-	test_cmp expect actual
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d &&
+		test_path_is_missing z/e/f &&
+		test_path_is_file    y/e/f
+	)
 
-ok 94 - command-specific pager overrides core.pager
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13a_info/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B aa97264] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/d
+ create mode 100644 z/e/f
+HEAD is now at aa97264 B
+Note: switching to 'A^0'.
 
-expecting success of 7006.95 'command-specific pager overridden by environment': 
-	GIT_PAGER="sed s/^/foo:/ >actual" && export GIT_PAGER &&
-	>actual &&
-	echo "foo:initial" >expect &&
-	test_config pager.log "exit 1" &&
-	test_terminal git log --format=%s -1 &&
-	test_cmp expect actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 95 - command-specific pager overridden by environment
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7006.96 'setup external command': 
-	cat >git-external <<-\EOF &&
-	#!/bin/sh
-	git "$@"
-	EOF
-	chmod +x git-external
+  git switch -c <new-branch-name>
 
-ok 96 - setup external command
+Or undo this operation with:
 
-expecting success of 7006.97 'command-specific pager works for external commands': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_config pager.external "sed s/^/foo:/ >actual" &&
-	test_terminal git --exec-path="$(pwd)" external log --format=%s -1 &&
-	test_cmp expect actual
+  git switch -
 
-ok 97 - command-specific pager works for external commands
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7006.98 'sub-commands of externals use their own pager': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_config pager.log "sed s/^/foo:/ >actual" &&
-	test_terminal git --exec-path=. external log --format=%s -1 &&
-	test_cmp expect actual
+HEAD is now at 4e9f86d A
+Path updated: z/e/f added in B^0 inside a directory that was renamed in HEAD; moving it to y/e/f.
+Path updated: z/d added in B^0 inside a directory that was renamed in HEAD; moving it to y/d.
+y/d
+y/e/f
+ok 69 - 13a(info): messages for newly added files
 
-ok 98 - sub-commands of externals use their own pager
+expecting success of 6423.70 '13b(conflict): messages for transitive rename with conflicted content': 
+	test_setup_13b conflict &&
+	(
+		cd 13b_conflict &&
 
-expecting success of 7006.99 'external command pagers override sub-commands': 
-	sane_unset PAGER GIT_PAGER &&
-	>actual &&
-	test_config pager.external false &&
-	test_config pager.log "sed s/^/log:/ >actual" &&
-	test_terminal git --exec-path=. external log --format=%s -1 &&
-	test_must_be_empty actual
+		git checkout A^0 &&
 
-initial
-ok 99 - external command pagers override sub-commands
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-expecting success of 7006.100 'command with underscores does not complain': 
-	write_script git-under_score <<-\EOF &&
-	echo ok
-	EOF
-	git --exec-path=. under_score >actual 2>&1 &&
-	echo ok >expect &&
-	test_cmp expect actual
+		test_grep CONFLICT.*content.*Merge.conflict.in.y/d out &&
+		test_grep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
 
-ok 100 - command with underscores does not complain
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/d" paths &&
 
-expecting success of 7006.101 'git tag with auto-columns ': 
-	test_commit one &&
-	test_commit two &&
-	test_commit three &&
-	test_commit four &&
-	test_commit five &&
-	cat >expect <<-\EOF &&
-	initial  one      two      three    four     five
-	EOF
-	test_terminal env PAGER="cat >actual" COLUMNS=80 \
-		git -c column.ui=auto tag --sort=authordate &&
-	test_cmp expect actual
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d
+	)
 
-[master bdf0f03] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master c613728] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master dbd092b] three
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13b_conflict/.git/
+[master (root-commit) f84ec32] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[master a0ce8ac] four
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A a2010ab] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-[master 03bd18b] five
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B cd61ab0] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 five.t
-ok 101 - git tag with auto-columns 
-
-expecting success of 7006.102 'setup trace2': 
-	GIT_TRACE2_BRIEF=1 &&
-	export GIT_TRACE2_BRIEF
-
-ok 102 - setup trace2
-
-expecting success of 7006.103 'setup large log output': 
-	perl -e "
-		print \"this is a long commit message\" x 50000
-	" >commit-msg &&
-	git commit --allow-empty -F commit-msg
+ rename {x => z}/d (75%)
+Note: switching to 'A^0'.
 
-[master 06d9144] this is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit message
- Author: A U Thor <author@example.com>
-ok 103 - setup large log output
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.104 'git returns SIGPIPE on early pager exit': 
-	test_when_finished "rm pager-used trace.normal" &&
-	test_config core.pager ">pager-used; head -n 1; exit 0" &&
-	GIT_TRACE2="$(pwd)/trace.normal" &&
-	export GIT_TRACE2 &&
-	test_when_finished "unset GIT_TRACE2" &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	if test_have_prereq !MINGW
-	then
-		{ test_terminal git log >/dev/null; OUT=$?; } &&
-		test_match_signal 13 "$OUT"
-	else
-		test_terminal git log
-	fi &&
+  git switch -c <new-branch-name>
 
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:0 " child-exits &&
-	test_path_is_file pager-used
+Or undo this operation with:
 
-died of signal 13 at /build/reproducible-path/git-2.47.2/t/test-terminal.perl line 33.
-child_exit[0] pid:792248 code:0 elapsed:0.026491
-ok 104 - git returns SIGPIPE on early pager exit
+  git switch -
 
-expecting success of 7006.105 'git returns SIGPIPE on early pager non-zero exit': 
-	test_when_finished "rm pager-used trace.normal" &&
-	test_config core.pager ">pager-used; head -n 1; exit 1" &&
-	GIT_TRACE2="$(pwd)/trace.normal" &&
-	export GIT_TRACE2 &&
-	test_when_finished "unset GIT_TRACE2" &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	if test_have_prereq !MINGW
-	then
-		{ test_terminal git log >/dev/null; OUT=$?; } &&
-		test_match_signal 13 "$OUT"
-	else
-		test_terminal git log
-	fi &&
+HEAD is now at a2010ab A
+CONFLICT (content): Merge conflict in y/d
+CONFLICT (file location): x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
+y/d
+y/d
+y/d
+ok 70 - 13b(conflict): messages for transitive rename with conflicted content
 
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:1 " child-exits &&
-	test_path_is_file pager-used
+expecting success of 6423.71 '13b(info): messages for transitive rename with conflicted content': 
+	test_setup_13b info &&
+	(
+		cd 13b_info &&
 
-died of signal 13 at /build/reproducible-path/git-2.47.2/t/test-terminal.perl line 33.
-child_exit[0] pid:792482 code:1 elapsed:0.053721
-ok 105 - git returns SIGPIPE on early pager non-zero exit
+		git reset --hard &&
+		git checkout A^0 &&
 
-expecting success of 7006.106 'git discards pager non-zero exit without SIGPIPE': 
-	test_when_finished "rm pager-used trace.normal" &&
-	test_config core.pager "wc >pager-used; exit 1" &&
-	GIT_TRACE2="$(pwd)/trace.normal" &&
-	export GIT_TRACE2 &&
-	test_when_finished "unset GIT_TRACE2" &&
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-	test_terminal git log &&
+		test_grep CONFLICT.*content.*Merge.conflict.in.y/d out &&
+		test_grep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
 
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:1 " child-exits &&
-	test_path_is_file pager-used
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/d" paths &&
 
-child_exit[0] pid:792895 code:1 elapsed:0.016312
-ok 106 - git discards pager non-zero exit without SIGPIPE
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d
+	)
 
-expecting success of 7006.107 'git errors when asked to execute nonexisting pager': 
-	test_when_finished "rm -f err" &&
-	test_config core.pager "does-not-exist" &&
-	test_must_fail test_terminal git log 2>err &&
-	test_grep "unable to execute pager" err
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13b_info/.git/
+[master (root-commit) f84ec32] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A a2010ab] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B cd61ab0] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename {x => z}/d (75%)
+HEAD is now at cd61ab0 B
+Note: switching to 'A^0'.
 
-fatal: unable to execute pager 'does-not-exist'
-ok 107 - git errors when asked to execute nonexisting pager
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.108 'git returns SIGPIPE on propagated signals from pager': 
-	test_when_finished "rm pager-used trace.normal" &&
-	test_config core.pager ">pager-used; exec test-tool sigchain" &&
-	GIT_TRACE2="$(pwd)/trace.normal" &&
-	export GIT_TRACE2 &&
-	test_when_finished "unset GIT_TRACE2" &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	if test_have_prereq !MINGW
-	then
-		{ test_terminal git log >/dev/null; OUT=$?; } &&
-		test_match_signal 13 "$OUT"
-	else
-		test_terminal git log
-	fi &&
+  git switch -c <new-branch-name>
 
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:143 " child-exits &&
-	test_path_is_file pager-used
+Or undo this operation with:
 
-died of signal 13 at /build/reproducible-path/git-2.47.2/t/test-terminal.perl line 33.
-child_exit[0] pid:793332 code:143 elapsed:0.027552
-ok 108 - git returns SIGPIPE on propagated signals from pager
+  git switch -
 
-expecting success of 7006.109 'non-existent pager doesnt cause crash': 
-	test_config pager.show invalid-pager &&
-	test_must_fail test_terminal git show
+Turn off this advice by setting config variable advice.detachedHead to false
 
-error: cannot run invalid-pager: No such file or directory
-fatal: unable to execute pager 'invalid-pager'
-ok 109 - non-existent pager doesnt cause crash
+HEAD is now at a2010ab A
+CONFLICT (content): Merge conflict in y/d
+Path updated: x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD; moving it to y/d.
+y/d
+y/d
+y/d
+ok 71 - 13b(info): messages for transitive rename with conflicted content
 
-# still have 3 known breakage(s)
-# passed all remaining 106 test(s)
-1..109
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7401-submodule-summary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7401-submodule-summary/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7401-submodule-summary/sm1/.git/
-expecting success of 7401.1 'added submodule': 
-	git add sm1 &&
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 0000000...a2c4dab (2):
-	  > Add foo2
+expecting success of 6423.72 '13c(conflict): messages for rename/rename(1to1) via transitive rename': 
+	test_setup_13c conflict &&
+	(
+		cd 13c_conflict &&
 
-	EOF
-	test_cmp expected actual
+		git checkout A^0 &&
 
-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 advice.addEmbeddedRepo false"
-ok 1 - added submodule
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-expecting success of 7401.2 'added submodule (subdirectory)': 
-	mkdir sub &&
-	(
-		cd sub &&
-		git submodule summary >../actual
-	) &&
-	cat >expected <<-EOF &&
-	* ../sm1 0000000...a2c4dab (2):
-	  > Add foo2
+		test_grep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
 
-	EOF
-	test_cmp expected actual
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/d" paths &&
 
-ok 2 - added submodule (subdirectory)
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d
+	)
 
-expecting success of 7401.3 'added submodule (subdirectory only)': 
-	(
-		cd sub &&
-		git submodule summary . >../actual
-	) &&
-	test_must_be_empty actual
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13c_conflict/.git/
+[master (root-commit) 868129a] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 13 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 x/e
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 230cc6a] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {x => y}/d (100%)
+Switched to branch 'B'
+[B e9512b7] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+Note: switching to 'A^0'.
 
-ok 3 - added submodule (subdirectory only)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 7401.4 'added submodule (subdirectory with explicit path)': 
-	(
-		cd sub &&
-		git submodule summary ../sm1 >../actual
-	) &&
-	cat >expected <<-EOF &&
-	* ../sm1 0000000...a2c4dab (2):
-	  > Add foo2
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	EOF
-	test_cmp expected actual
+  git switch -c <new-branch-name>
 
-ok 4 - added submodule (subdirectory with explicit path)
+Or undo this operation with:
 
-expecting success of 7401.5 'modified submodule(forward)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 a2c4dab...4c8d358 (1):
-	  > Add foo3
+  git switch -
 
-	EOF
-	test_cmp expected actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 5 - modified submodule(forward)
+HEAD is now at 230cc6a A
+CONFLICT (file location): x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
+y/d
+y/d
+y/d
+ok 72 - 13c(conflict): messages for rename/rename(1to1) via transitive rename
 
-expecting success of 7401.6 'modified submodule(forward), --files': 
-	git submodule summary --files >actual &&
-	cat >expected <<-EOF &&
-	* sm1 a2c4dab...4c8d358 (1):
-	  > Add foo3
+expecting success of 6423.73 '13c(info): messages for rename/rename(1to1) via transitive rename': 
+	test_setup_13c info &&
+	(
+		cd 13c_info &&
 
-	EOF
-	test_cmp expected actual
+		git reset --hard &&
+		git checkout A^0 &&
 
-ok 6 - modified submodule(forward), --files
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-expecting success of 7401.7 'no ignore=all setting has any effect': 
-	git config -f .gitmodules submodule.sm1.path sm1 &&
-	git config -f .gitmodules submodule.sm1.ignore all &&
-	git config submodule.sm1.ignore all &&
-	git config diff.ignoreSubmodules all &&
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 a2c4dab...4c8d358 (1):
-	  > Add foo3
+		test_grep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
 
-	EOF
-	test_cmp expected actual &&
-	git config --unset diff.ignoreSubmodules &&
-	git config --remove-section submodule.sm1 &&
-	git config -f .gitmodules --remove-section submodule.sm1
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/d" paths &&
 
-ok 7 - no ignore=all setting has any effect
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d
+	)
 
-expecting success of 7401.8 'modified submodule(backward)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 4c8d358...db425b6 (2):
-	  < Add foo3
-	  < Add foo2
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13c_info/.git/
+[master (root-commit) 868129a] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 13 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 x/e
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 230cc6a] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {x => y}/d (100%)
+Switched to branch 'B'
+[B e9512b7] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+HEAD is now at e9512b7 B
+Note: switching to 'A^0'.
 
-	EOF
-	test_cmp expected actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 8 - modified submodule(backward)
+If you want to 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 7401.9 'modified submodule(backward and forward)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 4c8d358...41fbea9 (4):
-	  > Add foo5
-	  > Add foo4
-	  < Add foo3
-	  < Add foo2
+  git switch -c <new-branch-name>
 
-	EOF
-	test_cmp expected actual
+Or undo this operation with:
 
-ok 9 - modified submodule(backward and forward)
+  git switch -
 
-expecting success of 7401.10 '--summary-limit': 
-	git submodule summary -n 3 >actual &&
-	cat >expected <<-EOF &&
-	* sm1 4c8d358...41fbea9 (4):
-	  > Add foo5
-	  > Add foo4
-	  < Add foo3
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	EOF
-	test_cmp expected actual
+HEAD is now at 230cc6a A
+Path updated: x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD; moving it to y/d.
+y/d
+ok 73 - 13c(info): messages for rename/rename(1to1) via transitive rename
 
-ok 10 - --summary-limit
+expecting success of 6423.74 '13d(conflict): messages for rename/rename(1to1) via dual transitive rename': 
+	test_setup_13d conflict &&
+	(
+		cd 13d_conflict &&
 
-expecting success of 7401.11 'typechanged submodule(submodule->blob), --cached': 
-	git submodule summary --cached >actual &&
-	cat >expected <<-EOF &&
-	* sm1 41fbea9(submodule)->9da5fb8(blob) (3):
-	  < Add foo5
+		git checkout A^0 &&
 
-	EOF
-	test_cmp expected actual
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-ok 11 - typechanged submodule(submodule->blob), --cached
+		test_grep CONFLICT..file.location.*a/y.renamed.to.b/y.*moved.to.d/y out &&
+		test_grep CONFLICT..file.location.*a/y.renamed.to.c/y.*moved.to.d/y out &&
 
-expecting success of 7401.12 'typechanged submodule(submodule->blob), --files': 
-	git submodule summary --files >actual &&
-	cat >expected <<-EOF &&
-	* sm1 9da5fb8(blob)->41fbea9(submodule) (3):
-	  > Add foo5
+		git ls-files >paths &&
+		! grep b/ paths &&
+		! grep c/ paths &&
+		grep "d/y" paths &&
 
-	EOF
-	test_cmp expected actual
+		test_path_is_missing b/y &&
+		test_path_is_missing c/y &&
+		test_path_is_file    d/y
+	)
 
-ok 12 - typechanged submodule(submodule->blob), --files
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13d_conflict/.git/
+[master (root-commit) c14d00a] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 a/y
+ create mode 100644 a/z
+ create mode 100644 b/x
+ create mode 100644 c/w
+Switched to branch 'A'
+[A e246998] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {a => b}/y (100%)
+ rename {c => d}/w (100%)
+Switched to branch 'B'
+[B 0624e26] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {a => c}/y (100%)
+ rename {b => d}/x (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7401.13 'typechanged submodule(submodule->blob)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 41fbea9(submodule)->9da5fb8(blob):
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	EOF
-	test_cmp expected actual
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-fatal: exec 'rev-parse': cd to 'sm1' failed: Not a directory
-ok 13 - typechanged submodule(submodule->blob)
+  git switch -c <new-branch-name>
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7401-submodule-summary/sm1/.git/
-expecting success of 7401.14 'nonexistent commit': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 41fbea9...6858906:
-	  Warn: sm1 doesn't contain commit 41fbea99b81568012be3e9bcc31431971c1e5bc5
+Or undo this operation with:
 
-	EOF
-	test_cmp expected actual
+  git switch -
 
-ok 14 - nonexistent commit
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7401.15 'typechanged submodule(blob->submodule)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 9da5fb8(blob)->6858906(submodule) (2):
-	  > Add foo7
+HEAD is now at e246998 A
+CONFLICT (file location): a/y renamed to b/y in HEAD, inside a directory that was renamed in B^0, suggesting it should perhaps be moved to d/y.
+CONFLICT (file location): a/y renamed to c/y in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to d/y.
+d/y
+d/y
+d/y
+ok 74 - 13d(conflict): messages for rename/rename(1to1) via dual transitive rename
 
-	EOF
-	test_cmp expected actual
+expecting success of 6423.75 '13d(info): messages for rename/rename(1to1) via dual transitive rename': 
+	test_setup_13d info &&
+	(
+		cd 13d_info &&
 
-ok 15 - typechanged submodule(blob->submodule)
+		git reset --hard &&
+		git checkout A^0 &&
 
-expecting success of 7401.16 'deleted submodule': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 6858906...0000000:
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-	EOF
-	test_cmp expected actual
+		test_grep Path.updated.*a/y.renamed.to.b/y.*moving.it.to.d/y out &&
+		test_grep Path.updated.*a/y.renamed.to.c/y.*moving.it.to.d/y out &&
 
-ok 16 - deleted submodule
+		git ls-files >paths &&
+		! grep b/ paths &&
+		! grep c/ paths &&
+		grep "d/y" paths &&
 
-expecting success of 7401.17 'create second submodule': 
-	test_create_repo sm2 &&
-	head7=$(add_file sm2 foo8 foo9) &&
-	git add sm2
+		test_path_is_missing b/y &&
+		test_path_is_missing c/y &&
+		test_path_is_file    d/y
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7401-submodule-summary/sm2/.git/
-warning: adding embedded git repository: sm2
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sm2
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sm2
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-ok 17 - create second submodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13d_info/.git/
+[master (root-commit) c14d00a] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 a/y
+ create mode 100644 a/z
+ create mode 100644 b/x
+ create mode 100644 c/w
+Switched to branch 'A'
+[A e246998] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {a => b}/y (100%)
+ rename {c => d}/w (100%)
+Switched to branch 'B'
+[B 0624e26] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {a => c}/y (100%)
+ rename {b => d}/x (100%)
+HEAD is now at 0624e26 B
+Note: switching to 'A^0'.
 
-expecting success of 7401.18 'multiple submodules': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 6858906...0000000:
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	EOF
-	test_cmp expected actual
+  git switch -c <new-branch-name>
 
-ok 18 - multiple submodules
+Or undo this operation with:
 
-expecting success of 7401.19 'path filter': 
-	git submodule summary sm2 >actual &&
-	cat >expected <<-EOF &&
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
+  git switch -
 
-	EOF
-	test_cmp expected actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 19 - path filter
+HEAD is now at e246998 A
+Path updated: a/y renamed to b/y in HEAD, inside a directory that was renamed in B^0; moving it to d/y.
+Path updated: a/y renamed to c/y in B^0, inside a directory that was renamed in HEAD; moving it to d/y.
+d/y
+ok 75 - 13d(info): messages for rename/rename(1to1) via dual transitive rename
 
-expecting success of 7401.20 'given commit': 
-	git submodule summary HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	* sm1 6858906...0000000:
+expecting success of 6423.76 '13e: directory rename detection in recursive case': 
+	test_setup_13e &&
+	(
+		cd 13e &&
 
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
+		git checkout --quiet D^0 &&
 
-	EOF
-	test_cmp expected actual
+		git -c merge.directoryRenames=conflict merge -s recursive C^0 >out 2>err &&
 
-ok 20 - given commit
+		test_grep ! CONFLICT out &&
+		test_grep ! BUG: err &&
+		test_grep ! core.dumped err &&
+		test_must_be_empty err &&
 
-expecting success of 7401.21 '--for-status': 
-	git submodule summary --for-status HEAD^ >actual &&
-	test_cmp - actual <<-EOF
-	* sm1 6858906...0000000:
+		git ls-files >paths &&
+		! grep a/x paths &&
+		grep b/x paths
+	)
 
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6423-merge-rename-directories/13e/.git/
+[master (root-commit) 3de9c0f] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a/y
+ create mode 100644 a/z
+Switched to branch 'A'
+[A 8654583] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {a => b}/y (100%)
+ rename {a => b}/z (100%)
+Switched to branch 'B'
+[B 4f343f5] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/x
+Switched to branch 'C'
+CONFLICT (file location): a/x added in B inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to b/x.
+Automatic merge failed; fix conflicts and then commit the result.
+[C 95c9ae8] C
+ Author: A U Thor <author@example.com>
+Switched to branch 'D'
+CONFLICT (file location): a/x added in HEAD inside a directory that was renamed in A, suggesting it should perhaps be moved to b/x.
+Automatic merge failed; fix conflicts and then commit the result.
+[D e07996f] D
+ Author: A U Thor <author@example.com>
+b/x
+ok 76 - 13e: directory rename detection in recursive case
 
-	EOF
+# still have 2 known breakage(s)
+# passed all remaining 74 test(s)
+1..76
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7409-submodule-detached-work-tree.sh ***
+expecting success of 7409.1 'setup': 
+	git config --global protocol.file.allow always
 
-ok 21 - --for-status
+ok 1 - setup
 
-expecting success of 7401.22 'fail when using --files together with --cached': 
-	test_must_fail git submodule summary --files --cached
+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
+		)
+	)
 
-fatal: options '--cached' and '--files' cannot be used together
-ok 22 - fail when using --files together with --cached
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7409-submodule-detached-work-tree/remote/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t7409-submodule-detached-work-tree/home2/../bundle1) registered for path '.vim/bundle/sogood'
+Cloning into '/build/reproducible-path/git-2.47.2/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 7401.23 'should not fail in an empty repo': 
-	git init xyzzy &&
-	cd xyzzy &&
-	git submodule summary >output 2>&1 &&
-	test_must_be_empty output
+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
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7401-submodule-summary/xyzzy/.git/
-ok 23 - should not fail in an empty repo
+Cloning into bare repository '/build/reproducible-path/git-2.47.2/t/trash directory.t7409-submodule-detached-work-tree/home3/.dotfiles'...
+done.
+Already on 'main'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7409-submodule-detached-work-tree/home3/../remote
+   2f89248..e996493  main -> main
+From /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7409-submodule-detached-work-tree/home/../bundle1) registered for path '.vim/bundle/dupe'
+Cloning into '/build/reproducible-path/git-2.47.2/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 23 test(s)
-1..23
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7411-submodule-config.sh ***
@@ -460769,1299 +461752,308 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7409-submodule-detached-work-tree.sh ***
-expecting success of 7409.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
+*** t7401-submodule-summary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7401-submodule-summary/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7401-submodule-summary/sm1/.git/
+expecting success of 7401.1 'added submodule': 
+	git add sm1 &&
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 0000000...a2c4dab (2):
+	  > Add foo2
 
-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
-		)
-	)
+	EOF
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7409-submodule-detached-work-tree/remote/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t7409-submodule-detached-work-tree/home2/../bundle1) registered for path '.vim/bundle/sogood'
-Cloning into '/build/reproducible-path/git-2.47.2/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
+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 advice.addEmbeddedRepo false"
+ok 1 - added submodule
 
-expecting success of 7409.3 'submodule on detached working pointed by core.worktree': 
-	mkdir home3 &&
+expecting success of 7401.2 'added submodule (subdirectory)': 
+	mkdir sub &&
 	(
-		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 sub &&
+		git submodule summary >../actual
 	) &&
-	(
-		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.47.2/t/trash directory.t7409-submodule-detached-work-tree/home3/.dotfiles'...
-done.
-Already on 'main'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7409-submodule-detached-work-tree/home3/../remote
-   2f89248..e996493  main -> main
-From /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7409-submodule-detached-work-tree/home/../bundle1) registered for path '.vim/bundle/dupe'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7063-status-untracked-cache.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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
+	cat >expected <<-EOF &&
+	* ../sm1 0000000...a2c4dab (2):
+	  > Add foo2
 
-	done sha1:1946f0437f90c5005533cbe1736a6451ca301714
-	done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc
 	EOF
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+ok 2 - added submodule (subdirectory)
 
-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
+expecting success of 7401.3 'added submodule (subdirectory only)': 
+	(
+		cd sub &&
+		git submodule summary . >../actual
+	) &&
+	test_must_be_empty 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
+ok 3 - added submodule (subdirectory only)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
+expecting success of 7401.4 'added submodule (subdirectory with explicit path)': 
+	(
+		cd sub &&
+		git submodule summary ../sm1 >../actual
+	) &&
+	cat >expected <<-EOF &&
+	* ../sm1 0000000...a2c4dab (2):
+	  > Add foo2
 
-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
+	EOF
+	test_cmp expected actual
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
+ok 4 - added submodule (subdirectory with explicit path)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 47 - setting core.untrackedCache to keep
+expecting success of 7401.5 'modified submodule(forward)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 a2c4dab...4c8d358 (1):
+	  > Add foo3
 
-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
+	EOF
+	test_cmp expected 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
+ok 5 - modified submodule(forward)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	done/five
-	done/four
-	done/sub/
-	dtwo/
-	four
+expecting success of 7401.6 'modified submodule(forward), --files': 
+	git submodule summary --files >actual &&
+	cat >expected <<-EOF &&
+	* sm1 a2c4dab...4c8d358 (1):
+	  > Add foo3
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 48 - test ident field is working
+	EOF
+	test_cmp expected actual
 
-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
+ok 6 - modified submodule(forward), --files
 
-[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 7401.7 'no ignore=all setting has any effect': 
+	git config -f .gitmodules submodule.sm1.path sm1 &&
+	git config -f .gitmodules submodule.sm1.ignore all &&
+	git config submodule.sm1.ignore all &&
+	git config diff.ignoreSubmodules all &&
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 a2c4dab...4c8d358 (1):
+	  > Add foo3
 
-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
+	EOF
+	test_cmp expected actual &&
+	git config --unset diff.ignoreSubmodules &&
+	git config --remove-section submodule.sm1 &&
+	git config -f .gitmodules --remove-section submodule.sm1
 
-[main 527fa0b] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 50 - untracked cache survives a commit
+ok 7 - no ignore=all setting has any effect
 
-expecting success of 7063.51 'teardown worktree': 
-	cd ..
+expecting success of 7401.8 'modified submodule(backward)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 4c8d358...db425b6 (2):
+	  < Add foo3
+	  < Add foo2
 
-ok 51 - teardown worktree
+	EOF
+	test_cmp expected actual
 
-checking prerequisite: SYMLINKS
+ok 8 - modified submodule(backward)
 
-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 7401.9 'modified submodule(backward and forward)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 4c8d358...41fbea9 (4):
+	  > Add foo5
+	  > Add foo4
+	  < Add foo3
+	  < Add foo2
 
-)
-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"
+	EOF
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+ok 9 - modified submodule(backward and forward)
 
-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
+expecting success of 7401.10 '--summary-limit': 
+	git submodule summary -n 3 >actual &&
+	cat >expected <<-EOF &&
+	* sm1 4c8d358...41fbea9 (4):
+	  > Add foo5
+	  > Add foo4
+	  < Add foo3
 
-Note: switching to 'HEAD~'.
+	EOF
+	test_cmp expected actual
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 10 - --summary-limit
 
-If you want to 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 7401.11 'typechanged submodule(submodule->blob), --cached': 
+	git submodule summary --cached >actual &&
+	cat >expected <<-EOF &&
+	* sm1 41fbea9(submodule)->9da5fb8(blob) (3):
+	  < Add foo5
 
-  git switch -c <new-branch-name>
+	EOF
+	test_cmp expected actual
 
-Or undo this operation with:
+ok 11 - typechanged submodule(submodule->blob), --cached
 
-  git switch -
+expecting success of 7401.12 'typechanged submodule(submodule->blob), --files': 
+	git submodule summary --files >actual &&
+	cat >expected <<-EOF &&
+	* sm1 9da5fb8(blob)->41fbea9(submodule) (3):
+	  > Add foo5
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	EOF
+	test_cmp expected actual
 
-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
+ok 12 - typechanged submodule(submodule->blob), --files
 
-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 7401.13 'typechanged submodule(submodule->blob)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 41fbea9(submodule)->9da5fb8(blob):
 
-Note: switching to 'HEAD~'.
+	EOF
+	test_cmp expected actual
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+fatal: exec 'rev-parse': cd to 'sm1' failed: Not a directory
+ok 13 - typechanged submodule(submodule->blob)
 
-If you want to 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.47.2/t/trash directory.t7401-submodule-summary/sm1/.git/
+expecting success of 7401.14 'nonexistent commit': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 41fbea9...6858906:
+	  Warn: sm1 doesn't contain commit 41fbea99b81568012be3e9bcc31431971c1e5bc5
 
-  git switch -c <new-branch-name>
+	EOF
+	test_cmp expected actual
 
-Or undo this operation with:
+ok 14 - nonexistent commit
 
-  git switch -
+expecting success of 7401.15 'typechanged submodule(blob->submodule)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 9da5fb8(blob)->6858906(submodule) (2):
+	  > Add foo7
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	EOF
+	test_cmp expected actual
 
-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
+ok 15 - typechanged submodule(blob->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"
+expecting success of 7401.16 'deleted submodule': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	EOF
+	test_cmp expected actual
 
-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
+ok 16 - deleted submodule
 
-Note: switching to 'HEAD~'.
+expecting success of 7401.17 'create second submodule': 
+	test_create_repo sm2 &&
+	head7=$(add_file sm2 foo8 foo9) &&
+	git add sm2
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.47.2/t/trash directory.t7401-submodule-summary/sm2/.git/
+warning: adding embedded git repository: sm2
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm2
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm2
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+ok 17 - create second submodule
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7401.18 'multiple submodules': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
 
-  git switch -c <new-branch-name>
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
 
-Or undo this operation with:
+	EOF
+	test_cmp expected actual
 
-  git switch -
+ok 18 - multiple submodules
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7401.19 'path filter': 
+	git submodule summary sm2 >actual &&
+	cat >expected <<-EOF &&
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
 
-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
+	EOF
+	test_cmp expected actual
 
-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
+ok 19 - path filter
 
-Note: switching to 'HEAD~'.
+expecting success of 7401.20 'given commit': 
+	git submodule summary HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	EOF
+	test_cmp expected actual
 
-  git switch -c <new-branch-name>
+ok 20 - given commit
 
-Or undo this operation with:
+expecting success of 7401.21 '--for-status': 
+	git submodule summary --for-status HEAD^ >actual &&
+	test_cmp - actual <<-EOF
+	* sm1 6858906...0000000:
 
-  git switch -
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	EOF
 
-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
+ok 21 - --for-status
 
-expecting success of 7063.58 'empty repo (no index) and core.untrackedCache': 
-	git init emptyrepo &&
-	git -C emptyrepo -c core.untrackedCache=true write-tree
+expecting success of 7401.22 'fail when using --files together with --cached': 
+	test_must_fail git submodule summary --files --cached
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/emptyrepo/.git/
-4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 58 - empty repo (no index) and core.untrackedCache
+fatal: options '--cached' and '--files' cannot be used together
+ok 22 - fail when using --files together with --cached
 
-# passed all 58 test(s)
-1..58
+expecting success of 7401.23 'should not fail in an empty repo': 
+	git init xyzzy &&
+	cd xyzzy &&
+	git submodule summary >output 2>&1 &&
+	test_must_be_empty output
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7401-submodule-summary/xyzzy/.git/
+ok 23 - should not fail in an empty repo
+
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7414-submodule-mistakes.sh ***
@@ -462135,216 +462127,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7413-submodule-is-active.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 conifg
-	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.47.2/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.47.2/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.47.2/t/trash directory.t7413-submodule-is-active/super/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/t/trash directory.t7413-submodule-is-active/super2/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7413-submodule-is-active/super2/mod'...
-done.
-true
-ok 9 - is-active, submodule.active and submodule add
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7417-submodule-path-url.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7417-submodule-path-url/.git/
-expecting success of 7417.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7417.2 'create submodule with dash in path': 
-	git init upstream &&
-	git -C upstream commit --allow-empty -m base &&
-	git submodule add ./upstream sub &&
-	git mv sub ./-sub &&
-	git commit -m submodule
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7417-submodule-path-url/upstream/.git/
-[main (root-commit) a4b5938] base
- Author: A U Thor <author@example.com>
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7417-submodule-path-url/sub'...
-done.
-warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
-[main (root-commit) c0215d8] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 -sub
- create mode 100644 .gitmodules
-ok 2 - create submodule with dash in path
-
-expecting success of 7417.3 'clone rejects unprotected dash': 
-	test_when_finished "rm -rf dst" &&
-	git clone --recurse-submodules . dst 2>err &&
-	test_grep ignoring err
-
-warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
-ok 3 - clone rejects unprotected dash
-
-expecting success of 7417.4 'fsck rejects unprotected dash': 
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesPath err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7417-submodule-path-url/dst/
-remote: error: object 7e03af04dae731f9aa8e2febaf8b530bdafd3aa1: gitmodulesPath: disallowed submodule path: -sub        
-ok 4 - fsck rejects unprotected dash
-
-ok 5 # skip submodule paths disallows trailing spaces (missing MINGW)
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7403-submodule-sync.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7403-submodule-sync/.git/
 expecting success of 7403.1 'setup': 
@@ -462841,371 +462623,496 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7416-submodule-dash-url.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/.git/
-expecting success of 7416.1 'setup': 
-	git config --global protocol.file.allow always
+*** t7413-submodule-is-active.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
 
-ok 1 - setup
+	# Remove submodule.<name>.active entries in order to test in an
+	# environment where only URLs are present in the conifg
+	git -C super config --unset submodule.sub1.active &&
+	git -C super config --unset submodule.sub2.active &&
 
-expecting success of 7416.2 'create submodule with protected dash in url': 
-	git init upstream &&
-	git -C upstream commit --allow-empty -m base &&
-	mv upstream ./-upstream &&
-	git submodule add ./-upstream sub &&
-	git add sub .gitmodules &&
-	git commit -m submodule
+	git -C super commit -a -m "add 2 submodules at sub{1,2}"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/upstream/.git/
-[master (root-commit) a4b5938] base
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7413-submodule-is-active/sub/.git/
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/sub'...
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7413-submodule-is-active/super/sub1'...
 done.
-[master (root-commit) a5de7d8] submodule
+Cloning into '/build/reproducible-path/git-2.47.2/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>
- 2 files changed, 4 insertions(+)
+ 3 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 sub
-ok 2 - create submodule with protected dash in url
+ create mode 160000 sub1
+ create mode 160000 sub2
+ok 1 - setup
 
-expecting success of 7416.3 'clone can recurse submodule': 
-	test_when_finished "rm -rf dst" &&
-	git clone --recurse-submodules . dst &&
-	echo base >expect &&
-	git -C dst/sub log -1 --format=%s >actual &&
+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
 
-Cloning into 'dst'...
+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.47.2/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.47.2/t/trash directory.t7413-submodule-is-active/super2/sub1'...
 done.
-Submodule 'sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/./-upstream) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/sub'...
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7413-submodule-is-active/super2/mod'...
 done.
-Submodule path 'sub': checked out 'a4b5938bdb0638bd7b0fd149a017cda4db88b551'
-ok 3 - clone can recurse submodule
+true
+ok 9 - is-active, submodule.active and submodule add
 
-expecting success of 7416.4 'fsck accepts protected dash': 
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	git push dst HEAD
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7417-submodule-path-url.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7417-submodule-path-url/.git/
+expecting success of 7417.1 'setup': 
+	git config --global protocol.file.allow always
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-To dst
- * [new branch]      HEAD -> master
-ok 4 - fsck accepts protected dash
+ok 1 - setup
 
-expecting success of 7416.5 'remove ./ protection from .gitmodules url': 
-	perl -i -pe "s{\./}{}" .gitmodules &&
-	git commit -am "drop protection"
+expecting success of 7417.2 'create submodule with dash in path': 
+	git init upstream &&
+	git -C upstream commit --allow-empty -m base &&
+	git submodule add ./upstream sub &&
+	git mv sub ./-sub &&
+	git commit -m submodule
 
-[master 6caf163] drop protection
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7417-submodule-path-url/upstream/.git/
+[main (root-commit) a4b5938] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - remove ./ protection from .gitmodules url
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7417-submodule-path-url/sub'...
+done.
+warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
+[main (root-commit) c0215d8] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 -sub
+ create mode 100644 .gitmodules
+ok 2 - create submodule with dash in path
 
-expecting success of 7416.6 'clone rejects unprotected dash': 
+expecting success of 7417.3 'clone rejects unprotected dash': 
 	test_when_finished "rm -rf dst" &&
-	test_must_fail git clone --recurse-submodules . dst 2>err &&
+	git clone --recurse-submodules . dst 2>err &&
 	test_grep ignoring err
 
-warning: ignoring 'submodule.sub.url' which may be interpreted as a command-line option: -upstream
-ok 6 - clone rejects unprotected dash
+warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
+ok 3 - clone rejects unprotected dash
 
-expecting success of 7416.7 'fsck rejects unprotected dash': 
+expecting success of 7417.4 'fsck rejects unprotected dash': 
 	test_when_finished "rm -rf dst" &&
 	git init --bare dst &&
 	git -C dst config transfer.fsckObjects true &&
 	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+	grep gitmodulesPath err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 3203a2d7fb3e9335b43e66a0c95b96887ed3670f: gitmodulesUrl: disallowed submodule url: -upstream        
-ok 7 - fsck rejects unprotected dash
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7417-submodule-path-url/dst/
+remote: error: object 7e03af04dae731f9aa8e2febaf8b530bdafd3aa1: gitmodulesPath: disallowed submodule path: -sub        
+ok 4 - fsck rejects unprotected dash
 
-expecting success of 7416.8 'trailing backslash is handled correctly': 
-	git init testmodule &&
-	test_commit -C testmodule c &&
-	git submodule add ./testmodule &&
-	: ensure that the name ends in a double backslash &&
-	sed -e "s|\\(submodule \"testmodule\\)\"|\\1\\\\\\\\\"|" \
-		-e "s|url = .*|url = \" --should-not-be-an-option\"|" \
-		<.gitmodules >.new &&
-	mv .new .gitmodules &&
-	git commit -am "Add testmodule" &&
-	test_must_fail git clone --verbose --recurse-submodules . dolly 2>err &&
-	test_grep ! "unknown option" err
+ok 5 # skip submodule paths disallows trailing spaces (missing MINGW)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/testmodule/.git/
-[master (root-commit) ea1ac38] c
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7412-submodule-absorbgitdirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7412-submodule-absorbgitdirs/.git/
+expecting success of 7412.1 'setup a real submodule': 
+	cwd="$(pwd)" &&
+	git init sub1 &&
+	test_commit -C sub1 first &&
+	git submodule add ./sub1 &&
+	test_tick &&
+	git commit -m superproject
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1/.git/
+[master (root-commit) 50e526b] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Adding existing repo at 'testmodule' to the index
-[master 8635531] Add testmodule
+ create mode 100644 first.t
+Adding existing repo at 'sub1' to the index
+[master (root-commit) 807c578] superproject
  Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+), 1 deletion(-)
- create mode 160000 testmodule
-ok 8 - trailing backslash is handled correctly
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub1
+ok 1 - setup a real submodule
 
-expecting success of 7416.9 'fsck rejects missing URL scheme': 
-	git checkout --orphan missing-scheme &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = http::one.example.com/foo.git
+expecting success of 7412.2 'absorb the git dir': 
+	>expect &&
+	>actual &&
+	>expect.1 &&
+	>expect.2 &&
+	>actual.1 &&
+	>actual.2 &&
+	git status >expect.1 &&
+	git -C sub1 rev-parse HEAD >expect.2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub1' from
+	'$cwd/sub1/.git' to
+	'$cwd/.git/modules/sub1'
 	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "gitmodules with missing URL scheme" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+	git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	git fsck &&
+	test -f sub1/.git &&
+	test -d .git/modules/sub1 &&
+	git status >actual.1 &&
+	git -C sub1 rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
 
-Switched to a new branch 'missing-scheme'
-[missing-scheme (root-commit) 43f6d1d] gitmodules with missing URL scheme
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 1b0034738c4ff76356b39245a20e6e3db27b9f16: gitmodulesUrl: disallowed submodule url: http::one.example.com/foo.git        
-ok 9 - fsck rejects missing URL scheme
+ok 2 - absorb the git dir
 
-expecting success of 7416.10 'fsck rejects relative URL resolving to missing scheme': 
-	git checkout --orphan relative-missing-scheme &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = "..\\../.\\../:one.example.com/foo.git"
-	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "gitmodules with relative URL that strips off scheme" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+expecting success of 7412.3 'absorbing does not fail for deinitialized submodules': 
+	test_when_finished "git submodule update --init" &&
+	git submodule deinit --all &&
+	git submodule absorbgitdirs 2>err &&
+	test_must_be_empty err &&
+	test -d .git/modules/sub1 &&
+	test -d sub1 &&
+	! test -e sub1/.git
 
-Switched to a new branch 'relative-missing-scheme'
-[relative-missing-scheme (root-commit) ae93fe4] gitmodules with relative URL that strips off scheme
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 7994991dc5ea69078db13d6a6fe8ebdb9095f4f6: gitmodulesUrl: disallowed submodule url: ..\../.\../:one.example.com/foo.git        
-ok 10 - fsck rejects relative URL resolving to missing scheme
+Cleared directory 'sub1'
+Submodule 'sub1' (./sub1) unregistered for path 'sub1'
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1) registered for path 'sub1'
+Submodule path 'sub1': checked out '50e526bb426771f6036ad3a8b0c81d511d91fc2a'
+ok 3 - absorbing does not fail for deinitialized submodules
 
-expecting success of 7416.11 'fsck rejects empty URL scheme': 
-	git checkout --orphan empty-scheme &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = http::://one.example.com/foo.git
-	EOF
-	git add .gitmodules &&
+expecting success of 7412.4 'setup nested submodule': 
+	git init sub1/nested &&
+	test_commit -C sub1/nested first_nested &&
+	git -C sub1 submodule add ./nested &&
 	test_tick &&
-	git commit -m "gitmodules with empty URL scheme" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+	git -C sub1 commit -m "add nested" &&
+	git add sub1 &&
+	git commit -m "sub1 to include nested submodule"
 
-Switched to a new branch 'empty-scheme'
-[empty-scheme (root-commit) 4daaf62] gitmodules with empty URL scheme
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1/nested/.git/
+[master (root-commit) 2139925] first_nested
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first_nested.t
+Adding existing repo at 'nested' to the index
+[detached HEAD 838ca49] add nested
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 606181337c1ac6c1464989eddb68e626ebd5cebb: gitmodulesUrl: disallowed submodule url: http::://one.example.com/foo.git        
-ok 11 - fsck rejects empty URL scheme
+ create mode 160000 nested
+[master 4a7bb23] sub1 to include nested submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - setup nested submodule
 
-expecting success of 7416.12 'fsck rejects relative URL resolving to empty scheme': 
-	git checkout --orphan relative-empty-scheme &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = ../../../:://one.example.com/foo.git
+expecting success of 7412.5 'absorb the git dir in a nested submodule': 
+	git status >expect.1 &&
+	git -C sub1/nested rev-parse HEAD >expect.2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub1/nested' from
+	'$cwd/sub1/nested/.git' to
+	'$cwd/.git/modules/sub1/modules/nested'
 	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "relative gitmodules URL resolving to empty scheme" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+	git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	test -f sub1/nested/.git &&
+	test -d .git/modules/sub1/modules/nested &&
+	git status >actual.1 &&
+	git -C sub1/nested rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
 
-Switched to a new branch 'relative-empty-scheme'
-[relative-empty-scheme (root-commit) 266aaa0] relative gitmodules URL resolving to empty scheme
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 6e731804bddde8189151d1e3afed752027c01894: gitmodulesUrl: disallowed submodule url: ../../../:://one.example.com/foo.git        
-ok 12 - fsck rejects relative URL resolving to empty scheme
+ok 5 - absorb the git dir in a nested submodule
 
-expecting success of 7416.13 'fsck rejects empty hostname': 
-	git checkout --orphan empty-host &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = http:///one.example.com/foo.git
-	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "gitmodules with extra slashes" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+expecting success of 7412.6 're-setup nested submodule': 
+	# un-absorb the direct submodule, to test if the nested submodule
+	# is still correct (needs a rewrite of the gitfile only)
+	rm -rf sub1/.git &&
+	mv .git/modules/sub1 sub1/.git &&
+	GIT_WORK_TREE=. git -C sub1 config --unset core.worktree &&
+	# fixup the nested submodule
+	echo "gitdir: ../.git/modules/nested" >sub1/nested/.git &&
+	GIT_WORK_TREE=../../../nested git -C sub1/.git/modules/nested config \
+		core.worktree "../../../nested" &&
+	# make sure this re-setup is correct
+	git status --ignore-submodules=none &&
 
-Switched to a new branch 'empty-host'
-[empty-host (root-commit) bfddfb4] gitmodules with extra slashes
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 86df12e51bea97cc0153a56ca357968b068043bb: gitmodulesUrl: disallowed submodule url: http:///one.example.com/foo.git        
-ok 13 - fsck rejects empty hostname
+	# also make sure this old setup does not regress
+	git submodule update --init --recursive >out 2>err &&
+	test_must_be_empty out &&
+	test_must_be_empty err
 
-expecting success of 7416.14 'fsck rejects relative url that produced empty hostname': 
-	git checkout --orphan messy-relative &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = ../../..//one.example.com/foo.git
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual.1
+	actual.2
+	err
+	expect
+	expect.1
+	expect.2
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 6 - re-setup nested submodule
+
+expecting success of 7412.7 'absorb the git dir in a nested submodule': 
+	git status >expect.1 &&
+	git -C sub1/nested rev-parse HEAD >expect.2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub1' from
+	'$cwd/sub1/.git' to
+	'$cwd/.git/modules/sub1'
 	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "gitmodules abusing relative_path" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+	git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	test -f sub1/.git &&
+	test -f sub1/nested/.git &&
+	test -d .git/modules/sub1/modules/nested &&
+	git status >actual.1 &&
+	git -C sub1/nested rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
 
-Switched to a new branch 'messy-relative'
-[messy-relative (root-commit) 126d5fa] gitmodules abusing relative_path
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object a2186f87385db0aacec85e7779234576bd406d14: gitmodulesUrl: disallowed submodule url: ../../..//one.example.com/foo.git        
-ok 14 - fsck rejects relative url that produced empty hostname
+ok 7 - absorb the git dir in a nested submodule
 
-expecting success of 7416.15 'fsck permits embedded newline with unrecognized scheme': 
-	git checkout --orphan newscheme &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = "data://acjbkd%0akajfdickajkd"
+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 add .gitmodules &&
-	git commit -m "gitmodules with unrecognized scheme" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	git push dst HEAD
+	git -C repo-wt submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual
 
-Switched to a new branch 'newscheme'
-[newscheme (root-commit) 75b80fe] gitmodules with unrecognized scheme
+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.47.2/t/trash directory.t7412-submodule-absorbgitdirs/./sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7412-submodule-absorbgitdirs/repo-wt/sub2/.git/
+[master (root-commit) c8e0c53] A
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-To dst
- * [new branch]      HEAD -> newscheme
-ok 15 - fsck permits embedded newline with unrecognized scheme
+ 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 7416.16 'fsck rejects embedded newline in url': 
-	# create an orphan branch to avoid existing .gitmodules objects
-	git checkout --orphan newline &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-	url = "https://one.example.com?%0ahost=two.example.com/foo.git"
-	EOF
-	git add .gitmodules &&
-	git commit -m "gitmodules with newline" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+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
 
-Switched to a new branch 'newline'
-[newline (root-commit) f62dcd9] gitmodules with newline
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7412-submodule-absorbgitdirs/sub2/.git/
+[master (root-commit) b9419e0] first
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 59d2434e36eff88ddd704683001a17e1074748f7: gitmodulesUrl: disallowed submodule url: https://one.example.com?%0ahost=two.example.com/foo.git        
-ok 16 - fsck rejects embedded newline in url
+ 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 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 7416.17 'fsck rejects embedded newline in relative url': 
-	git checkout --orphan relative-newline &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = "./%0ahost=two.example.com/foo.git"
+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
-	git add .gitmodules &&
-	git commit -m "relative url with newline" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+	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
 
-Switched to a new branch 'relative-newline'
-[relative-newline (root-commit) 66a85ea] relative url with newline
+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.47.2/t/trash directory.t7412-submodule-absorbgitdirs/sub3/.git/
+[master (root-commit) dbecd43] first
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 52bc96716641eb10811fc8e92cdfd07547964b6a: gitmodulesUrl: disallowed submodule url: ./%0ahost=two.example.com/foo.git        
-ok 17 - fsck rejects embedded newline in relative url
+ 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 7416.18 'fsck rejects embedded newline in git url': 
-	git checkout --orphan git-newline &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-	url = "git://example.com:1234/repo%0a.git"
+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
-	git add .gitmodules &&
-	git commit -m "git url with newline" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+	test_must_fail git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual
 
-Switched to a new branch 'git-newline'
-[git-newline (root-commit) a8d2cc3] git url with newline
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 9fbab0793cb64859d67bc4949d7feca5341bb05b: gitmodulesUrl: disallowed submodule url: git://example.com:1234/repo%0a.git        
-ok 18 - fsck rejects embedded newline in git url
+ok 12 - absorbing fails for a submodule with multiple worktrees
 
-# passed all 18 test(s)
-1..18
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7408-submodule-reference.sh ***
@@ -463594,401 +463501,371 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7412-submodule-absorbgitdirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7412-submodule-absorbgitdirs/.git/
-expecting success of 7412.1 'setup a real submodule': 
-	cwd="$(pwd)" &&
-	git init sub1 &&
-	test_commit -C sub1 first &&
-	git submodule add ./sub1 &&
-	test_tick &&
-	git commit -m superproject
+*** t7416-submodule-dash-url.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/.git/
+expecting success of 7416.1 'setup': 
+	git config --global protocol.file.allow always
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1/.git/
-[master (root-commit) 50e526b] first
+ok 1 - setup
+
+expecting success of 7416.2 'create submodule with protected dash in url': 
+	git init upstream &&
+	git -C upstream commit --allow-empty -m base &&
+	mv upstream ./-upstream &&
+	git submodule add ./-upstream sub &&
+	git add sub .gitmodules &&
+	git commit -m submodule
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/upstream/.git/
+[master (root-commit) a4b5938] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Adding existing repo at 'sub1' to the index
-[master (root-commit) 807c578] superproject
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/sub'...
+done.
+[master (root-commit) a5de7d8] submodule
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 sub1
-ok 1 - setup a real submodule
+ create mode 160000 sub
+ok 2 - create submodule with protected dash in url
 
-expecting success of 7412.2 'absorb the git dir': 
-	>expect &&
-	>actual &&
-	>expect.1 &&
-	>expect.2 &&
-	>actual.1 &&
-	>actual.2 &&
-	git status >expect.1 &&
-	git -C sub1 rev-parse HEAD >expect.2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub1' from
-	'$cwd/sub1/.git' to
-	'$cwd/.git/modules/sub1'
-	EOF
-	git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	git fsck &&
-	test -f sub1/.git &&
-	test -d .git/modules/sub1 &&
-	git status >actual.1 &&
-	git -C sub1 rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
+expecting success of 7416.3 'clone can recurse submodule': 
+	test_when_finished "rm -rf dst" &&
+	git clone --recurse-submodules . dst &&
+	echo base >expect &&
+	git -C dst/sub log -1 --format=%s >actual &&
+	test_cmp expect actual
 
-ok 2 - absorb the git dir
+Cloning into 'dst'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/./-upstream) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/sub'...
+done.
+Submodule path 'sub': checked out 'a4b5938bdb0638bd7b0fd149a017cda4db88b551'
+ok 3 - clone can recurse submodule
 
-expecting success of 7412.3 'absorbing does not fail for deinitialized submodules': 
-	test_when_finished "git submodule update --init" &&
-	git submodule deinit --all &&
-	git submodule absorbgitdirs 2>err &&
-	test_must_be_empty err &&
-	test -d .git/modules/sub1 &&
-	test -d sub1 &&
-	! test -e sub1/.git
+expecting success of 7416.4 'fsck accepts protected dash': 
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	git push dst HEAD
 
-Cleared directory 'sub1'
-Submodule 'sub1' (./sub1) unregistered for path 'sub1'
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1) registered for path 'sub1'
-Submodule path 'sub1': checked out '50e526bb426771f6036ad3a8b0c81d511d91fc2a'
-ok 3 - absorbing does not fail for deinitialized submodules
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+To dst
+ * [new branch]      HEAD -> master
+ok 4 - fsck accepts protected dash
 
-expecting success of 7412.4 'setup nested submodule': 
-	git init sub1/nested &&
-	test_commit -C sub1/nested first_nested &&
-	git -C sub1 submodule add ./nested &&
-	test_tick &&
-	git -C sub1 commit -m "add nested" &&
-	git add sub1 &&
-	git commit -m "sub1 to include nested submodule"
+expecting success of 7416.5 'remove ./ protection from .gitmodules url': 
+	perl -i -pe "s{\./}{}" .gitmodules &&
+	git commit -am "drop protection"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1/nested/.git/
-[master (root-commit) 2139925] first_nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first_nested.t
-Adding existing repo at 'nested' to the index
-[detached HEAD 838ca49] add nested
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested
-[master 4a7bb23] sub1 to include nested submodule
+[master 6caf163] drop protection
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - setup nested submodule
+ok 5 - remove ./ protection from .gitmodules url
 
-expecting success of 7412.5 'absorb the git dir in a nested submodule': 
-	git status >expect.1 &&
-	git -C sub1/nested rev-parse HEAD >expect.2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub1/nested' from
-	'$cwd/sub1/nested/.git' to
-	'$cwd/.git/modules/sub1/modules/nested'
-	EOF
-	git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	test -f sub1/nested/.git &&
-	test -d .git/modules/sub1/modules/nested &&
-	git status >actual.1 &&
-	git -C sub1/nested rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
+expecting success of 7416.6 'clone rejects unprotected dash': 
+	test_when_finished "rm -rf dst" &&
+	test_must_fail git clone --recurse-submodules . dst 2>err &&
+	test_grep ignoring err
 
-ok 5 - absorb the git dir in a nested submodule
+warning: ignoring 'submodule.sub.url' which may be interpreted as a command-line option: -upstream
+ok 6 - clone rejects unprotected dash
 
-expecting success of 7412.6 're-setup nested submodule': 
-	# un-absorb the direct submodule, to test if the nested submodule
-	# is still correct (needs a rewrite of the gitfile only)
-	rm -rf sub1/.git &&
-	mv .git/modules/sub1 sub1/.git &&
-	GIT_WORK_TREE=. git -C sub1 config --unset core.worktree &&
-	# fixup the nested submodule
-	echo "gitdir: ../.git/modules/nested" >sub1/nested/.git &&
-	GIT_WORK_TREE=../../../nested git -C sub1/.git/modules/nested config \
-		core.worktree "../../../nested" &&
-	# make sure this re-setup is correct
-	git status --ignore-submodules=none &&
+expecting success of 7416.7 'fsck rejects unprotected dash': 
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-	# also make sure this old setup does not regress
-	git submodule update --init --recursive >out 2>err &&
-	test_must_be_empty out &&
-	test_must_be_empty err
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 3203a2d7fb3e9335b43e66a0c95b96887ed3670f: gitmodulesUrl: disallowed submodule url: -upstream        
+ok 7 - fsck rejects unprotected dash
 
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual.1
-	actual.2
-	err
-	expect
-	expect.1
-	expect.2
+expecting success of 7416.8 'trailing backslash is handled correctly': 
+	git init testmodule &&
+	test_commit -C testmodule c &&
+	git submodule add ./testmodule &&
+	: ensure that the name ends in a double backslash &&
+	sed -e "s|\\(submodule \"testmodule\\)\"|\\1\\\\\\\\\"|" \
+		-e "s|url = .*|url = \" --should-not-be-an-option\"|" \
+		<.gitmodules >.new &&
+	mv .new .gitmodules &&
+	git commit -am "Add testmodule" &&
+	test_must_fail git clone --verbose --recurse-submodules . dolly 2>err &&
+	test_grep ! "unknown option" err
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 6 - re-setup nested submodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/testmodule/.git/
+[master (root-commit) ea1ac38] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Adding existing repo at 'testmodule' to the index
+[master 8635531] Add testmodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ create mode 160000 testmodule
+ok 8 - trailing backslash is handled correctly
 
-expecting success of 7412.7 'absorb the git dir in a nested submodule': 
-	git status >expect.1 &&
-	git -C sub1/nested rev-parse HEAD >expect.2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub1' from
-	'$cwd/sub1/.git' to
-	'$cwd/.git/modules/sub1'
+expecting success of 7416.9 'fsck rejects missing URL scheme': 
+	git checkout --orphan missing-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http::one.example.com/foo.git
 	EOF
-	git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	test -f sub1/.git &&
-	test -f sub1/nested/.git &&
-	test -d .git/modules/sub1/modules/nested &&
-	git status >actual.1 &&
-	git -C sub1/nested rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
-
-ok 7 - absorb the git dir in a nested submodule
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with missing URL scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-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 &&
+Switched to a new branch 'missing-scheme'
+[missing-scheme (root-commit) 43f6d1d] gitmodules with missing URL scheme
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 1b0034738c4ff76356b39245a20e6e3db27b9f16: gitmodulesUrl: disallowed submodule url: http::one.example.com/foo.git        
+ok 9 - fsck rejects missing URL scheme
 
-	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'
+expecting success of 7416.10 'fsck rejects relative URL resolving to missing scheme': 
+	git checkout --orphan relative-missing-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "..\\../.\\../:one.example.com/foo.git"
 	EOF
-	git -C repo-wt submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with relative URL that strips off scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-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.47.2/t/trash directory.t7412-submodule-absorbgitdirs/./sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7412-submodule-absorbgitdirs/repo-wt/sub2/.git/
-[master (root-commit) c8e0c53] A
+Switched to a new branch 'relative-missing-scheme'
+[relative-missing-scheme (root-commit) ae93fe4] gitmodules with relative URL that strips off scheme
  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
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 7994991dc5ea69078db13d6a6fe8ebdb9095f4f6: gitmodulesUrl: disallowed submodule url: ..\../.\../:one.example.com/foo.git        
+ok 10 - fsck rejects relative URL resolving to missing scheme
 
-expecting success of 7412.9 'setup a gitlink with missing .gitmodules entry': 
-	git init sub2 &&
-	test_commit -C sub2 first &&
-	git add sub2 &&
-	git commit -m superproject
+expecting success of 7416.11 'fsck rejects empty URL scheme': 
+	git checkout --orphan empty-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http::://one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with empty URL scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 advice.addEmbeddedRepo false"
-[master 930a24c] superproject
+Switched to a new branch 'empty-scheme'
+[empty-scheme (root-commit) 4daaf62] gitmodules with empty URL scheme
  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
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 606181337c1ac6c1464989eddb68e626ebd5cebb: gitmodulesUrl: disallowed submodule url: http::://one.example.com/foo.git        
+ok 11 - fsck rejects empty URL scheme
 
-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'
+expecting success of 7416.12 'fsck rejects relative URL resolving to empty scheme': 
+	git checkout --orphan relative-empty-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = ../../../:://one.example.com/foo.git
 	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
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "relative gitmodules URL resolving to empty scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-ok 10 - absorbing the git dir fails for incomplete submodules
+Switched to a new branch 'relative-empty-scheme'
+[relative-empty-scheme (root-commit) 266aaa0] relative gitmodules URL resolving to empty scheme
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 6e731804bddde8189151d1e3afed752027c01894: gitmodulesUrl: disallowed submodule url: ../../../:://one.example.com/foo.git        
+ok 12 - fsck rejects relative URL resolving to empty scheme
 
-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 &&
+expecting success of 7416.13 'fsck rejects empty hostname': 
+	git checkout --orphan empty-host &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http:///one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
 	test_tick &&
-	git commit -m "add another submodule" &&
-	git -C sub3 worktree add ../sub3_second_work_tree
+	git commit -m "gitmodules with extra slashes" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+Switched to a new branch 'empty-host'
+[empty-host (root-commit) bfddfb4] gitmodules with extra slashes
  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
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 86df12e51bea97cc0153a56ca357968b068043bb: gitmodulesUrl: disallowed submodule url: http:///one.example.com/foo.git        
+ok 13 - fsck rejects empty hostname
 
-expecting success of 7412.12 'absorbing fails for a submodule with multiple worktrees': 
-	cat >expect <<-\EOF &&
-	fatal: could not lookup name for submodule 'sub2'
+expecting success of 7416.14 'fsck rejects relative url that produced empty hostname': 
+	git checkout --orphan messy-relative &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = ../../..//one.example.com/foo.git
 	EOF
-	test_must_fail git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules abusing relative_path" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-ok 12 - absorbing fails for a submodule with multiple worktrees
+Switched to a new branch 'messy-relative'
+[messy-relative (root-commit) 126d5fa] gitmodules abusing relative_path
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object a2186f87385db0aacec85e7779234576bd406d14: gitmodulesUrl: disallowed submodule url: ../../..//one.example.com/foo.git        
+ok 14 - fsck rejects relative url that produced empty hostname
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7420-submodule-set-url.sh ***
-expecting success of 7420.1 'setup': 
-	git config --global protocol.file.allow always
+expecting success of 7416.15 'fsck permits embedded newline with unrecognized scheme': 
+	git checkout --orphan newscheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "data://acjbkd%0akajfdickajkd"
+	EOF
+	git add .gitmodules &&
+	git commit -m "gitmodules with unrecognized scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	git push dst HEAD
 
-ok 1 - setup
+Switched to a new branch 'newscheme'
+[newscheme (root-commit) 75b80fe] gitmodules with unrecognized scheme
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+To dst
+ * [new branch]      HEAD -> newscheme
+ok 15 - fsck permits embedded newline with unrecognized scheme
 
-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"
-	)
+expecting success of 7416.16 'fsck rejects embedded newline in url': 
+	# create an orphan branch to avoid existing .gitmodules objects
+	git checkout --orphan newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+	url = "https://one.example.com?%0ahost=two.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "gitmodules with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/t/trash directory.t7420-submodule-set-url/super/.git/
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7420-submodule-set-url/super/submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7420-submodule-set-url/super/thepath'...
-done.
-[master (root-commit) 7cd7856] add submodules
+Switched to a new branch 'newline'
+[newline (root-commit) f62dcd9] gitmodules with newline
  Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
+ 3 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 submodule
- create mode 160000 thepath
-ok 2 - submodule config cache setup
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 59d2434e36eff88ddd704683001a17e1074748f7: gitmodulesUrl: disallowed submodule url: https://one.example.com?%0ahost=two.example.com/foo.git        
+ok 16 - fsck rejects embedded newline in url
 
-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 &&
+expecting success of 7416.17 'fsck rejects embedded newline in relative url': 
+	git checkout --orphan relative-newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "./%0ahost=two.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "relative url with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-	(
-		cd namedsubmodule &&
-		echo 2 >>file &&
-		git add file &&
-		git commit -m2
-	) &&
-	mv namedsubmodule newnamedsubmodule &&
+Switched to a new branch 'relative-newline'
+[relative-newline (root-commit) 66a85ea] relative url with newline
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 52bc96716641eb10811fc8e92cdfd07547964b6a: gitmodulesUrl: disallowed submodule url: ./%0ahost=two.example.com/foo.git        
+ok 17 - fsck rejects embedded newline in relative url
 
-	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 7416.18 'fsck rejects embedded newline in git url': 
+	git checkout --orphan git-newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+	url = "git://example.com:1234/repo%0a.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "git url with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-[master 8063db2] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 35c4e2f] 2
+Switched to a new branch 'git-newline'
+[git-newline (root-commit) a8d2cc3] git url with newline
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-fatal: '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 9fbab0793cb64859d67bc4949d7feca5341bb05b: gitmodulesUrl: disallowed submodule url: git://example.com:1234/repo%0a.git        
+ok 18 - fsck rejects embedded newline in git url
 
-# passed all 3 test(s)
-1..3
+# passed all 18 test(s)
+1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7418-submodule-sparse-gitmodules.sh ***
@@ -464165,6 +464042,121 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/t/trash directory.t7420-submodule-set-url/super/.git/
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7420-submodule-set-url/super/submodule'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/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.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7423-submodule-symlinks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7423-submodule-symlinks/.git/
 expecting success of 7423.1 'prepare': 
@@ -465023,13 +465015,13 @@
  create mode 100644 .gitmodules
 157+0 records in
 157+0 records out
-157 bytes copied, 0.00014488 s, 1.1 MB/s
+157 bytes copied, 0.000142001 s, 1.1 MB/s
 50+0 records in
 50+0 records out
-50 bytes copied, 6.352e-05 s, 787 kB/s
+50 bytes copied, 6.192e-05 s, 807 kB/s
 126+0 records in
 126+0 records out
-126 bytes copied, 0.00012164 s, 1.0 MB/s
+126 bytes copied, 0.0001184 s, 1.1 MB/s
 ok 12 - create oddly ordered pack
 
 expecting success of 7450.13 'transfer.fsckObjects handles odd pack (unpack)': 
@@ -465677,18 +465669,20 @@
 		test_path_is_missing .git/modules/hippo/hooks/HEAD
 	}
 
-Submodule path 'thing1': checked out '111f05809ae4bf877fb5852d7d418815278831e3'
 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.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1'...
 done.
-fatal: not a git repository: /build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing2/../.git/modules/hippo/hooks
+error: submodule git dir '/build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
+fatal: refusing to create/use '/build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' in another submodule's git dir
 Failed to clone 'thing2'. Retry scheduled
-BUG: submodule considered for cloning, doesn't need cloning any more?
-fatal: could not get a repository handle for submodule 'thing2'
-fatal: not a git repository: /build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing2/../.git/modules/hippo/hooks
+error: submodule git dir '/build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
+fatal: refusing to create/use '/build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' in another submodule's git dir
+Failed to clone 'thing2' a second time, aborting
+error: submodule git dir '/build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
+error: submodule git dir '/build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.47.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.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': 
@@ -467372,3025 +467366,1189 @@
 expecting success of 7501.59 'sign off (1)': 
 
 	echo 1 >positive &&
-	git add positive &&
-	git commit -s -m "thank you" &&
-	git cat-file commit HEAD >commit &&
-	sed -e "1,/^\$/d" commit >actual &&
-	(
-		echo thank you &&
-		echo &&
-		git var GIT_COMMITTER_IDENT >ident &&
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
-	) >expected &&
-	test_cmp expected actual
-
-
-[main bc9880b] thank you
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 positive
-ok 59 - sign off (1)
-
-expecting success of 7501.60 'sign off (2)': 
-
-	echo 2 >positive &&
-	git add positive &&
-	existing="Signed-off-by: Watch This <watchthis@example.com>" &&
-	git commit -s -m "thank you
-
-$existing" &&
-	git cat-file commit HEAD >commit &&
-	sed -e "1,/^\$/d" commit >actual &&
-	(
-		echo thank you &&
-		echo &&
-		echo $existing &&
-		git var GIT_COMMITTER_IDENT >ident &&
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
-	) >expected &&
-	test_cmp expected actual
-
-
-[main 606eba8] thank you
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 60 - sign off (2)
-
-expecting success of 7501.61 'signoff gap': 
-
-	echo 3 >positive &&
-	git add positive &&
-	alt="Alt-RFC-822-Header: Value" &&
-	git commit -s -m "welcome
-
-$alt" &&
-	git cat-file commit HEAD >commit &&
-	sed -e "1,/^\$/d" commit >actual &&
-	(
-		echo welcome &&
-		echo &&
-		echo $alt &&
-		git var GIT_COMMITTER_IDENT >ident &&
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
-	) >expected &&
-	test_cmp expected actual
-
-[main bfa2f49] welcome
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 61 - signoff gap
-
-expecting success of 7501.62 'signoff gap 2': 
-
-	echo 4 >positive &&
-	git add positive &&
-	alt="fixed: 34" &&
-	git commit -s -m "welcome
-
-We have now
-$alt" &&
-	git cat-file commit HEAD >commit &&
-	sed -e "1,/^\$/d" commit >actual &&
-	(
-		echo welcome &&
-		echo &&
-		echo We have now &&
-		echo $alt &&
-		echo &&
-		git var GIT_COMMITTER_IDENT >ident &&
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
-	) >expected &&
-	test_cmp expected actual
-
-[main 05c38a1] welcome
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 62 - signoff gap 2
-
-expecting success of 7501.63 'signoff respects trailer config': 
-
-	echo 5 >positive &&
-	git add positive &&
-	git commit -s -m "subject
-
-non-trailer line
-Myfooter: x" &&
-	git cat-file commit HEAD >commit &&
-	sed -e "1,/^\$/d" commit >actual &&
-	(
-		echo subject &&
-		echo &&
-		echo non-trailer line &&
-		echo Myfooter: x &&
-		echo &&
-		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
-	) >expected &&
-	test_cmp expected actual &&
-
-	echo 6 >positive &&
-	git add positive &&
-	git -c "trailer.Myfooter.ifexists=add" commit -s -m "subject
-
-non-trailer line
-Myfooter: x" &&
-	git cat-file commit HEAD >commit &&
-	sed -e "1,/^\$/d" commit >actual &&
-	(
-		echo subject &&
-		echo &&
-		echo non-trailer line &&
-		echo Myfooter: x &&
-		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
-	) >expected &&
-	test_cmp expected actual
-
-[main 9a8e5e8] subject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 953c0bc] subject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 63 - signoff respects trailer config
-
-expecting success of 7501.64 'signoff not confused by ---': 
-	cat >expected <<-EOF &&
-		subject
-
-		body
-		---
-		these dashes confuse the parser!
-
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	# should be a noop, since we already signed
-	git commit --allow-empty --signoff -F expected &&
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expected actual
-
-[main b62c51f] subject
- Author: A U Thor <author@example.com>
-ok 64 - signoff not confused by ---
-
-expecting success of 7501.65 'multiple -m': 
-
-	>negative &&
-	git add negative &&
-	git commit -m "one" -m "two" -m "three" &&
-	git cat-file commit HEAD >commit &&
-	sed -e "1,/^\$/d" commit >actual &&
-	(
-		echo one &&
-		echo &&
-		echo two &&
-		echo &&
-		echo three
-	) >expected &&
-	test_cmp expected actual
-
-
-[main 467af9a] one
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 negative
-ok 65 - multiple -m
-
-expecting success of 7501.66 'amend commit to fix author': 
-
-	oldtick=$GIT_AUTHOR_DATE &&
-	test_tick &&
-	git reset --hard &&
-	git cat-file -p HEAD >commit &&
-	sed -e "s/author.*/author $author $oldtick/" \
-		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \
-		commit >expected &&
-	git commit --amend --author="$author" &&
-	git cat-file -p HEAD >current &&
-	test_cmp expected current
-
-
-HEAD is now at 467af9a one
-[main 393f838] one
- Author: The Real Author <someguy@his.email.org>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 negative
-ok 66 - amend commit to fix author
-
-expecting success of 7501.67 'git commit <file> with dirty index': 
-	echo tacocat >elif &&
-	echo tehlulz >chz &&
-	git add chz &&
-	git commit elif -m "tacocat is a palindrome" &&
-	git show --stat >stat &&
-	grep elif stat &&
-	git diff --cached >diff &&
-	grep chz diff
-
-[main 247afdb] tacocat is a palindrome
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- elif | 2 +-
-diff --git a/chz b/chz
-+++ b/chz
-ok 67 - git commit <file> with dirty index
-
-expecting success of 7501.68 'same tree (single parent)': 
-
-	git reset --hard &&
-	test_must_fail git commit -m empty
-
-
-HEAD is now at 247afdb tacocat is a palindrome
-On branch main
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual.msg
-	commit
-	current
-	diff
-	diff1
-	diff2
-	editor
-	err
-	expect
-	expect.msg
-	expected
-	file.actual
-	file.expect
-	ident
-	msg
-	out
-	output
-	remaining
-	replace
-	stat
-	subject
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 68 - same tree (single parent)
-
-expecting success of 7501.69 'same tree (single parent) --allow-empty': 
-
-	git commit --allow-empty -m "forced empty" &&
-	git cat-file commit HEAD >commit &&
-	grep forced commit
-
-
-[main 0d75235] forced empty
- Author: A U Thor <author@example.com>
-forced empty
-ok 69 - same tree (single parent) --allow-empty
-
-expecting success of 7501.70 'same tree (merge and amend merge)': 
-
-	git checkout -b side HEAD^ &&
-	echo zero >zero &&
-	git add zero &&
-	git commit -m "add zero" &&
-	git checkout main &&
-
-	git merge -s ours side -m "empty ok" &&
-	git diff HEAD^ HEAD >actual &&
-	test_must_be_empty actual &&
-
-	git commit --amend -m "empty really ok" &&
-	git diff HEAD^ HEAD >actual &&
-	test_must_be_empty actual
-
-
-Switched to a new branch 'side'
-[side d8cd779] add zero
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 zero
-Switched to branch 'main'
-Merge made by the 'ours' strategy.
-[main 44c65f1] empty really ok
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
-ok 70 - same tree (merge and amend merge)
-
-expecting success of 7501.71 'amend using the message from another commit': 
-
-	git reset --hard &&
-	test_tick &&
-	git commit --allow-empty -m "old commit" &&
-	old=$(git rev-parse --verify HEAD) &&
-	test_tick &&
-	git commit --allow-empty -m "new commit" &&
-	new=$(git rev-parse --verify HEAD) &&
-	test_tick &&
-	git commit --allow-empty --amend -C "$old" &&
-	git show --pretty="format:%ad %s" "$old" >expected &&
-	git show --pretty="format:%ad %s" HEAD >actual &&
-	test_cmp expected actual
-
-
-HEAD is now at 44c65f1 empty really ok
-[main 7a687e6] old commit
- Author: A U Thor <author@example.com>
-[main e73fb50] new commit
- Author: A U Thor <author@example.com>
-[main e29d4f8] old commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
-ok 71 - amend using the message from another commit
-
-expecting success of 7501.72 'amend using the message from a commit named with tag': 
-
-	git reset --hard &&
-	test_tick &&
-	git commit --allow-empty -m "old commit" &&
-	old=$(git rev-parse --verify HEAD) &&
-	git tag -a -m "tag on old" tagged-old HEAD &&
-	test_tick &&
-	git commit --allow-empty -m "new commit" &&
-	new=$(git rev-parse --verify HEAD) &&
-	test_tick &&
-	git commit --allow-empty --amend -C tagged-old &&
-	git show --pretty="format:%ad %s" "$old" >expected &&
-	git show --pretty="format:%ad %s" HEAD >actual &&
-	test_cmp expected actual
-
-
-HEAD is now at e29d4f8 old commit
-[main a5814b1] old commit
- Author: A U Thor <author@example.com>
-[main 18cb5ca] new commit
- Author: A U Thor <author@example.com>
-[main 8a9a45e] old commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
-ok 72 - amend using the message from a commit named with tag
-
-expecting success of 7501.73 'amend can copy notes': 
-
-	git config notes.rewrite.amend true &&
-	git config notes.rewriteRef "refs/notes/*" &&
-	test_commit foo &&
-	git notes add -m"a note" &&
-	test_tick &&
-	git commit --amend -m"new foo" &&
-	test "$(git notes show)" = "a note"
-
-
-[main 2767bb7] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[main 96004d0] new foo
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:25:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 73 - amend can copy notes
-
-expecting success of 7501.74 'commit a file whose name is a dash': 
-	git reset --hard &&
-	test_write_lines 1 2 3 4 5 >./- &&
-	git add ./- &&
-	test_tick &&
-	git commit -m "add dash" >output </dev/null &&
-	test_grep " changed, 5 insertions" output
-
-HEAD is now at 96004d0 new foo
- 1 file changed, 5 insertions(+)
-ok 74 - commit a file whose name is a dash
-
-expecting success of 7501.75 '--only works on to-be-born branch': 
-	# This test relies on having something in the index, as it
-	# would not otherwise actually prove much.  So check this.
-	test -n "$(git ls-files)" &&
-	git checkout --orphan orphan &&
-	echo foo >newfile &&
-	git add newfile &&
-	git commit --only newfile -m"--only on unborn branch" &&
-	echo newfile >expected &&
-	git ls-tree -r --name-only HEAD >actual &&
-	test_cmp expected actual
-
-Switched to a new branch 'orphan'
-[orphan (root-commit) 9d2da19] --only on unborn branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 75 - --only works on to-be-born branch
-
-expecting success of 7501.76 '--dry-run with conflicts fixed from a merge': 
-	# setup two branches with conflicting information
-	# in the same file, resolve the conflict,
-	# call commit with --dry-run
-	echo "Initial contents, unimportant" >test-file &&
-	git add test-file &&
-	git commit -m "Initial commit" &&
-	echo "commit-1-state" >test-file &&
-	git commit -m "commit 1" -i test-file &&
-	git tag commit-1 &&
-	git checkout -b branch-2 HEAD^1 &&
-	echo "commit-2-state" >test-file &&
-	git commit -m "commit 2" -i test-file &&
-	test_must_fail git merge --no-commit commit-1 &&
-	echo "commit-2-state" >test-file &&
-	git add test-file &&
-	git commit --dry-run &&
-	git commit -m "conflicts fixed from merge."
-
-[orphan adcd2ff] Initial commit
- Author: A U Thor <author@example.com>
- 8 files changed, 15 insertions(+)
- create mode 100644 -
- create mode 100644 baz
- create mode 100644 elif
- create mode 100644 file
- create mode 100644 foo.t
- create mode 100644 negative
- create mode 100644 positive
- create mode 100644 test-file
-[orphan d0112e6] commit 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch-2'
-[branch-2 395e7f6] commit 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging test-file
-CONFLICT (content): Merge conflict in test-file
-Automatic merge failed; fix conflicts and then commit the result.
-On branch branch-2
-All conflicts fixed but you are still merging.
-  (use "git commit" to conclude merge)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual.msg
-	commit
-	current
-	diff
-	diff1
-	diff2
-	editor
-	err
-	expect
-	expect.msg
-	expected
-	file.actual
-	file.expect
-	ident
-	msg
-	out
-	output
-	remaining
-	replace
-	stat
-	subject
-
-[branch-2 ff9dcf0] conflicts fixed from merge.
- Author: A U Thor <author@example.com>
-ok 76 - --dry-run with conflicts fixed from a merge
-
-expecting success of 7501.77 '--dry-run --short': 
-	>test-file &&
-	git add test-file &&
-	git commit --dry-run --short
-
-M  test-file
-?? actual
-?? actual.msg
-?? commit
-?? current
-?? diff
-?? diff1
-?? diff2
-?? editor
-?? err
-?? expect
-?? expect.msg
-?? expected
-?? file.actual
-?? file.expect
-?? ident
-?? msg
-?? out
-?? output
-?? remaining
-?? replace
-?? stat
-?? subject
-ok 77 - --dry-run --short
-
-# passed all 77 test(s)
-1..77
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7422-submodule-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/.git/
-expecting success of 7422.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	setup_sub S  &&
-	setup_sub S.D &&
-	setup_sub S.C &&
-	setup_sub S.C.D &&
-	setup_sub X &&
-	git add S* &&
-	test_commit C &&
-
-	# recursive in X/
-	git -C X pull &&
-	GIT_ALLOW_PROTOCOL=file git -C X submodule update --init &&
-
-	# dirty
-	for d in S.D X/S.D
-	do
-		echo dirty >"$d"/A.t || return 1
-	done &&
-
-	# commit (for --cached)
-	for d in S.C* X/S.C*
-	do
-		git -C "$d" reset --hard A || return 1
-	done &&
-
-	# dirty
-	for d in S*.D X/S*.D
-	do
-		echo dirty >"$d/C2.t" || return 1
-	done &&
-
-	for ref in A B C
-	do
-		# Not different with SHA-1 and SHA-256, just (ab)using
-		# test_oid_cache as a variable bag to avoid using
-		# $(git rev-parse ...).
-		oid=$(git rev-parse $ref) &&
-		test_oid_cache <<-EOF || return 1
-		$ref sha1:$oid
-		$ref sha256:$oid
-		EOF
-	done
-
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Cloning into 'S'...
-done.
-Adding existing repo at 'S' to the index
-Cloning into 'S.D'...
-done.
-Adding existing repo at 'S.D' to the index
-Cloning into 'S.C'...
-done.
-Adding existing repo at 'S.C' to the index
-Cloning into 'S.C.D'...
-done.
-Adding existing repo at 'S.C.D' to the index
-Cloning into 'X'...
-done.
-Adding existing repo at 'X' to the index
-[master 2377ff0] C
- Author: A U Thor <author@example.com>
- 7 files changed, 21 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 C.t
- create mode 160000 S
- create mode 160000 S.C
- create mode 160000 S.C.D
- create mode 160000 S.D
- create mode 160000 X
-From /build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/.
-   d9df450..2377ff0  master     -> origin/master
- * [new tag]         C          -> C
-Updating d9df450..2377ff0
-Fast-forward
- .gitmodules | 15 +++++++++++++++
- C.t         |  1 +
- S           |  1 +
- S.C         |  1 +
- S.C.D       |  1 +
- S.D         |  1 +
- X           |  1 +
- 7 files changed, 21 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 C.t
- create mode 160000 S
- create mode 160000 S.C
- create mode 160000 S.C.D
- create mode 160000 S.D
- create mode 160000 X
-Submodule 'S' (/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/./S) registered for path 'S'
-Submodule 'S.C' (/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/./S.C) registered for path 'S.C'
-Submodule 'S.C.D' (/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/./S.C.D) registered for path 'S.C.D'
-Submodule 'S.D' (/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/./S.D) registered for path 'S.D'
-Submodule 'X' (/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/./X) registered for path 'X'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/X/S'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/X/S.C'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/X/S.C.D'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/X/S.D'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/X/X'...
-done.
-Submodule path 'S': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
-Submodule path 'S.C': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
-Submodule path 'S.C.D': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
-Submodule path 'S.D': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
-Submodule path 'X': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
-HEAD is now at 0ddfaf1 A
-HEAD is now at 0ddfaf1 A
-HEAD is now at 0ddfaf1 A
-HEAD is now at 0ddfaf1 A
-ok 1 - setup
-
-expecting success of 7422.2 'git submodule ': 
-		sed -e "s/^>//" >expect <<-EOF &&
-		> $(test_oid B) S (B)
-		>+$(test_oid A) S.C (A)
-		>+$(test_oid A) S.C.D (A)
-		> $(test_oid B) S.D (B)
-		>+$(test_oid C) X (C)
-		EOF
-		git submodule $opts >actual.raw &&
-		normalize_status <actual.raw >actual &&
-		test_cmp expect actual
-	
-ok 2 - git submodule 
-
-expecting success of 7422.3 'git submodule status': 
-		sed -e "s/^>//" >expect <<-EOF &&
-		> $(test_oid B) S (B)
-		>+$(test_oid A) S.C (A)
-		>+$(test_oid A) S.C.D (A)
-		> $(test_oid B) S.D (B)
-		>+$(test_oid C) X (C)
-		EOF
-		git submodule $opts >actual.raw &&
-		normalize_status <actual.raw >actual &&
-		test_cmp expect actual
-	
-ok 3 - git submodule status
-
-expecting success of 7422.4 'git submodule status --recursive': 
-		sed -e "s/^>//" >expect <<-EOF &&
-		> $(test_oid B) S (B)
-		>+$(test_oid A) S.C (A)
-		>+$(test_oid A) S.C.D (A)
-		> $(test_oid B) S.D (B)
-		>+$(test_oid C) X (C)
-		> $(test_oid B) X/S (B)
-		>+$(test_oid A) X/S.C (A)
-		>+$(test_oid A) X/S.C.D (A)
-		> $(test_oid B) X/S.D (B)
-		> $(test_oid B) X/X (B)
-		EOF
-		git submodule $opts >actual.raw &&
-		normalize_status <actual.raw >actual &&
-		test_cmp expect actual
-	
-ok 4 - git submodule status --recursive
-
-expecting success of 7422.5 'git submodule --quiet': 
-		git submodule $opts >out &&
-		test_must_be_empty out
-	
-ok 5 - git submodule --quiet
-
-expecting success of 7422.6 'git submodule --quiet status': 
-		git submodule $opts >out &&
-		test_must_be_empty out
-	
-ok 6 - git submodule --quiet status
-
-expecting success of 7422.7 'git submodule status --quiet': 
-		git submodule $opts >out &&
-		test_must_be_empty out
-	
-ok 7 - git submodule status --quiet
-
-expecting success of 7422.8 'git submodule --cached': 
-		sed -e "s/^>//" >expect <<-EOF &&
-		> $(test_oid B) S (B)
-		>+$(test_oid B) S.C (B)
-		>+$(test_oid B) S.C.D (B)
-		> $(test_oid B) S.D (B)
-		>+$(test_oid B) X (B)
-		EOF
-		git submodule $opts >actual.raw &&
-		normalize_status <actual.raw >actual &&
-		test_cmp expect actual
-	
-ok 8 - git submodule --cached
-
-expecting success of 7422.9 'git submodule --cached status': 
-		sed -e "s/^>//" >expect <<-EOF &&
-		> $(test_oid B) S (B)
-		>+$(test_oid B) S.C (B)
-		>+$(test_oid B) S.C.D (B)
-		> $(test_oid B) S.D (B)
-		>+$(test_oid B) X (B)
-		EOF
-		git submodule $opts >actual.raw &&
-		normalize_status <actual.raw >actual &&
-		test_cmp expect actual
-	
-ok 9 - git submodule --cached status
-
-expecting success of 7422.10 'git submodule status --cached': 
-		sed -e "s/^>//" >expect <<-EOF &&
-		> $(test_oid B) S (B)
-		>+$(test_oid B) S.C (B)
-		>+$(test_oid B) S.C.D (B)
-		> $(test_oid B) S.D (B)
-		>+$(test_oid B) X (B)
-		EOF
-		git submodule $opts >actual.raw &&
-		normalize_status <actual.raw >actual &&
-		test_cmp expect actual
-	
-ok 10 - git submodule status --cached
-
-expecting success of 7422.11 'git submodule --cached --quiet': 
-		git submodule $opts >out &&
-		test_must_be_empty out
-	
-ok 11 - git submodule --cached --quiet
-
-expecting success of 7422.12 'git submodule --cached --quiet status': 
-		git submodule $opts >out &&
-		test_must_be_empty out
-	
-ok 12 - git submodule --cached --quiet status
-
-expecting success of 7422.13 'git submodule --cached status --quiet': 
-		git submodule $opts >out &&
-		test_must_be_empty out
-	
-ok 13 - git submodule --cached status --quiet
-
-expecting success of 7422.14 'git submodule --quiet status --cached': 
-		git submodule $opts >out &&
-		test_must_be_empty out
-	
-ok 14 - git submodule --quiet status --cached
-
-expecting success of 7422.15 'git submodule status --cached --quiet': 
-		git submodule $opts >out &&
-		test_must_be_empty out
-	
-ok 15 - git submodule status --cached --quiet
-
-expecting success of 7422.16 'git submodule status --cached --recursive': 
-		sed -e "s/^>//" >expect <<-EOF &&
-		> $(test_oid B) S (B)
-		>+$(test_oid B) S.C (B)
-		>+$(test_oid B) S.C.D (B)
-		> $(test_oid B) S.D (B)
-		>+$(test_oid B) X (B)
-		> $(test_oid B) X/S (B)
-		>+$(test_oid B) X/S.C (B)
-		>+$(test_oid B) X/S.C.D (B)
-		> $(test_oid B) X/S.D (B)
-		> $(test_oid B) X/X (B)
-		EOF
-		git submodule $opts >actual.raw &&
-		normalize_status <actual.raw >actual &&
-		test_cmp expect actual
-	
-ok 16 - git submodule status --cached --recursive
-
-expecting success of 7422.17 'git submodule --cached status --recursive': 
-		sed -e "s/^>//" >expect <<-EOF &&
-		> $(test_oid B) S (B)
-		>+$(test_oid B) S.C (B)
-		>+$(test_oid B) S.C.D (B)
-		> $(test_oid B) S.D (B)
-		>+$(test_oid B) X (B)
-		> $(test_oid B) X/S (B)
-		>+$(test_oid B) X/S.C (B)
-		>+$(test_oid B) X/S.C.D (B)
-		> $(test_oid B) X/S.D (B)
-		> $(test_oid B) X/X (B)
-		EOF
-		git submodule $opts >actual.raw &&
-		normalize_status <actual.raw >actual &&
-		test_cmp expect actual
-	
-ok 17 - git submodule --cached status --recursive
-
-expecting success of 7422.18 'git submodule status --recursive propagates SIGPIPE': 
-	{ git submodule status --recursive 2>err; echo $?>status; } |
-		grep -q X/S &&
-	test_must_be_empty err &&
-	test_match_signal 13 "$(cat status)"
-
-ok 18 - git submodule status --recursive propagates SIGPIPE
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7503-pre-commit-and-pre-merge-commit-hooks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7503-pre-commit-and-pre-merge-commit-hooks/.git/
-expecting success of 7503.1 'root commit': 
-	echo "root" >file &&
-	git add file &&
-	git commit -m "zeroth" &&
-	git checkout -b side &&
-	echo "foo" >foo &&
-	git add foo &&
-	git commit -m "make it non-ff" &&
-	git branch side-orig side &&
-	git checkout main
-
-[main (root-commit) 0e29351] zeroth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'side'
-[side f4a0fae] make it non-ff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Switched to branch 'main'
-ok 1 - root commit
-
-expecting success of 7503.2 'setup conflicting branches': 
-	test_when_finished "git checkout main" &&
-	git checkout -b conflicting-a main &&
-	echo a >conflicting &&
-	git add conflicting &&
-	git commit -m conflicting-a &&
-	git checkout -b conflicting-b main &&
-	echo b >conflicting &&
-	git add conflicting &&
-	git commit -m conflicting-b
-
-Switched to a new branch 'conflicting-a'
-[conflicting-a 3f25523] conflicting-a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflicting
-Switched to a new branch 'conflicting-b'
-[conflicting-b 8c264fe] conflicting-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflicting
-Switched to branch 'main'
-ok 2 - setup conflicting branches
-
-expecting success of 7503.3 'with no hook': 
-	test_when_finished "rm -f actual_hooks" &&
-	echo "foo" >file &&
-	git add file &&
-	git commit -m "first" &&
-	test_path_is_missing actual_hooks
-
-[main e0ed36d] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - with no hook
-
-expecting success of 7503.4 'with no hook (merge)': 
-	test_when_finished "rm -f actual_hooks" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 4 - with no hook (merge)
-
-expecting success of 7503.5 '--no-verify with no hook': 
-	test_when_finished "rm -f actual_hooks" &&
-	echo "bar" >file &&
-	git add file &&
-	git commit --no-verify -m "bar" &&
-	test_path_is_missing actual_hooks
-
-[main 9b1e6a8] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - --no-verify with no hook
-
-expecting success of 7503.6 '--no-verify with no hook (merge)': 
-	test_when_finished "rm -f actual_hooks" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 6 - --no-verify with no hook (merge)
-
-expecting success of 7503.7 'with succeeding hook': 
-	setup_success_hook "pre-commit" &&
-	echo "more" >>file &&
-	git add file &&
-	git commit -m "more" &&
-	test_cmp expected_hooks actual_hooks
-
-[main 7901543] more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 7 - with succeeding hook
-
-expecting success of 7503.8 'with succeeding hook (merge)': 
-	setup_success_hook "pre-merge-commit" &&
-	git checkout side &&
-	git merge -m "merge main" main &&
-	git checkout main &&
-	test_cmp expected_hooks actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 1 +
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-ok 8 - with succeeding hook (merge)
-
-expecting success of 7503.9 'automatic merge fails; both hooks are available': 
-	setup_success_hook "pre-commit" &&
-	setup_success_hook "pre-merge-commit" &&
-
-	git checkout conflicting-a &&
-	test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
-	test_path_is_missing actual_hooks &&
-
-	echo "pre-commit" >expected_hooks &&
-	echo a+b >conflicting &&
-	git add conflicting &&
-	git commit -m "resolve conflict" &&
-	test_cmp expected_hooks actual_hooks
-
-Switched to branch 'conflicting-a'
-Auto-merging conflicting
-CONFLICT (add/add): Merge conflict in conflicting
-Automatic merge failed; fix conflicts and then commit the result.
-[conflicting-a ff0069b] resolve conflict
- Author: A U Thor <author@example.com>
-ok 9 - automatic merge fails; both hooks are available
-
-expecting success of 7503.10 '--no-verify with succeeding hook': 
-	setup_success_hook "pre-commit" &&
-	echo "even more" >>file &&
-	git add file &&
-	git commit --no-verify -m "even more" &&
-	test_path_is_missing actual_hooks
-
-[conflicting-a 79fc96c] even more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 10 - --no-verify with succeeding hook
-
-expecting success of 7503.11 '--no-verify with succeeding hook (merge)': 
-	setup_success_hook "pre-merge-commit" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 11 - --no-verify with succeeding hook (merge)
-
-expecting success of 7503.12 'with failing hook': 
-	setup_failing_hook "pre-commit" &&
-	test_when_finished "rm -f expected_hooks" &&
-	echo "pre-commit-failing-hook" >expected_hooks &&
-
-	echo "another" >>file &&
-	git add file &&
-	test_must_fail git commit -m "another" &&
-	test_cmp expected_hooks actual_hooks
-
-ok 12 - with failing hook
-
-expecting success of 7503.13 '--no-verify with failing hook': 
-	setup_failing_hook "pre-commit" &&
-	echo "stuff" >>file &&
-	git add file &&
-	git commit --no-verify -m "stuff" &&
-	test_path_is_missing actual_hooks
-
-[main 9073eff] stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 13 - --no-verify with failing hook
-
-expecting success of 7503.14 'with failing hook (merge)': 
-	setup_failing_hook "pre-merge-commit" &&
-	echo "pre-merge-commit-failing-hook" >expected_hooks &&
-	git checkout side &&
-	test_must_fail git merge -m "merge main" main &&
-	git checkout main &&
-	test_cmp expected_hooks actual_hooks
-
-Switched to branch 'side'
-Not committing merge; use 'git commit' to complete the merge.
-Switched to branch 'main'
-ok 14 - with failing hook (merge)
-
-expecting success of 7503.15 '--no-verify with failing hook (merge)': 
-	setup_failing_hook "pre-merge-commit" &&
-
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 15 - --no-verify with failing hook (merge)
-
-expecting success of 7503.16 'with non-executable hook': 
-	setup_non_exec_hook "pre-commit" &&
-	echo "content" >>file &&
-	git add file &&
-	git commit -m "content" &&
-	test_path_is_missing actual_hooks
-
-hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
-hint: You can disable this warning with `git config advice.ignoredHook false`.
-[main be1df3a] content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 16 - with non-executable hook
-
-expecting success of 7503.17 '--no-verify with non-executable hook': 
-	setup_non_exec_hook "pre-commit" &&
-	echo "more content" >>file &&
-	git add file &&
-	git commit --no-verify -m "more content" &&
-	test_path_is_missing actual_hooks
-
-[main dd373ff] more content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 17 - --no-verify with non-executable hook
-
-expecting success of 7503.18 'with non-executable hook (merge)': 
-	setup_non_exec_hook "pre-merge" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 18 - with non-executable hook (merge)
-
-expecting success of 7503.19 '--no-verify with non-executable hook (merge)': 
-	setup_non_exec_hook "pre-merge" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 19 - --no-verify with non-executable hook (merge)
-
-expecting success of 7503.20 'with hook requiring GIT_PREFIX': 
-	test_when_finished "rm -rf actual_hooks success" &&
-	setup_require_prefix_hook &&
-	echo "more content" >>file &&
-	git add file &&
-	mkdir success &&
-	(
-		cd success &&
-		git commit -m "hook requires GIT_PREFIX = success/"
-	) &&
-	test_cmp expected_hooks actual_hooks
-
-[main 91e0a75] hook requires GIT_PREFIX = success/
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 20 - with hook requiring GIT_PREFIX
-
-expecting success of 7503.21 'with failing hook requiring GIT_PREFIX': 
-	test_when_finished "rm -rf actual_hooks fail" &&
-	setup_require_prefix_hook &&
-	echo "more content" >>file &&
-	git add file &&
-	mkdir fail &&
-	(
-		cd fail &&
-		test_must_fail git commit -m "hook must fail"
-	) &&
-	git checkout -- file &&
-	test_cmp expected_hooks actual_hooks
-
-ok 21 - with failing hook requiring GIT_PREFIX
-
-expecting success of 7503.22 'check the author in hook': 
-	setup_require_author_hook &&
-	cat >expected_hooks <<-EOF &&
-	check-author
-	check-author
-	check-author
-	EOF
-	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
-	(
-		GIT_AUTHOR_NAME="New Author" &&
-		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
-		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
-		git commit --allow-empty -m "by new.author via env" &&
-		git show -s
-	) &&
-	git commit --author="New Author <newauthor@example.com>" \
-		--allow-empty -m "by new.author via command line" &&
-	git show -s &&
-	test_cmp expected_hooks actual_hooks
-
-[main 1b3a79e] by new.author via env
- Author: New Author <newauthor@example.com>
- 1 file changed, 1 insertion(+)
-commit 1b3a79eec1cf60fc72bbc0d27901d153c90e4abe
-Author: New Author <newauthor@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    by new.author via env
-[main 155e737] by new.author via command line
- Author: New Author <newauthor@example.com>
-commit 155e73716852370372b22eca0576dacb5016aa2e
-Author: New Author <newauthor@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    by new.author via command line
-ok 22 - check the author in hook
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7504-commit-msg-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7502-commit-porcelain.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7502-commit-porcelain/.git/
-expecting success of 7502.1 'output summary format': 
-
-	echo new >file1 &&
-	git add file1 &&
-	check_summary_oneline "root-commit" "initial" &&
-
-	echo change >>file1 &&
-	git add file1
-
-ok 1 - output summary format
-
-expecting success of 7502.2 'output summary format: root-commit': 
-	check_summary_oneline "" "a change"
-
-ok 2 - output summary format: root-commit
-
-expecting success of 7502.3 'output summary format for commit with an empty diff': 
-
-	check_summary_oneline "" "empty" "--allow-empty"
-
-ok 3 - output summary format for commit with an empty diff
-
-expecting success of 7502.4 'output summary format for merges': 
-
-	git checkout -b recursive-base &&
-	test_commit base file1 &&
-
-	git checkout -b recursive-a recursive-base &&
-	test_commit commit-a file1 &&
-
-	git checkout -b recursive-b recursive-base &&
-	test_commit commit-b file1 &&
-
-	# conflict
-	git checkout recursive-a &&
-	test_must_fail git merge recursive-b &&
-	# resolve the conflict
-	echo commit-a >file1 &&
-	git add file1 &&
-	check_summary_oneline "" "Merge"
-
-Switched to a new branch 'recursive-base'
-[recursive-base e6f945f] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-Switched to a new branch 'recursive-a'
-[recursive-a 9300328] commit-a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'recursive-b'
-[recursive-b 2f9e083] commit-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'recursive-a'
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - output summary format for merges
-
-expecting success of 7502.5 'the basics': 
-
-	output_tests_cleanup &&
-
-	echo doing partial >"commit is" &&
-	mkdir not &&
-	echo very much encouraged but we should >not/forbid &&
-	git add "commit is" not &&
-	echo update added "commit is" file >"commit is" &&
-	echo also update another >not/forbid &&
-	test_tick &&
-	git commit -a -m "initial with -a" &&
-
-	git cat-file blob HEAD:"commit is" >current.1 &&
-	git cat-file blob HEAD:not/forbid >current.2 &&
-
-	cmp current.1 "commit is" &&
-	cmp current.2 not/forbid
-
-
-Switched to branch 'main'
-rm 'file1'
-[main 34ca441] cleanup
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
- delete mode 100644 file1
-[main 8a2203d] initial with -a
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 commit is
- create mode 100644 not/forbid
-ok 5 - the basics
-
-expecting success of 7502.6 'partial': 
-
-	echo another >"commit is" &&
-	echo another >not/forbid &&
-	test_tick &&
-	git commit -m "partial commit to handle a file" "commit is" &&
-
-	changed=$(git diff-tree --name-only HEAD^ HEAD) &&
-	test "$changed" = "commit is"
-
-
-[main 3302250] partial commit to handle a file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - partial
-
-expecting success of 7502.7 'partial modification in a subdirectory': 
-
-	test_tick &&
-	git commit -m "partial commit to subdirectory" not &&
-
-	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
-	test "$changed" = "not/forbid"
-
-
-[main 742b3a6] partial commit to subdirectory
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - partial modification in a subdirectory
-
-expecting success of 7502.8 'partial removal': 
-
-	git rm not/forbid &&
-	git commit -m "partial commit to remove not/forbid" not &&
-
-	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
-	test "$changed" = "not/forbid" &&
-	remain=$(git ls-tree -r --name-only HEAD) &&
-	test "$remain" = "commit is"
-
-
-rm 'not/forbid'
-[main 09fd303] partial commit to remove not/forbid
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 not/forbid
-ok 8 - partial removal
-
-expecting success of 7502.9 'sign off': 
-
-	>positive &&
-	git add positive &&
-	git commit -s -m "thank you" &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -ne "s/Signed-off-by: //p" commit.msg >actual &&
-	git var GIT_COMMITTER_IDENT >ident &&
-	sed -e "s/>.*/>/" ident >expected &&
-	test_cmp expected actual
-
-
-[main cc1232b] thank you
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 positive
-ok 9 - sign off
-
-expecting success of 7502.10 'commit --trailer with "="': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main c563787] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 10 - commit --trailer with "="
-
-expecting success of 7502.11 'commit --trailer with -c and "replace" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Helped-by: C3 E3
-	EOF
-	git -c trailer.ifexists="replace" \
-		commit --trailer "Mentored-by: C4 E4" \
-		 --trailer "Helped-by: C3 E3" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main 9c665b9] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 743970c] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 11 - commit --trailer with -c and "replace" as ifexists
-
-expecting success of 7502.12 'commit --trailer with -c and "add" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.ifexists="add" \
-		commit --trailer "Reported-by: C3 E3" \
-		--trailer "Mentored-by: C4 E4" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main c0ed76d] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 3065ecb] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 12 - commit --trailer with -c and "add" as ifexists
-
-expecting success of 7502.13 'commit --trailer with -c and "donothing" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reviewed-by: C6 E6
-	EOF
-	git -c trailer.ifexists="donothing" \
-		commit --trailer "Mentored-by: C5 E5" \
-		--trailer "Reviewed-by: C6 E6" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main 2dad5db] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 86cc013] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 13 - commit --trailer with -c and "donothing" as ifexists
-
-expecting success of 7502.14 'commit --trailer with -c and "addIfDifferent" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Mentored-by: C5 E5
-	EOF
-	git -c trailer.ifexists="addIfDifferent" \
-		commit --trailer "Reported-by: C3 E3" \
-		--trailer "Mentored-by: C5 E5" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main bacbe07] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 9b53fef] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 14 - commit --trailer with -c and "addIfDifferent" as ifexists
-
-expecting success of 7502.15 'commit --trailer with -c and "addIfDifferentNeighbor" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reported-by: C3 E3
-	EOF
-	git -c trailer.ifexists="addIfDifferentNeighbor" \
-		commit --trailer "Mentored-by: C4 E4" \
-		--trailer "Reported-by: C3 E3" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main 5b19760] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main ea6f7b2] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 15 - commit --trailer with -c and "addIfDifferentNeighbor" as ifexists
-
-expecting success of 7502.16 'commit --trailer with -c and "end" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.where="end" \
-		commit --trailer "Reported-by: C3 E3" \
-		--trailer "Mentored-by: C4 E4" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 6edd712] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main abac1a7] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 16 - commit --trailer with -c and "end" as where
-
-expecting success of 7502.17 'commit --trailer with -c and "start" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C1 E1
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.where="start" \
-		commit --trailer "Signed-off-by: C O Mitter <committer@example.com>" \
-		--trailer "Signed-off-by: C1 E1" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 49719a0] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 3210bcd] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 17 - commit --trailer with -c and "start" as where
-
-expecting success of 7502.18 'commit --trailer with -c and "after" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Mentored-by: C5 E5
-	EOF
-	git -c trailer.where="after" \
-		commit --trailer "Mentored-by: C4 E4" \
-		--trailer "Mentored-by: C5 E5" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 3a4a38a] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 30c3647] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 18 - commit --trailer with -c and "after" as where
-
-expecting success of 7502.19 'commit --trailer with -c and "before" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C2 E2
-	Mentored-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.where="before" \
-		commit --trailer "Mentored-by: C3 E3" \
-		--trailer "Mentored-by: C2 E2" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main e5407b4] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 2e57a8f] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 19 - commit --trailer with -c and "before" as where
-
-expecting success of 7502.20 'commit --trailer with -c and "donothing" as ifmissing': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Helped-by: C5 E5
-	EOF
-	git -c trailer.ifmissing="donothing" \
-		commit --trailer "Helped-by: C5 E5" \
-		--trailer "Based-by: C6 E6" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
+	git add positive &&
+	git commit -s -m "thank you" &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
+	(
+		echo thank you &&
+		echo &&
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
+	) >expected &&
 	test_cmp expected actual
 
-[main 4b3be69] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main e71943e] hello
+
+[main bc9880b] thank you
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
  1 file changed, 1 insertion(+)
-ok 20 - commit --trailer with -c and "donothing" as ifmissing
+ create mode 100644 positive
+ok 59 - sign off (1)
 
-expecting success of 7502.21 'commit --trailer with -c and "add" as ifmissing': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
+expecting success of 7501.60 'sign off (2)': 
 
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Helped-by: C5 E5
-	Based-by: C6 E6
-	EOF
-	git -c trailer.ifmissing="add" \
-		commit --trailer "Helped-by: C5 E5" \
-		--trailer "Based-by: C6 E6" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
+	echo 2 >positive &&
+	git add positive &&
+	existing="Signed-off-by: Watch This <watchthis@example.com>" &&
+	git commit -s -m "thank you
+
+$existing" &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
+	(
+		echo thank you &&
+		echo &&
+		echo $existing &&
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
+	) >expected &&
 	test_cmp expected actual
 
-[main 8576769] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 3741b21] hello
+
+[main 606eba8] thank you
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 21 - commit --trailer with -c and "add" as ifmissing
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 60 - sign off (2)
 
-expecting success of 7502.22 'commit --trailer with -c ack.key ': 
-	echo "fun" >>file1 &&
-	git add file1 &&
-	cat >expected <<-\EOF &&
-		hello
+expecting success of 7501.61 'signoff gap': 
 
-		Acked-by: Peff
-	EOF
-	git -c trailer.ack.key="Acked-by" \
-		commit --trailer "ack = Peff" -m "hello" &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
+	echo 3 >positive &&
+	git add positive &&
+	alt="Alt-RFC-822-Header: Value" &&
+	git commit -s -m "welcome
+
+$alt" &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
+	(
+		echo welcome &&
+		echo &&
+		echo $alt &&
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
+	) >expected &&
 	test_cmp expected actual
 
-[main 5789976] hello
+[main bfa2f49] welcome
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 22 - commit --trailer with -c ack.key 
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 61 - signoff gap
 
-expecting success of 7502.23 'commit --trailer with -c and ":=#" as separators': 
-	echo "fun" >>file1 &&
-	git add file1 &&
-	cat >expected <<-\EOF &&
-		I hate bug
+expecting success of 7501.62 'signoff gap 2': 
 
-		Bug #42
-	EOF
-	git -c trailer.separators=":=#" \
-		-c trailer.bug.key="Bug #" \
-		commit --trailer "bug = 42" -m "I hate bug" &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
+	echo 4 >positive &&
+	git add positive &&
+	alt="fixed: 34" &&
+	git commit -s -m "welcome
+
+We have now
+$alt" &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
+	(
+		echo welcome &&
+		echo &&
+		echo We have now &&
+		echo $alt &&
+		echo &&
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
+	) >expected &&
 	test_cmp expected actual
 
-[main 6e78fd4] I hate bug
+[main 05c38a1] welcome
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 23 - commit --trailer with -c and ":=#" as separators
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 62 - signoff gap 2
 
-expecting success of 7502.24 'commit --trailer with -c and command': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
+expecting success of 7501.63 'signoff respects trailer config': 
 
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Mentored-by: C4 E4
-	Reported-by: A U Thor <author@example.com>
-	EOF
-	git -c trailer.report.key="Reported-by: " \
-		-c trailer.report.ifexists="replace" \
-		-c trailer.report.command="NAME=\"\$ARG\"; test -n \"\$NAME\" && \
-		git log --author=\"\$NAME\" -1 --format=\"format:%aN <%aE>\" || true" \
-		commit --trailer "report = author" --amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
+	echo 5 >positive &&
+	git add positive &&
+	git commit -s -m "subject
 
-[main 6b1e5e9] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 336e96f] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 24 - commit --trailer with -c and command
+non-trailer line
+Myfooter: x" &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
+	(
+		echo subject &&
+		echo &&
+		echo non-trailer line &&
+		echo Myfooter: x &&
+		echo &&
+		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
+	) >expected &&
+	test_cmp expected actual &&
 
-expecting success of 7502.25 'commit --trailer not confused by --- separator': 
-	cat >msg <<-\EOF &&
-	subject
+	echo 6 >positive &&
+	git add positive &&
+	git -c "trailer.Myfooter.ifexists=add" commit -s -m "subject
 
-	body with dashes
-	---
-	in it
-	EOF
-	git commit --allow-empty --trailer="my-trailer: value" -F msg &&
-	{
-		cat msg &&
+non-trailer line
+Myfooter: x" &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
+	(
+		echo subject &&
 		echo &&
-		echo "my-trailer: value"
-	} >expected &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
+		echo non-trailer line &&
+		echo Myfooter: x &&
+		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
+	) >expected &&
 	test_cmp expected actual
 
-[main 244a002] subject
+[main 9a8e5e8] subject
  Author: A U Thor <author@example.com>
-ok 25 - commit --trailer not confused by --- separator
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 953c0bc] subject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 63 - signoff respects trailer config
 
-expecting success of 7502.26 'commit --trailer with --verbose': 
-	cat >msg <<-\EOF &&
-	subject
+expecting success of 7501.64 'signoff not confused by ---': 
+	cat >expected <<-EOF &&
+		subject
 
-	body
+		body
+		---
+		these dashes confuse the parser!
+
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
 	EOF
-	GIT_EDITOR=: git commit --edit -F msg --allow-empty \
-		--trailer="my-trailer: value" --verbose &&
-	{
-		cat msg &&
-		echo &&
-		echo "my-trailer: value"
-	} >expected &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
+	# should be a noop, since we already signed
+	git commit --allow-empty --signoff -F expected &&
+	git log -1 --pretty=format:%B >actual &&
 	test_cmp expected actual
 
-[main 64da097] subject
+[main b62c51f] subject
  Author: A U Thor <author@example.com>
-ok 26 - commit --trailer with --verbose
+ok 64 - signoff not confused by ---
 
-expecting success of 7502.27 'multiple -m': 
+expecting success of 7501.65 'multiple -m': 
 
 	>negative &&
 	git add negative &&
 	git commit -m "one" -m "two" -m "three" &&
-	actual=$(git cat-file commit HEAD >tmp && sed -e "1,/^\$/d" tmp && rm tmp) &&
-	expected=$(test_write_lines "one" "" "two" "" "three") &&
-	test "z$actual" = "z$expected"
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
+	(
+		echo one &&
+		echo &&
+		echo two &&
+		echo &&
+		echo three
+	) >expected &&
+	test_cmp expected actual
 
 
-[main a7c1b01] one
+[main 467af9a] one
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 negative
-ok 27 - multiple -m
+ok 65 - multiple -m
 
-expecting success of 7502.28 'verbose': 
+expecting success of 7501.66 'amend commit to fix author': 
 
-	echo minus >negative &&
-	git add negative &&
-	git status -v >raw &&
-	sed -ne "/^diff --git /p" raw >actual &&
-	echo "diff --git a/negative b/negative" >expect &&
-	test_cmp expect actual
+	oldtick=$GIT_AUTHOR_DATE &&
+	test_tick &&
+	git reset --hard &&
+	git cat-file -p HEAD >commit &&
+	sed -e "s/author.*/author $author $oldtick/" \
+		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \
+		commit >expected &&
+	git commit --amend --author="$author" &&
+	git cat-file -p HEAD >current &&
+	test_cmp expected current
 
 
-ok 28 - verbose
+HEAD is now at 467af9a one
+[main 393f838] one
+ Author: The Real Author <someguy@his.email.org>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 negative
+ok 66 - amend commit to fix author
 
-expecting success of 7502.29 'verbose respects diff config': 
+expecting success of 7501.67 'git commit <file> with dirty index': 
+	echo tacocat >elif &&
+	echo tehlulz >chz &&
+	git add chz &&
+	git commit elif -m "tacocat is a palindrome" &&
+	git show --stat >stat &&
+	grep elif stat &&
+	git diff --cached >diff &&
+	grep chz diff
 
-	test_config diff.noprefix true &&
-	git status -v >actual &&
-	grep "diff --git negative negative" actual
+[main 247afdb] tacocat is a palindrome
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ elif | 2 +-
+diff --git a/chz b/chz
++++ b/chz
+ok 67 - git commit <file> with dirty index
 
-diff --git negative negative
-ok 29 - verbose respects diff config
+expecting success of 7501.68 'same tree (single parent)': 
 
-expecting success of 7502.30 'prepare file with comment line and trailing newlines': 
-	printf "%s" "$mesg_with_comment_and_newlines" >expect
+	git reset --hard &&
+	test_must_fail git commit -m empty
 
-ok 30 - prepare file with comment line and trailing newlines
 
-expecting success of 7502.31 'cleanup commit messages (verbatim option,-t)': 
+HEAD is now at 247afdb tacocat is a palindrome
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual.msg
+	commit
+	current
+	diff
+	diff1
+	diff2
+	editor
+	err
+	expect
+	expect.msg
+	expected
+	file.actual
+	file.expect
+	ident
+	msg
+	out
+	output
+	remaining
+	replace
+	stat
+	subject
 
-	echo >>negative &&
-	git commit --cleanup=verbatim --no-status -t expect -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
+nothing added to commit but untracked files present (use "git add" to track)
+ok 68 - same tree (single parent)
 
+expecting success of 7501.69 'same tree (single parent) --allow-empty': 
 
-[main 8914337] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 31 - cleanup commit messages (verbatim option,-t)
+	git commit --allow-empty -m "forced empty" &&
+	git cat-file commit HEAD >commit &&
+	grep forced commit
 
-expecting success of 7502.32 'cleanup commit messages (verbatim option,-F)': 
 
-	echo >>negative &&
-	git commit --cleanup=verbatim -F expect -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
+[main 0d75235] forced empty
+ Author: A U Thor <author@example.com>
+forced empty
+ok 69 - same tree (single parent) --allow-empty
 
+expecting success of 7501.70 'same tree (merge and amend merge)': 
 
-[main 50317d6] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 32 - cleanup commit messages (verbatim option,-F)
+	git checkout -b side HEAD^ &&
+	echo zero >zero &&
+	git add zero &&
+	git commit -m "add zero" &&
+	git checkout main &&
 
-expecting success of 7502.33 'cleanup commit messages (verbatim option,-m)': 
+	git merge -s ours side -m "empty ok" &&
+	git diff HEAD^ HEAD >actual &&
+	test_must_be_empty actual &&
 
-	echo >>negative &&
-	git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
+	git commit --amend -m "empty really ok" &&
+	git diff HEAD^ HEAD >actual &&
+	test_must_be_empty actual
 
 
-[main 3ead1ca] # text
+Switched to a new branch 'side'
+[side d8cd779] add zero
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 33 - cleanup commit messages (verbatim option,-m)
+ create mode 100644 zero
+Switched to branch 'main'
+Merge made by the 'ours' strategy.
+[main 44c65f1] empty really ok
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ok 70 - same tree (merge and amend merge)
 
-expecting success of 7502.34 'cleanup commit messages (whitespace option,-F)': 
+expecting success of 7501.71 'amend using the message from another commit': 
 
-	echo >>negative &&
-	test_write_lines "" "# text" "" >text &&
-	echo "# text" >expect &&
-	git commit --cleanup=whitespace -F text -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
+	git reset --hard &&
+	test_tick &&
+	git commit --allow-empty -m "old commit" &&
+	old=$(git rev-parse --verify HEAD) &&
+	test_tick &&
+	git commit --allow-empty -m "new commit" &&
+	new=$(git rev-parse --verify HEAD) &&
+	test_tick &&
+	git commit --allow-empty --amend -C "$old" &&
+	git show --pretty="format:%ad %s" "$old" >expected &&
+	git show --pretty="format:%ad %s" HEAD >actual &&
+	test_cmp expected actual
 
 
-[main 77206d3] # text
+HEAD is now at 44c65f1 empty really ok
+[main 7a687e6] old commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 34 - cleanup commit messages (whitespace option,-F)
-
-expecting success of 7502.35 'cleanup commit messages (scissors option,-F,-e)': 
-
-	echo >>negative &&
-	cat >text <<-\EOF &&
-
-	# to be kept
+[main e73fb50] new commit
+ Author: A U Thor <author@example.com>
+[main e29d4f8] old commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ok 71 - amend using the message from another commit
 
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	# ------------------------ >8 ------------------------
-	to be removed
-	# ------------------------ >8 ------------------------
-	to be removed, too
-	EOF
+expecting success of 7501.72 'amend using the message from a commit named with tag': 
 
-	cat >expect <<-\EOF &&
-	# to be kept
+	git reset --hard &&
+	test_tick &&
+	git commit --allow-empty -m "old commit" &&
+	old=$(git rev-parse --verify HEAD) &&
+	git tag -a -m "tag on old" tagged-old HEAD &&
+	test_tick &&
+	git commit --allow-empty -m "new commit" &&
+	new=$(git rev-parse --verify HEAD) &&
+	test_tick &&
+	git commit --allow-empty --amend -C tagged-old &&
+	git show --pretty="format:%ad %s" "$old" >expected &&
+	git show --pretty="format:%ad %s" HEAD >actual &&
+	test_cmp expected actual
 
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	EOF
-	git commit --cleanup=scissors -e -F text -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
 
-[main e047c4e] # to be kept
+HEAD is now at e29d4f8 old commit
+[main a5814b1] old commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 35 - cleanup commit messages (scissors option,-F,-e)
-
-expecting success of 7502.36 'cleanup commit messages (scissors option,-F,-e, scissors on first line)': 
-
-	echo >>negative &&
-	cat >text <<-\EOF &&
-	# ------------------------ >8 ------------------------
-	to be removed
-	EOF
-	git commit --cleanup=scissors -e -F text -a --allow-empty-message &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_must_be_empty actual
-
-[main 5e5571b] 
+[main 18cb5ca] new commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 36 - cleanup commit messages (scissors option,-F,-e, scissors on first line)
+[main 8a9a45e] old commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ok 72 - amend using the message from a commit named with tag
 
-expecting success of 7502.37 'cleanup commit messages (strip option,-F)': 
+expecting success of 7501.73 'amend can copy notes': 
 
-	echo >>negative &&
-	test_write_lines "" "# text" "sample" "" >text &&
-	echo sample >expect &&
-	git commit --cleanup=strip -F text -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
+	git config notes.rewrite.amend true &&
+	git config notes.rewriteRef "refs/notes/*" &&
+	test_commit foo &&
+	git notes add -m"a note" &&
+	test_tick &&
+	git commit --amend -m"new foo" &&
+	test "$(git notes show)" = "a note"
 
 
-[main 5968d26] sample
+[main 2767bb7] foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 37 - cleanup commit messages (strip option,-F)
-
-expecting success of 7502.38 'cleanup commit messages (strip option,-F,-e)': 
-
-	echo >>negative &&
-	test_write_lines "" "sample" "" >text &&
-	git commit -e -F text -a &&
-	head -n 4 .git/COMMIT_EDITMSG >actual
-
-[main 6ab3315] sample
+ create mode 100644 foo.t
+[main 96004d0] new foo
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:25:13 2005 -0700
  1 file changed, 1 insertion(+)
-ok 38 - cleanup commit messages (strip option,-F,-e)
-
-expecting success of 7502.39 'cleanup commit messages (strip option,-F,-e): output': 
-	test_cmp expect actual
-
-ok 39 - cleanup commit messages (strip option,-F,-e): output
-
-expecting success of 7502.40 'cleanup commit message (fail on invalid cleanup mode option)': 
-	test_must_fail git commit --cleanup=non-existent
-
-fatal: Invalid cleanup mode non-existent
-ok 40 - cleanup commit message (fail on invalid cleanup mode option)
+ create mode 100644 foo.t
+ok 73 - amend can copy notes
 
-expecting success of 7502.41 'cleanup commit message (fail on invalid cleanup mode configuration)': 
-	test_must_fail git -c commit.cleanup=non-existent commit
+expecting success of 7501.74 'commit a file whose name is a dash': 
+	git reset --hard &&
+	test_write_lines 1 2 3 4 5 >./- &&
+	git add ./- &&
+	test_tick &&
+	git commit -m "add dash" >output </dev/null &&
+	test_grep " changed, 5 insertions" output
 
-fatal: Invalid cleanup mode non-existent
-ok 41 - cleanup commit message (fail on invalid cleanup mode configuration)
+HEAD is now at 96004d0 new foo
+ 1 file changed, 5 insertions(+)
+ok 74 - commit a file whose name is a dash
 
-expecting success of 7502.42 'cleanup commit message (no config and no option uses default)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git commit --no-status
-	) &&
-	commit_msg_is "commit message"
+expecting success of 7501.75 '--only works on to-be-born branch': 
+	# This test relies on having something in the index, as it
+	# would not otherwise actually prove much.  So check this.
+	test -n "$(git ls-files)" &&
+	git checkout --orphan orphan &&
+	echo foo >newfile &&
+	git add newfile &&
+	git commit --only newfile -m"--only on unborn branch" &&
+	echo newfile >expected &&
+	git ls-tree -r --name-only HEAD >actual &&
+	test_cmp expected actual
 
-[main 06a0f0b] commit message
+Switched to a new branch 'orphan'
+[orphan (root-commit) 9d2da19] --only on unborn branch
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 42 - cleanup commit message (no config and no option uses default)
+ create mode 100644 newfile
+ok 75 - --only works on to-be-born branch
 
-expecting success of 7502.43 'cleanup commit message (option overrides default)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git commit --cleanup=whitespace --no-status
-	) &&
-	commit_msg_is "commit message # comment"
+expecting success of 7501.76 '--dry-run with conflicts fixed from a merge': 
+	# setup two branches with conflicting information
+	# in the same file, resolve the conflict,
+	# call commit with --dry-run
+	echo "Initial contents, unimportant" >test-file &&
+	git add test-file &&
+	git commit -m "Initial commit" &&
+	echo "commit-1-state" >test-file &&
+	git commit -m "commit 1" -i test-file &&
+	git tag commit-1 &&
+	git checkout -b branch-2 HEAD^1 &&
+	echo "commit-2-state" >test-file &&
+	git commit -m "commit 2" -i test-file &&
+	test_must_fail git merge --no-commit commit-1 &&
+	echo "commit-2-state" >test-file &&
+	git add test-file &&
+	git commit --dry-run &&
+	git commit -m "conflicts fixed from merge."
 
-[main 8348171] commit message # comment
+[orphan adcd2ff] Initial commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 43 - cleanup commit message (option overrides default)
+ 8 files changed, 15 insertions(+)
+ create mode 100644 -
+ create mode 100644 baz
+ create mode 100644 elif
+ create mode 100644 file
+ create mode 100644 foo.t
+ create mode 100644 negative
+ create mode 100644 positive
+ create mode 100644 test-file
+[orphan d0112e6] commit 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch-2'
+[branch-2 395e7f6] commit 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging test-file
+CONFLICT (content): Merge conflict in test-file
+Automatic merge failed; fix conflicts and then commit the result.
+On branch branch-2
+All conflicts fixed but you are still merging.
+  (use "git commit" to conclude merge)
 
-expecting success of 7502.44 'cleanup commit message (config overrides default)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git -c commit.cleanup=whitespace commit --no-status
-	) &&
-	commit_msg_is "commit message # comment"
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual.msg
+	commit
+	current
+	diff
+	diff1
+	diff2
+	editor
+	err
+	expect
+	expect.msg
+	expected
+	file.actual
+	file.expect
+	ident
+	msg
+	out
+	output
+	remaining
+	replace
+	stat
+	subject
 
-[main c4a33b1] commit message # comment
+[branch-2 ff9dcf0] conflicts fixed from merge.
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 44 - cleanup commit message (config overrides default)
+ok 76 - --dry-run with conflicts fixed from a merge
 
-expecting success of 7502.45 'cleanup commit message (option overrides config)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git -c commit.cleanup=whitespace commit --cleanup=default
-	) &&
-	commit_msg_is "commit message"
+expecting success of 7501.77 '--dry-run --short': 
+	>test-file &&
+	git add test-file &&
+	git commit --dry-run --short
 
-[main 7b9798a] commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 45 - cleanup commit message (option overrides config)
+M  test-file
+?? actual
+?? actual.msg
+?? commit
+?? current
+?? diff
+?? diff1
+?? diff2
+?? editor
+?? err
+?? expect
+?? expect.msg
+?? expected
+?? file.actual
+?? file.expect
+?? ident
+?? msg
+?? out
+?? output
+?? remaining
+?? replace
+?? stat
+?? subject
+ok 77 - --dry-run --short
 
-expecting success of 7502.46 'cleanup commit message (default, -m)': 
-	echo content >>file &&
-	git add file &&
-	git commit -m "message #comment " &&
-	commit_msg_is "message #comment"
+# passed all 77 test(s)
+1..77
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7422-submodule-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/.git/
+expecting success of 7422.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	setup_sub S  &&
+	setup_sub S.D &&
+	setup_sub S.C &&
+	setup_sub S.C.D &&
+	setup_sub X &&
+	git add S* &&
+	test_commit C &&
 
-[main f675c53] message #comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 46 - cleanup commit message (default, -m)
+	# recursive in X/
+	git -C X pull &&
+	GIT_ALLOW_PROTOCOL=file git -C X submodule update --init &&
 
-expecting success of 7502.47 'cleanup commit message (whitespace option, -m)': 
-	echo content >>file &&
-	git add file &&
-	git commit --cleanup=whitespace --no-status -m "message #comment " &&
-	commit_msg_is "message #comment"
+	# dirty
+	for d in S.D X/S.D
+	do
+		echo dirty >"$d"/A.t || return 1
+	done &&
 
-[main 8e56e6c] message #comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 47 - cleanup commit message (whitespace option, -m)
+	# commit (for --cached)
+	for d in S.C* X/S.C*
+	do
+		git -C "$d" reset --hard A || return 1
+	done &&
 
-expecting success of 7502.48 'cleanup commit message (whitespace config, -m)': 
-	echo content >>file &&
-	git add file &&
-	git -c commit.cleanup=whitespace commit --no-status -m "message #comment " &&
-	commit_msg_is "message #comment"
+	# dirty
+	for d in S*.D X/S*.D
+	do
+		echo dirty >"$d/C2.t" || return 1
+	done &&
 
-[main 7207f92] message #comment
+	for ref in A B C
+	do
+		# Not different with SHA-1 and SHA-256, just (ab)using
+		# test_oid_cache as a variable bag to avoid using
+		# $(git rev-parse ...).
+		oid=$(git rev-parse $ref) &&
+		test_oid_cache <<-EOF || return 1
+		$ref sha1:$oid
+		$ref sha256:$oid
+		EOF
+	done
+
+[master (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 48 - cleanup commit message (whitespace config, -m)
-
-expecting success of 7502.49 'message shows author when it is not equal to committer': 
-	echo >>negative &&
-	git commit -e -m "sample" -a &&
-	test_grep \
-	  "^# Author: *A U Thor <author@example.com>\$" \
-	  .git/COMMIT_EDITMSG
-
-[main 96a295c] sample
+ create mode 100644 A.t
+[master d9df450] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-# Author:    A U Thor <author@example.com>
-ok 49 - message shows author when it is not equal to committer
-
-expecting success of 7502.50 'message shows date when it is explicitly set': 
-	git commit --allow-empty -e -m foo --date="2010-01-02T03:04:05" &&
-	test_grep \
-	  "^# Date: *Sat Jan 2 03:04:05 2010 +0000" \
-	  .git/COMMIT_EDITMSG
-
-[main 1d86a4b] foo
+ create mode 100644 B.t
+Cloning into 'S'...
+done.
+Adding existing repo at 'S' to the index
+Cloning into 'S.D'...
+done.
+Adding existing repo at 'S.D' to the index
+Cloning into 'S.C'...
+done.
+Adding existing repo at 'S.C' to the index
+Cloning into 'S.C.D'...
+done.
+Adding existing repo at 'S.C.D' to the index
+Cloning into 'X'...
+done.
+Adding existing repo at 'X' to the index
+[master 2377ff0] C
  Author: A U Thor <author@example.com>
- Date: Sat Jan 2 03:04:05 2010 +0000
-# Date:      Sat Jan 2 03:04:05 2010 +0000
-ok 50 - message shows date when it is explicitly set
-
-expecting success of 7502.51 'message does not have multiple scissors lines': 
-	git commit --cleanup=scissors -v --allow-empty -e -m foo &&
-	test $(grep -c -e "--- >8 ---" .git/COMMIT_EDITMSG) -eq 1
+ 7 files changed, 21 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 C.t
+ create mode 160000 S
+ create mode 160000 S.C
+ create mode 160000 S.C.D
+ create mode 160000 S.D
+ create mode 160000 X
+From /build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/.
+   d9df450..2377ff0  master     -> origin/master
+ * [new tag]         C          -> C
+Updating d9df450..2377ff0
+Fast-forward
+ .gitmodules | 15 +++++++++++++++
+ C.t         |  1 +
+ S           |  1 +
+ S.C         |  1 +
+ S.C.D       |  1 +
+ S.D         |  1 +
+ X           |  1 +
+ 7 files changed, 21 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 C.t
+ create mode 160000 S
+ create mode 160000 S.C
+ create mode 160000 S.C.D
+ create mode 160000 S.D
+ create mode 160000 X
+Submodule 'S' (/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/./S) registered for path 'S'
+Submodule 'S.C' (/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/./S.C) registered for path 'S.C'
+Submodule 'S.C.D' (/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/./S.C.D) registered for path 'S.C.D'
+Submodule 'S.D' (/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/./S.D) registered for path 'S.D'
+Submodule 'X' (/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/./X) registered for path 'X'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/X/S'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/X/S.C'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/X/S.C.D'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/X/S.D'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7422-submodule-output/X/X'...
+done.
+Submodule path 'S': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
+Submodule path 'S.C': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
+Submodule path 'S.C.D': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
+Submodule path 'S.D': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
+Submodule path 'X': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
+HEAD is now at 0ddfaf1 A
+HEAD is now at 0ddfaf1 A
+HEAD is now at 0ddfaf1 A
+HEAD is now at 0ddfaf1 A
+ok 1 - setup
 
-[main 215259a] foo
- Author: A U Thor <author@example.com>
-ok 51 - message does not have multiple scissors lines
+expecting success of 7422.2 'git submodule ': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid A) S.C (A)
+		>+$(test_oid A) S.C.D (A)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid C) X (C)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 2 - git submodule 
 
-checking prerequisite: AUTOIDENT
+expecting success of 7422.3 'git submodule status': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid A) S.C (A)
+		>+$(test_oid A) S.C.D (A)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid C) X (C)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 3 - git submodule status
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-AUTOIDENT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-AUTOIDENT" &&
-	sane_unset GIT_AUTHOR_NAME &&
-	sane_unset GIT_AUTHOR_EMAIL &&
-	git var GIT_AUTHOR_IDENT
+expecting success of 7422.4 'git submodule status --recursive': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid A) S.C (A)
+		>+$(test_oid A) S.C.D (A)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid C) X (C)
+		> $(test_oid B) X/S (B)
+		>+$(test_oid A) X/S.C (A)
+		>+$(test_oid A) X/S.C.D (A)
+		> $(test_oid B) X/S.D (B)
+		> $(test_oid B) X/X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 4 - git submodule status --recursive
 
-)
-Author identity unknown
+expecting success of 7422.5 'git submodule --quiet': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 5 - git submodule --quiet
 
-*** Please tell me who you are.
+expecting success of 7422.6 'git submodule --quiet status': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 6 - git submodule --quiet status
 
-Run
+expecting success of 7422.7 'git submodule status --quiet': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 7 - git submodule status --quiet
 
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
+expecting success of 7422.8 'git submodule --cached': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid B) S.C (B)
+		>+$(test_oid B) S.C.D (B)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid B) X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 8 - git submodule --cached
 
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
+expecting success of 7422.9 'git submodule --cached status': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid B) S.C (B)
+		>+$(test_oid B) S.C.D (B)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid B) X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 9 - git submodule --cached status
 
-fatal: empty ident name (for <pbuilder1@codethink03-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-ok 52 # skip message shows committer when it is automatic (missing AUTOIDENT)
+expecting success of 7422.10 'git submodule status --cached': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid B) S.C (B)
+		>+$(test_oid B) S.C.D (B)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid B) X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 10 - git submodule status --cached
 
-checking prerequisite: FAIL_PREREQS
+expecting success of 7422.11 'git submodule --cached --quiet': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 11 - git submodule --cached --quiet
 
-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
+expecting success of 7422.12 'git submodule --cached --quiet status': 
+		git submodule $opts >out &&
+		test_must_be_empty out
 	
-)
-prerequisite FAIL_PREREQS not satisfied
-expecting success of 7502.53 'do not fire editor when committer is bogus': 
-	>.git/result &&
+ok 12 - git submodule --cached --quiet status
 
-	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
+expecting success of 7422.13 'git submodule --cached status --quiet': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 13 - git submodule --cached status --quiet
 
-Committer identity unknown
+expecting success of 7422.14 'git submodule --quiet status --cached': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 14 - git submodule --quiet status --cached
 
-*** Please tell me who you are.
+expecting success of 7422.15 'git submodule status --cached --quiet': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 15 - git submodule status --cached --quiet
 
-Run
+expecting success of 7422.16 'git submodule status --cached --recursive': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid B) S.C (B)
+		>+$(test_oid B) S.C.D (B)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid B) X (B)
+		> $(test_oid B) X/S (B)
+		>+$(test_oid B) X/S.C (B)
+		>+$(test_oid B) X/S.C.D (B)
+		> $(test_oid B) X/S.D (B)
+		> $(test_oid B) X/X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 16 - git submodule status --cached --recursive
 
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
+expecting success of 7422.17 'git submodule --cached status --recursive': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid B) S.C (B)
+		>+$(test_oid B) S.C.D (B)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid B) X (B)
+		> $(test_oid B) X/S (B)
+		>+$(test_oid B) X/S.C (B)
+		>+$(test_oid B) X/S.C.D (B)
+		> $(test_oid B) X/S.D (B)
+		> $(test_oid B) X/X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 17 - git submodule --cached status --recursive
 
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
+expecting success of 7422.18 'git submodule status --recursive propagates SIGPIPE': 
+	{ git submodule status --recursive 2>err; echo $?>status; } |
+		grep -q X/S &&
+	test_must_be_empty err &&
+	test_match_signal 13 "$(cat status)"
 
-fatal: empty ident name (for <pbuilder1@codethink03-arm64.debian.net>) not allowed
-ok 53 - do not fire editor when committer is bogus
+ok 18 - git submodule status --recursive propagates SIGPIPE
 
-expecting success of 7502.54 'do not fire editor if -m <msg> was given': 
-	echo tick >file &&
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7503-pre-commit-and-pre-merge-commit-hooks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7503-pre-commit-and-pre-merge-commit-hooks/.git/
+expecting success of 7503.1 'root commit': 
+	echo "root" >file &&
 	git add file &&
-	echo "editor not started" >.git/result &&
-	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" git commit -m tick) &&
-	test "$(cat .git/result)" = "editor not started"
+	git commit -m "zeroth" &&
+	git checkout -b side &&
+	echo "foo" >foo &&
+	git add foo &&
+	git commit -m "make it non-ff" &&
+	git branch side-orig side &&
+	git checkout main
 
-[main d97654e] tick
+[main (root-commit) 0e29351] zeroth
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 20 deletions(-)
-ok 54 - do not fire editor if -m <msg> was given
-
-expecting success of 7502.55 'do not fire editor if -m "" was given': 
-	echo tock >file &&
-	git add file &&
-	echo "editor not started" >.git/result &&
-	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" \
-	 git commit -m "" --allow-empty-message) &&
-	test "$(cat .git/result)" = "editor not started"
-
-[main 84f6bcc] 
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'side'
+[side f4a0fae] make it non-ff
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 55 - do not fire editor if -m "" was given
-
-expecting success of 7502.56 'do not fire editor in the presence of conflicts': 
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Switched to branch 'main'
+ok 1 - root commit
 
-	git clean -f &&
-	echo f >g &&
-	git add g &&
-	git commit -m "add g" &&
-	git branch second &&
-	echo main >g &&
-	echo g >h &&
-	git add g h &&
-	git commit -m "modify g and add h" &&
-	git checkout second &&
-	echo second >g &&
-	git add g &&
-	git commit -m second &&
-	# Must fail due to conflict
-	test_must_fail git cherry-pick -n main &&
-	echo "editor not started" >.git/result &&
-	(
-		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit
-	) &&
-	test "$(cat .git/result)" = "editor not started"
+expecting success of 7503.2 'setup conflicting branches': 
+	test_when_finished "git checkout main" &&
+	git checkout -b conflicting-a main &&
+	echo a >conflicting &&
+	git add conflicting &&
+	git commit -m conflicting-a &&
+	git checkout -b conflicting-b main &&
+	echo b >conflicting &&
+	git add conflicting &&
+	git commit -m conflicting-b
 
-Removing act
-Removing actual
-Removing commit.msg
-Removing commit_msg_is.actual
-Removing commit_msg_is.expect
-Removing current.1
-Removing current.2
-Removing exp
-Removing expect
-Removing expected
-Removing ident
-Removing msg
-Removing raw
-Removing text
-[main 133e0fd] add g
+Switched to a new branch 'conflicting-a'
+[conflicting-a 3f25523] conflicting-a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 g
-[main 6488bdd] modify g and add h
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 h
-Switched to branch 'second'
-M	negative
-[second 42e48b3] second
+ create mode 100644 conflicting
+Switched to a new branch 'conflicting-b'
+[conflicting-b 8c264fe] conflicting-b
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging g
-CONFLICT (content): Merge conflict in g
-error: could not apply 6488bdd... modify g and add h
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: Disable this message with "git config advice.mergeConflict false"
-error: Committing is not possible because you have unmerged files.
-hint: Fix them up in the work tree, and then use 'git add/rm <file>'
-hint: as appropriate to mark resolution and make a commit.
-fatal: Exiting because of an unresolved conflict.
-U	g
-ok 56 - do not fire editor in the presence of conflicts
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflicting
+Switched to branch 'main'
+ok 2 - setup conflicting branches
 
-expecting success of 7502.57 'a SIGTERM should break locks': 
-	echo >>negative &&
-	! "$SHELL_PATH" -c '
-	  echo kill -TERM $$ >>.git/FAKE_EDITOR
-	  GIT_EDITOR=.git/FAKE_EDITOR
-	  export GIT_EDITOR
-	  exec git commit -a' &&
-	test ! -f .git/index.lock
+expecting success of 7503.3 'with no hook': 
+	test_when_finished "rm -f actual_hooks" &&
+	echo "foo" >file &&
+	git add file &&
+	git commit -m "first" &&
+	test_path_is_missing actual_hooks
 
-Terminated
-ok 57 - a SIGTERM should break locks
+[main e0ed36d] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - with no hook
 
-expecting success of 7502.58 'Hand committing of a redundant merge removes dups': 
+expecting success of 7503.4 'with no hook (merge)': 
+	test_when_finished "rm -f actual_hooks" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
 
-	git rev-parse second main >expect &&
-	test_must_fail git merge second main &&
-	git checkout main g &&
-	EDITOR=: git commit -a &&
-	git cat-file commit HEAD >raw &&
-	sed -n -e "s/^parent //p" -e "/^$/q" raw >actual &&
-	test_cmp expect actual
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 4 - with no hook (merge)
 
+expecting success of 7503.5 '--no-verify with no hook': 
+	test_when_finished "rm -f actual_hooks" &&
+	echo "bar" >file &&
+	git add file &&
+	git commit --no-verify -m "bar" &&
+	test_path_is_missing actual_hooks
 
-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
+[main 9b1e6a8] bar
  Author: A U Thor <author@example.com>
-ok 58 - Hand committing of a redundant merge removes dups
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - --no-verify with no hook
 
-expecting success of 7502.59 'A single-liner subject with a token plus colon is not a footer': 
+expecting success of 7503.6 '--no-verify with no hook (merge)': 
+	test_when_finished "rm -f actual_hooks" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
 
-	git reset --hard &&
-	git commit -s -m "hello: kitty" --allow-empty &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_line_count = 3 actual
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 6 - --no-verify with no hook (merge)
 
+expecting success of 7503.7 'with succeeding hook': 
+	setup_success_hook "pre-commit" &&
+	echo "more" >>file &&
+	git add file &&
+	git commit -m "more" &&
+	test_cmp expected_hooks actual_hooks
 
-HEAD is now at 287266c Merge branch 'main' into second
-[second 8c7277e] hello: kitty
+[main 7901543] more
  Author: A U Thor <author@example.com>
-ok 59 - A single-liner subject with a token plus colon is not a footer
+ 1 file changed, 1 insertion(+)
+ok 7 - with succeeding hook
 
-expecting success of 7502.60 'commit -s places sob on third line after two empty lines': 
-	git commit -s --allow-empty --allow-empty-message &&
-	cat <<-EOF >expect &&
+expecting success of 7503.8 'with succeeding hook (merge)': 
+	setup_success_hook "pre-merge-commit" &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_cmp expected_hooks actual_hooks
 
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+ok 8 - with succeeding hook (merge)
 
-	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+expecting success of 7503.9 'automatic merge fails; both hooks are available': 
+	setup_success_hook "pre-commit" &&
+	setup_success_hook "pre-merge-commit" &&
 
-	EOF
-	sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual &&
-	test_cmp expect actual
+	git checkout conflicting-a &&
+	test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
+	test_path_is_missing actual_hooks &&
 
-[second 56e2ef7] Signed-off-by: C O Mitter <committer@example.com>
- Author: A U Thor <author@example.com>
-ok 60 - commit -s places sob on third line after two empty lines
+	echo "pre-commit" >expected_hooks &&
+	echo a+b >conflicting &&
+	git add conflicting &&
+	git commit -m "resolve conflict" &&
+	test_cmp expected_hooks actual_hooks
 
-expecting success of 7502.61 'commit': 
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 56e2ef7 Signed-off-by: C O Mitter <committer@example.com>
-[second 7d4c5ba] message
+Switched to branch 'conflicting-a'
+Auto-merging conflicting
+CONFLICT (add/add): Merge conflict in conflicting
+Automatic merge failed; fix conflicts and then commit the result.
+[conflicting-a ff0069b] resolve conflict
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 61 - commit
+ok 9 - automatic merge fails; both hooks are available
 
-expecting success of 7502.62 'commit --status': 
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 7d4c5ba message
-[second 24b9005] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 62 - commit --status
+expecting success of 7503.10 '--no-verify with succeeding hook': 
+	setup_success_hook "pre-commit" &&
+	echo "even more" >>file &&
+	git add file &&
+	git commit --no-verify -m "even more" &&
+	test_path_is_missing actual_hooks
 
-expecting success of 7502.63 'commit --no-status': 
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 24b9005 message
-[second 6f35a31] message
+[conflicting-a 79fc96c] even more
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 63 - commit --no-status
+ok 10 - --no-verify with succeeding hook
 
-expecting success of 7502.64 'commit with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 6f35a31 message
-[second fb0e1b7] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 64 - commit with commit.status = yes
+expecting success of 7503.11 '--no-verify with succeeding hook (merge)': 
+	setup_success_hook "pre-merge-commit" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
 
-expecting success of 7502.65 'commit with commit.status = no': 
-		test_config commit.status no &&
-		try_commit "" &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at fb0e1b7 message
-[second 19f43d6] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 65 - commit with commit.status = no
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 11 - --no-verify with succeeding hook (merge)
 
-expecting success of 7502.66 'commit --status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 19f43d6 message
-[second a6956b4] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 66 - commit --status with commit.status = yes
+expecting success of 7503.12 'with failing hook': 
+	setup_failing_hook "pre-commit" &&
+	test_when_finished "rm -f expected_hooks" &&
+	echo "pre-commit-failing-hook" >expected_hooks &&
 
-expecting success of 7502.67 'commit --no-status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at a6956b4 message
-[second 3388dc5] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 67 - commit --no-status with commit.status = yes
+	echo "another" >>file &&
+	git add file &&
+	test_must_fail git commit -m "another" &&
+	test_cmp expected_hooks actual_hooks
 
-expecting success of 7502.68 'commit --status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 3388dc5 message
-[second 517e0b4] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 68 - commit --status with commit.status = no
+ok 12 - with failing hook
 
-expecting success of 7502.69 'commit --no-status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 517e0b4 message
-[second 2ee1433] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 69 - commit --no-status with commit.status = no
+expecting success of 7503.13 '--no-verify with failing hook': 
+	setup_failing_hook "pre-commit" &&
+	echo "stuff" >>file &&
+	git add file &&
+	git commit --no-verify -m "stuff" &&
+	test_path_is_missing actual_hooks
 
-expecting success of 7502.70 'commit': 
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 2ee1433 message
-[second 2e8ac9b] message
+[main 9073eff] stuff
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 70 - commit
+ 1 file changed, 2 insertions(+)
+ok 13 - --no-verify with failing hook
 
-expecting success of 7502.71 'commit --status': 
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 2e8ac9b message
-[second baeb21a] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 71 - commit --status
+expecting success of 7503.14 'with failing hook (merge)': 
+	setup_failing_hook "pre-merge-commit" &&
+	echo "pre-merge-commit-failing-hook" >expected_hooks &&
+	git checkout side &&
+	test_must_fail git merge -m "merge main" main &&
+	git checkout main &&
+	test_cmp expected_hooks actual_hooks
 
-expecting success of 7502.72 'commit --no-status': 
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at baeb21a message
-[second c2fe270] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 72 - commit --no-status
+Switched to branch 'side'
+Not committing merge; use 'git commit' to complete the merge.
+Switched to branch 'main'
+ok 14 - with failing hook (merge)
 
-expecting success of 7502.73 'commit with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at c2fe270 message
-[second 34e9ff1] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 73 - commit with commit.status = yes
+expecting success of 7503.15 '--no-verify with failing hook (merge)': 
+	setup_failing_hook "pre-merge-commit" &&
 
-expecting success of 7502.74 'commit with commit.status = no': 
-		test_config commit.status no &&
-		try_commit "" &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 34e9ff1 message
-[second 76b6c0d] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 74 - commit with commit.status = no
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
 
-expecting success of 7502.75 'commit --status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 76b6c0d message
-[second f761932] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 75 - commit --status with commit.status = yes
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 15 - --no-verify with failing hook (merge)
 
-expecting success of 7502.76 'commit --no-status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at f761932 message
-[second 69efec9] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 76 - commit --no-status with commit.status = yes
+expecting success of 7503.16 'with non-executable hook': 
+	setup_non_exec_hook "pre-commit" &&
+	echo "content" >>file &&
+	git add file &&
+	git commit -m "content" &&
+	test_path_is_missing actual_hooks
 
-expecting success of 7502.77 'commit --status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 69efec9 message
-[second 8d9fa13] message
+hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
+hint: You can disable this warning with `git config advice.ignoredHook false`.
+[main be1df3a] content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 77 - commit --status with commit.status = no
+ok 16 - with non-executable hook
 
-expecting success of 7502.78 'commit --no-status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 8d9fa13 message
-[second 32b4909] message
+expecting success of 7503.17 '--no-verify with non-executable hook': 
+	setup_non_exec_hook "pre-commit" &&
+	echo "more content" >>file &&
+	git add file &&
+	git commit --no-verify -m "more content" &&
+	test_path_is_missing actual_hooks
+
+[main dd373ff] more content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-## Custom template
-ok 78 - commit --no-status with commit.status = no
+ok 17 - --no-verify with non-executable hook
 
-expecting success of 7502.79 'commit --status with custom comment character': 
-	test_config core.commentchar ";" &&
-	try_commit --status &&
-	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+expecting success of 7503.18 'with non-executable hook (merge)': 
+	setup_non_exec_hook "pre-merge" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
 
-HEAD is now at 32b4909 message
-[second 8e6fd00] message ## Custom template
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-; Changes to be committed:
-ok 79 - commit --status with custom comment character
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 18 - with non-executable hook (merge)
 
-expecting success of 7502.80 'switch core.commentchar': 
-	test_commit "#foo" foo &&
-	GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
-	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+expecting success of 7503.19 '--no-verify with non-executable hook (merge)': 
+	setup_non_exec_hook "pre-merge" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
 
-[second 0f719bb] #foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[second e03ca23] message #foo
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 19 - --no-verify with non-executable hook (merge)
+
+expecting success of 7503.20 'with hook requiring GIT_PREFIX': 
+	test_when_finished "rm -rf actual_hooks success" &&
+	setup_require_prefix_hook &&
+	echo "more content" >>file &&
+	git add file &&
+	mkdir success &&
+	(
+		cd success &&
+		git commit -m "hook requires GIT_PREFIX = success/"
+	) &&
+	test_cmp expected_hooks actual_hooks
+
+[main 91e0a75] hook requires GIT_PREFIX = success/
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-; Changes to be committed:
-ok 80 - switch core.commentchar
+ok 20 - with hook requiring GIT_PREFIX
 
-expecting success of 7502.81 'switch core.commentchar but out of options': 
-	cat >text <<\EOF &&
-# 1
-; 2
-@ 3
-! 4
-$ 5
-% 6
-^ 7
-& 8
-| 9
-: 10
-EOF
-	git commit --amend -F text &&
+expecting success of 7503.21 'with failing hook requiring GIT_PREFIX': 
+	test_when_finished "rm -rf actual_hooks fail" &&
+	setup_require_prefix_hook &&
+	echo "more content" >>file &&
+	git add file &&
+	mkdir fail &&
 	(
-		test_set_editor .git/FAKE_EDITOR &&
-		test_must_fail git -c core.commentChar=auto commit --amend
-	)
+		cd fail &&
+		test_must_fail git commit -m "hook must fail"
+	) &&
+	git checkout -- file &&
+	test_cmp expected_hooks actual_hooks
 
-[second cbf85e8] # 1 ; 2 @ 3 ! 4 $ 5 % 6 ^ 7 & 8 | 9 : 10
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
+ok 21 - with failing hook requiring GIT_PREFIX
+
+expecting success of 7503.22 'check the author in hook': 
+	setup_require_author_hook &&
+	cat >expected_hooks <<-EOF &&
+	check-author
+	check-author
+	check-author
+	EOF
+	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
+	(
+		GIT_AUTHOR_NAME="New Author" &&
+		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
+		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+		git commit --allow-empty -m "by new.author via env" &&
+		git show -s
+	) &&
+	git commit --author="New Author <newauthor@example.com>" \
+		--allow-empty -m "by new.author via command line" &&
+	git show -s &&
+	test_cmp expected_hooks actual_hooks
+
+[main 1b3a79e] by new.author via env
+ Author: New Author <newauthor@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: unable to select a comment character that is not used
-in the current commit message
-ok 81 - switch core.commentchar but out of options
+commit 1b3a79eec1cf60fc72bbc0d27901d153c90e4abe
+Author: New Author <newauthor@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-# passed all 81 test(s)
-1..81
+    by new.author via env
+[main 155e737] by new.author via command line
+ Author: New Author <newauthor@example.com>
+commit 155e73716852370372b22eca0576dacb5016aa2e
+Author: New Author <newauthor@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    by new.author via command line
+ok 22 - check the author in hook
+
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7407-submodule-foreach.sh ***
@@ -471048,6 +469206,426 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7504-commit-msg-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t6438-submodule-directory-file-conflicts.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t6438-submodule-directory-file-conflicts/.git/
 expecting success of 6438.1 'git_test_func: added submodule creates empty directory': 
@@ -472877,1644 +471455,1872 @@
 1..56
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7510-signed-commit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7510-signed-commit/.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
+*** t7502-commit-porcelain.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7502-commit-porcelain/.git/
+expecting success of 7502.1 'output summary format': 
 
-	# 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
+	echo new >file1 &&
+	git add file1 &&
+	check_summary_oneline "root-commit" "initial" &&
 
-)
-prerequisite GPG not satisfied
-ok 1 # skip create signed commits (missing GPG)
+	echo change >>file1 &&
+	git add file1
 
-ok 2 # skip verify and show signatures (missing GPG)
+ok 1 - output summary format
 
-ok 3 # skip verify-commit exits failure on unknown signature (missing GPG)
+expecting success of 7502.2 'output summary format: root-commit': 
+	check_summary_oneline "" "a change"
 
-ok 4 # skip verify-commit exits success on untrusted signature (missing GPG)
+ok 2 - output summary format: root-commit
 
-ok 5 # skip verify-commit exits success with matching minTrustLevel (missing GPG)
+expecting success of 7502.3 'output summary format for commit with an empty diff': 
 
-ok 6 # skip verify-commit exits success with low minTrustLevel (missing GPG)
+	check_summary_oneline "" "empty" "--allow-empty"
 
-ok 7 # skip verify-commit exits failure with high minTrustLevel (missing GPG)
+ok 3 - output summary format for commit with an empty diff
 
-ok 8 # skip verify signatures with --raw (missing GPG)
+expecting success of 7502.4 'output summary format for merges': 
 
-ok 9 # skip proper header is used for hash algorithm (missing GPG)
+	git checkout -b recursive-base &&
+	test_commit base file1 &&
 
-ok 10 # skip show signed commit with signature (missing GPG)
+	git checkout -b recursive-a recursive-base &&
+	test_commit commit-a file1 &&
 
-ok 11 # skip detect fudged signature (missing GPG)
+	git checkout -b recursive-b recursive-base &&
+	test_commit commit-b file1 &&
 
-ok 12 # skip detect fudged signature with NUL (missing GPG)
+	# conflict
+	git checkout recursive-a &&
+	test_must_fail git merge recursive-b &&
+	# resolve the conflict
+	echo commit-a >file1 &&
+	git add file1 &&
+	check_summary_oneline "" "Merge"
 
-ok 13 # skip amending already signed commit (missing GPG)
+Switched to a new branch 'recursive-base'
+[recursive-base e6f945f] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Switched to a new branch 'recursive-a'
+[recursive-a 9300328] commit-a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'recursive-b'
+[recursive-b 2f9e083] commit-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'recursive-a'
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - output summary format for merges
 
-checking prerequisite: GPG2
+expecting success of 7502.5 'the basics': 
 
-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
+	output_tests_cleanup &&
 
-	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
+	echo doing partial >"commit is" &&
+	mkdir not &&
+	echo very much encouraged but we should >not/forbid &&
+	git add "commit is" not &&
+	echo update added "commit is" file >"commit is" &&
+	echo also update another >not/forbid &&
+	test_tick &&
+	git commit -a -m "initial with -a" &&
 
-)
-prerequisite GPG2 not satisfied
-ok 14 # skip bare signature (missing GPG2)
+	git cat-file blob HEAD:"commit is" >current.1 &&
+	git cat-file blob HEAD:not/forbid >current.2 &&
 
-ok 15 # skip show good signature with custom format (missing GPG)
+	cmp current.1 "commit is" &&
+	cmp current.2 not/forbid
 
-ok 16 # skip show bad signature with custom format (missing GPG)
 
-ok 17 # skip show untrusted signature with custom format (missing GPG)
+Switched to branch 'main'
+rm 'file1'
+[main 34ca441] cleanup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 deletions(-)
+ delete mode 100644 file1
+[main 8a2203d] initial with -a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 commit is
+ create mode 100644 not/forbid
+ok 5 - the basics
 
-ok 18 # skip show untrusted signature with undefined trust level (missing GPG)
+expecting success of 7502.6 'partial': 
 
-ok 19 # skip show untrusted signature with ultimate trust level (missing GPG)
+	echo another >"commit is" &&
+	echo another >not/forbid &&
+	test_tick &&
+	git commit -m "partial commit to handle a file" "commit is" &&
 
-ok 20 # skip show unknown signature with custom format (missing GPG)
+	changed=$(git diff-tree --name-only HEAD^ HEAD) &&
+	test "$changed" = "commit is"
 
-ok 21 # skip show lack of signature with custom format (missing GPG)
 
-ok 22 # skip log.showsignature behaves like --show-signature (missing GPG)
+[main 3302250] partial commit to handle a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - partial
 
-ok 23 # skip check config gpg.format values (missing GPG)
+expecting success of 7502.7 'partial modification in a subdirectory': 
 
-ok 24 # skip detect fudged commit with double signature (missing GPG)
+	test_tick &&
+	git commit -m "partial commit to subdirectory" not &&
 
-ok 25 # skip show double signature with custom format (missing GPG)
+	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
+	test "$changed" = "not/forbid"
 
-ok 26 # skip verify-commit verifies multiply signed commits (missing GPG)
 
-expecting success of 7510.27 'custom `gpg.program`': 
-	write_script fake-gpg <<-\EOF &&
-	args="$*"
+[main 742b3a6] partial commit to subdirectory
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - partial modification in a subdirectory
 
-	# skip uninteresting options
-	while case "$1" in
-	--status-fd=*|--keyid-format=*) ;; # skip
-	*) break;;
-	esac; do shift; done
+expecting success of 7502.8 'partial removal': 
 
-	case "$1" in
-	-bsau)
-		test -z "$LET_GPG_PROGRAM_FAIL" || {
-			echo "zOMG signing failed!" >&2
-			exit 1
-		}
-		cat >sign.file
-		echo "[GNUPG:] SIG_CREATED $args" >&2
-		echo "-----BEGIN PGP MESSAGE-----"
-		echo "$args"
-		echo "-----END PGP MESSAGE-----"
-		;;
-	--verify)
-		cat "$2" >verify.file
-		exit 0
-		;;
-	*)
-		echo "Unhandled args: $*" >&2
-		exit 1
-		;;
-	esac
-	EOF
+	git rm not/forbid &&
+	git commit -m "partial commit to remove not/forbid" not &&
 
-	test_config gpg.program "$(pwd)/fake-gpg" &&
-	git commit -S --allow-empty -m signed-commit &&
-	test_path_exists sign.file &&
-	git show --show-signature &&
-	test_path_exists verify.file &&
+	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
+	test "$changed" = "not/forbid" &&
+	remain=$(git ls-tree -r --name-only HEAD) &&
+	test "$remain" = "commit is"
 
-	test_must_fail env LET_GPG_PROGRAM_FAIL=1 \
-	git commit -S --allow-empty -m must-fail 2>err &&
-	grep zOMG err
 
-[main (root-commit) 554da10] signed-commit
+rm 'not/forbid'
+[main 09fd303] partial commit to remove not/forbid
  Author: A U Thor <author@example.com>
-commit 554da108591b1b44bd66564d7121378316c3ba6f
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 not/forbid
+ok 8 - partial removal
 
-    signed-commit
-zOMG signing failed!
-ok 27 - custom `gpg.program`
+expecting success of 7502.9 'sign off': 
 
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7509-commit-authorship.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7509-commit-authorship/.git/
-expecting success of 7509.1 '-C option copies authorship and message': 
-	test_commit --author Frigate\ \<flying@over.world\> \
-		"Initial Commit" foo Initial Initial &&
-	echo "Test 1" >>foo &&
-	test_tick &&
-	git commit -a -C Initial &&
-	author_header Initial >expect &&
-	author_header HEAD >actual &&
-	test_cmp expect actual &&
+	>positive &&
+	git add positive &&
+	git commit -s -m "thank you" &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -ne "s/Signed-off-by: //p" commit.msg >actual &&
+	git var GIT_COMMITTER_IDENT >ident &&
+	sed -e "s/>.*/>/" ident >expected &&
+	test_cmp expected actual
 
-	message_body Initial >expect &&
-	message_body HEAD >actual &&
-	test_cmp expect actual
 
-[master (root-commit) 6c1fd11] Initial Commit
- Author: Frigate <flying@over.world>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 19b40bf] Initial Commit
- Author: Frigate <flying@over.world>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 1 - -C option copies authorship and message
+[main cc1232b] thank you
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 positive
+ok 9 - sign off
 
-expecting success of 7509.2 '-C option copies only the message with --reset-author': 
-	echo "Test 2" >>foo &&
-	test_tick &&
-	git commit -a -C Initial --reset-author &&
-	echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
-	author_header HEAD >actual &&
-	test_cmp expect actual &&
+expecting success of 7502.10 'commit --trailer with "="': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-	message_body Initial >expect &&
-	message_body HEAD >actual &&
-	test_cmp expect actual
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
 
-[master 0381fd2] Initial Commit
+[main c563787] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 2 - -C option copies only the message with --reset-author
-
-expecting success of 7509.3 '-c option copies authorship and message': 
-	echo "Test 3" >>foo &&
-	test_tick &&
-	EDITOR=: VISUAL=: git commit -a -c Initial &&
-	author_header Initial >expect &&
-	author_header HEAD >actual &&
-	test_cmp expect actual
-
-[master fef56eb] Initial Commit
- Author: Frigate <flying@over.world>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 3 - -c option copies authorship and message
+ create mode 100644 file
+ok 10 - commit --trailer with "="
 
-expecting success of 7509.4 '-c option copies only the message with --reset-author': 
-	echo "Test 4" >>foo &&
-	test_tick &&
-	EDITOR=: VISUAL=: git commit -a -c Initial --reset-author &&
-	echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
-	author_header HEAD >actual &&
-	test_cmp expect actual &&
+expecting success of 7502.11 'commit --trailer with -c and "replace" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-	message_body Initial >expect &&
-	message_body HEAD >actual &&
-	test_cmp expect actual
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Helped-by: C3 E3
+	EOF
+	git -c trailer.ifexists="replace" \
+		commit --trailer "Mentored-by: C4 E4" \
+		 --trailer "Helped-by: C3 E3" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
 
-[master d241f1c] Initial Commit
+[main 9c665b9] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 4 - -c option copies only the message with --reset-author
-
-expecting success of 7509.5 '--amend option copies authorship': 
-	git checkout Initial &&
-	echo "Test 5" >>foo &&
-	test_tick &&
-	git commit -a --amend -m "amend test" &&
-	author_header Initial >expect &&
-	author_header HEAD >actual &&
-	test_cmp expect actual &&
-
-	echo "amend test" >expect &&
-	message_body HEAD >actual &&
-	test_cmp expect actual
-
-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 6c1fd11 Initial Commit
-[detached HEAD 7318ebc] amend test
- Author: Frigate <flying@over.world>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-ok 5 - --amend option copies authorship
-
-expecting success of 7509.6 '--amend option with empty author': 
-	git cat-file commit Initial >tmp &&
-	sed "s/author [^<]* </author  </" tmp >empty-author &&
-	sha=$(git hash-object -t commit -w empty-author) &&
-	test_when_finished "remove_object $sha" &&
-	git checkout $sha &&
-	test_when_finished "git checkout Initial" &&
-	echo "Empty author test" >>foo &&
-	test_tick &&
-	test_must_fail git commit -a -m "empty author" --amend 2>err &&
-	test_grep "empty ident" err
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  7318ebc amend test
-
-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> 7318ebc
-
-HEAD is now at 488af46 Initial Commit
-fatal: empty ident name (for <flying@over.world>) not allowed
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  488af46 Initial Commit
+[main 743970c] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 11 - commit --trailer with -c and "replace" as ifexists
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 7502.12 'commit --trailer with -c and "add" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
- git branch <new-branch-name> 488af46
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.ifexists="add" \
+		commit --trailer "Reported-by: C3 E3" \
+		--trailer "Mentored-by: C4 E4" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
 
-HEAD is now at 6c1fd11 Initial Commit
-M	foo
-ok 6 - --amend option with empty author
+[main c0ed76d] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 3065ecb] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 12 - commit --trailer with -c and "add" as ifexists
 
-expecting success of 7509.7 '--amend option with missing author': 
-	git cat-file commit Initial >tmp &&
-	sed "s/author [^<]* </author </" tmp >malformed &&
-	sha=$(git hash-object --literally -t commit -w malformed) &&
-	test_when_finished "remove_object $sha" &&
-	git checkout $sha &&
-	test_when_finished "git checkout Initial" &&
-	echo "Missing author test" >>foo &&
-	test_tick &&
-	test_must_fail git commit -a -m "malformed author" --amend 2>err &&
-	test_grep "empty ident" err
+expecting success of 7502.13 'commit --trailer with -c and "donothing" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-Previous HEAD position was 6c1fd11 Initial Commit
-HEAD is now at 1dcf28c Initial Commit
-M	foo
-fatal: empty ident name (for <flying@over.world>) not allowed
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reviewed-by: C6 E6
+	EOF
+	git -c trailer.ifexists="donothing" \
+		commit --trailer "Mentored-by: C5 E5" \
+		--trailer "Reviewed-by: C6 E6" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
 
-  1dcf28c Initial Commit
+[main 2dad5db] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 86cc013] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 13 - commit --trailer with -c and "donothing" as ifexists
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 7502.14 'commit --trailer with -c and "addIfDifferent" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
- git branch <new-branch-name> 1dcf28c
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Mentored-by: C5 E5
+	EOF
+	git -c trailer.ifexists="addIfDifferent" \
+		commit --trailer "Reported-by: C3 E3" \
+		--trailer "Mentored-by: C5 E5" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
 
-HEAD is now at 6c1fd11 Initial Commit
-M	foo
-ok 7 - --amend option with missing author
+[main bacbe07] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 9b53fef] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 14 - commit --trailer with -c and "addIfDifferent" as ifexists
 
-expecting success of 7509.8 '--reset-author makes the commit ours even with --amend option': 
-	git checkout Initial &&
-	echo "Test 6" >>foo &&
-	test_tick &&
-	git commit -a --reset-author -m "Changed again" --amend &&
-	echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
-	author_header HEAD >actual &&
-	test_cmp expect actual &&
+expecting success of 7502.15 'commit --trailer with -c and "addIfDifferentNeighbor" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-	echo "Changed again" >expect &&
-	message_body HEAD >actual &&
-	test_cmp expect actual
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reported-by: C3 E3
+	EOF
+	git -c trailer.ifexists="addIfDifferentNeighbor" \
+		commit --trailer "Mentored-by: C4 E4" \
+		--trailer "Reported-by: C3 E3" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
 
-HEAD is now at 6c1fd11 Initial Commit
-M	foo
-[detached HEAD 16b5be6] Changed again
+[main 5b19760] hello
  Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
- create mode 100644 foo
-ok 8 - --reset-author makes the commit ours even with --amend option
-
-expecting success of 7509.9 '--reset-author and --author are mutually exclusive': 
-	git checkout Initial &&
-	echo "Test 7" >>foo &&
-	test_tick &&
-	test_must_fail git commit -a --reset-author --author="Xyzzy <frotz@nitfol.xz>"
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+ 1 file changed, 1 insertion(+)
+[main ea6f7b2] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 15 - commit --trailer with -c and "addIfDifferentNeighbor" as ifexists
 
-  16b5be6 Changed again
+expecting success of 7502.16 'commit --trailer with -c and "end" as where': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.where="end" \
+		commit --trailer "Reported-by: C3 E3" \
+		--trailer "Mentored-by: C4 E4" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
 
- git branch <new-branch-name> 16b5be6
+[main 6edd712] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main abac1a7] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 16 - commit --trailer with -c and "end" as where
 
-HEAD is now at 6c1fd11 Initial Commit
-fatal: options '--reset-author' and '--author' cannot be used together
-ok 9 - --reset-author and --author are mutually exclusive
+expecting success of 7502.17 'commit --trailer with -c and "start" as where': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-expecting success of 7509.10 '--reset-author should be rejected without -c/-C/--amend': 
-	git checkout Initial &&
-	echo "Test 7" >>foo &&
-	test_tick &&
-	test_must_fail git commit -a --reset-author -m done
+	Signed-off-by: C1 E1
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.where="start" \
+		commit --trailer "Signed-off-by: C O Mitter <committer@example.com>" \
+		--trailer "Signed-off-by: C1 E1" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
 
-HEAD is now at 6c1fd11 Initial Commit
-M	foo
-fatal: --reset-author can be used only with -C, -c or --amend.
-ok 10 - --reset-author should be rejected without -c/-C/--amend
+[main 49719a0] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 3210bcd] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 17 - commit --trailer with -c and "start" as where
 
-expecting success of 7509.11 'commit respects CHERRY_PICK_HEAD and MERGE_MSG': 
-	echo "cherry-pick 1a" >>foo &&
-	test_tick &&
-	git commit -am "cherry-pick 1" --author="Cherry <cherry@pick.er>" &&
-	git tag cherry-pick-head &&
-	git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) &&
-	echo "This is a MERGE_MSG" >.git/MERGE_MSG &&
-	echo "cherry-pick 1b" >>foo &&
-	test_tick &&
-	git commit -a &&
-	author_header cherry-pick-head >expect &&
-	author_header HEAD >actual &&
-	test_cmp expect actual &&
+expecting success of 7502.18 'commit --trailer with -c and "after" as where': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-	echo "This is a MERGE_MSG" >expect &&
-	message_body HEAD >actual &&
-	test_cmp expect actual
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Mentored-by: C5 E5
+	EOF
+	git -c trailer.where="after" \
+		commit --trailer "Mentored-by: C4 E4" \
+		--trailer "Mentored-by: C5 E5" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
 
-[detached HEAD 7db2008] cherry-pick 1
- Author: Cherry <cherry@pick.er>
- 1 file changed, 3 insertions(+)
-[detached HEAD b9f2fd6] This is a MERGE_MSG
- Author: Cherry <cherry@pick.er>
- Date: Thu Apr 7 15:24:13 2005 -0700
+[main 3a4a38a] hello
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 11 - commit respects CHERRY_PICK_HEAD and MERGE_MSG
-
-expecting success of 7509.12 '--reset-author with CHERRY_PICK_HEAD': 
-	git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) &&
-	echo "cherry-pick 2" >>foo &&
-	test_tick &&
-	git commit -am "cherry-pick 2" --reset-author &&
-	echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
-	author_header HEAD >actual &&
-	test_cmp expect actual
-
-[detached HEAD 9a09dbe] cherry-pick 2
+[main 30c3647] hello
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
  1 file changed, 1 insertion(+)
-ok 12 - --reset-author with CHERRY_PICK_HEAD
+ok 18 - commit --trailer with -c and "after" as where
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7505-prepare-commit-msg-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7505-prepare-commit-msg-hook/.git/
-expecting success of 7505.1 'set up commits for rebasing': 
-	test_commit root &&
-	test_commit a a a &&
-	test_commit b b b &&
-	git checkout -b rebase-me root &&
-	test_commit rebase-a a aa &&
-	test_commit rebase-b b bb &&
-	for i in $(test_seq 1 13)
-	do
-		test_commit rebase-$i c $i || return 1
-	done &&
-	git checkout main &&
+expecting success of 7502.19 'commit --trailer with -c and "before" as where': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-	cat >rebase-todo <<-EOF
-	pick $(git rev-parse rebase-a)
-	pick $(git rev-parse rebase-b)
-	fixup $(git rev-parse rebase-1)
-	fixup $(git rev-parse rebase-2)
-	pick $(git rev-parse rebase-3)
-	fixup $(git rev-parse rebase-4)
-	squash $(git rev-parse rebase-5)
-	reword $(git rev-parse rebase-6)
-	squash $(git rev-parse rebase-7)
-	fixup $(git rev-parse rebase-8)
-	fixup $(git rev-parse rebase-9)
-	edit $(git rev-parse rebase-10)
-	squash $(git rev-parse rebase-11)
-	squash $(git rev-parse rebase-12)
-	edit $(git rev-parse rebase-13)
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C2 E2
+	Mentored-by: C3 E3
+	Mentored-by: C4 E4
 	EOF
+	git -c trailer.where="before" \
+		commit --trailer "Mentored-by: C3 E3" \
+		--trailer "Mentored-by: C2 E2" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
 
-[main (root-commit) dc6f871] root
+[main e5407b4] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 root.t
-[main 0cf4349] a
+[main 2e57a8f] hello
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 a
-[main e24f16d] b
+ok 19 - commit --trailer with -c and "before" as where
+
+expecting success of 7502.20 'commit --trailer with -c and "donothing" as ifmissing': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Helped-by: C5 E5
+	EOF
+	git -c trailer.ifmissing="donothing" \
+		commit --trailer "Helped-by: C5 E5" \
+		--trailer "Based-by: C6 E6" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 4b3be69] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b
-Switched to a new branch 'rebase-me'
-[rebase-me 0391433] rebase-a
+[main e71943e] hello
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 a
-[rebase-me 21e9a5f] rebase-b
+ok 20 - commit --trailer with -c and "donothing" as ifmissing
+
+expecting success of 7502.21 'commit --trailer with -c and "add" as ifmissing': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Helped-by: C5 E5
+	Based-by: C6 E6
+	EOF
+	git -c trailer.ifmissing="add" \
+		commit --trailer "Helped-by: C5 E5" \
+		--trailer "Based-by: C6 E6" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 8576769] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b
-[rebase-me 9bc7808] rebase-1
+[main 3741b21] hello
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 c
-[rebase-me 2bdc1d4] rebase-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me 1aecffa] rebase-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me 9284a05] rebase-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me e8f1437] rebase-5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me 111c466] rebase-6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me 2238056] rebase-7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me 55c53f7] rebase-8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me 7ad5821] rebase-9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me 58c3130] rebase-10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me 2f28a77] rebase-11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me 6339e66] rebase-12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[rebase-me 8f82bdf] rebase-13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 1 - set up commits for rebasing
-
-expecting success of 7505.2 'with no hook': 
+ok 21 - commit --trailer with -c and "add" as ifmissing
 
-	echo "foo" > file &&
-	git add file &&
-	git commit -m "first"
+expecting success of 7502.22 'commit --trailer with -c ack.key ': 
+	echo "fun" >>file1 &&
+	git add file1 &&
+	cat >expected <<-\EOF &&
+		hello
 
+		Acked-by: Peff
+	EOF
+	git -c trailer.ack.key="Acked-by" \
+		commit --trailer "ack = Peff" -m "hello" &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
 
-[main 1f7238d] first
+[main 5789976] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 2 - with no hook
+ create mode 100644 file1
+ok 22 - commit --trailer with -c ack.key 
 
-expecting success of 7505.3 'setup fake editor for interactive editing': 
-	write_script fake-editor <<-\EOF &&
-	exit 0
-	EOF
+expecting success of 7502.23 'commit --trailer with -c and ":=#" as separators': 
+	echo "fun" >>file1 &&
+	git add file1 &&
+	cat >expected <<-\EOF &&
+		I hate bug
 
-	## Not using test_set_editor here so we can easily ensure the editor variable
-	## is only set for the editor tests
-	FAKE_EDITOR="$(pwd)/fake-editor" &&
-	export FAKE_EDITOR
+		Bug #42
+	EOF
+	git -c trailer.separators=":=#" \
+		-c trailer.bug.key="Bug #" \
+		commit --trailer "bug = 42" -m "I hate bug" &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
 
-ok 3 - setup fake editor for interactive editing
+[main 6e78fd4] I hate bug
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 23 - commit --trailer with -c and ":=#" as separators
 
-expecting success of 7505.4 'setup prepare-commit-msg hook': 
-	test_hook --setup prepare-commit-msg <<\EOF
-GIT_DIR=$(git rev-parse --git-dir)
-if test -d "$GIT_DIR/rebase-merge"
-then
-	rebasing=1
-else
-	rebasing=0
-fi
+expecting success of 7502.24 'commit --trailer with -c and command': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
 
-get_last_cmd () {
-	tail -n1 "$GIT_DIR/rebase-merge/done" | {
-		read cmd id _
-		git log --pretty="[$cmd %s]" -n1 $id
-	}
-}
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Mentored-by: C4 E4
+	Reported-by: A U Thor <author@example.com>
+	EOF
+	git -c trailer.report.key="Reported-by: " \
+		-c trailer.report.ifexists="replace" \
+		-c trailer.report.command="NAME=\"\$ARG\"; test -n \"\$NAME\" && \
+		git log --author=\"\$NAME\" -1 --format=\"format:%aN <%aE>\" || true" \
+		commit --trailer "report = author" --amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
 
-if test "$2" = commit
-then
-	if test $rebasing = 1
-	then
-		source="$3"
-	else
-		source=$(git rev-parse "$3")
-	fi
-else
-	source=${2-default}
-fi
-test "$GIT_EDITOR" = : && source="$source (no editor)"
+[main 6b1e5e9] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 336e96f] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 24 - commit --trailer with -c and command
 
-if test $rebasing = 1
-then
-	echo "$source $(get_last_cmd)" >"$1"
-else
-	sed -e "1s/.*/$source/" "$1" >msg.tmp
-	mv msg.tmp "$1"
-fi
-exit 0
-EOF
+expecting success of 7502.25 'commit --trailer not confused by --- separator': 
+	cat >msg <<-\EOF &&
+	subject
 
-ok 4 - setup prepare-commit-msg hook
+	body with dashes
+	---
+	in it
+	EOF
+	git commit --allow-empty --trailer="my-trailer: value" -F msg &&
+	{
+		cat msg &&
+		echo &&
+		echo "my-trailer: value"
+	} >expected &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
 
-expecting success of 7505.5 'with hook (-m)': 
+[main 244a002] subject
+ Author: A U Thor <author@example.com>
+ok 25 - commit --trailer not confused by --- separator
 
-	echo "more" >> file &&
-	git add file &&
-	git commit -m "more" &&
-	test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
+expecting success of 7502.26 'commit --trailer with --verbose': 
+	cat >msg <<-\EOF &&
+	subject
 
+	body
+	EOF
+	GIT_EDITOR=: git commit --edit -F msg --allow-empty \
+		--trailer="my-trailer: value" --verbose &&
+	{
+		cat msg &&
+		echo &&
+		echo "my-trailer: value"
+	} >expected &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
 
-[main 3484e6e] message (no editor)
+[main 64da097] subject
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 5 - with hook (-m)
+ok 26 - commit --trailer with --verbose
 
-expecting success of 7505.6 'with hook (-m editor)': 
+expecting success of 7502.27 'multiple -m': 
 
-	echo "more" >> file &&
-	git add file &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -e -m "more more" &&
-	test "$(git log -1 --pretty=format:%s)" = message
+	>negative &&
+	git add negative &&
+	git commit -m "one" -m "two" -m "three" &&
+	actual=$(git cat-file commit HEAD >tmp && sed -e "1,/^\$/d" tmp && rm tmp) &&
+	expected=$(test_write_lines "one" "" "two" "" "three") &&
+	test "z$actual" = "z$expected"
 
 
-[main 2a0b963] message
+[main a7c1b01] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 6 - with hook (-m editor)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 negative
+ok 27 - multiple -m
 
-expecting success of 7505.7 'with hook (-t)': 
+expecting success of 7502.28 'verbose': 
 
-	echo "more" >> file &&
-	git add file &&
-	git commit -t "$(git rev-parse --git-dir)/template" &&
-	test "$(git log -1 --pretty=format:%s)" = template
+	echo minus >negative &&
+	git add negative &&
+	git status -v >raw &&
+	sed -ne "/^diff --git /p" raw >actual &&
+	echo "diff --git a/negative b/negative" >expect &&
+	test_cmp expect actual
 
 
-[main f42c353] template
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 7 - with hook (-t)
+ok 28 - verbose
 
-expecting success of 7505.8 'with hook (-F)': 
+expecting success of 7502.29 'verbose respects diff config': 
 
-	echo "more" >> file &&
-	git add file &&
-	(echo more | git commit -F -) &&
-	test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
+	test_config diff.noprefix true &&
+	git status -v >actual &&
+	grep "diff --git negative negative" actual
+
+diff --git negative negative
+ok 29 - verbose respects diff config
 
+expecting success of 7502.30 'prepare file with comment line and trailing newlines': 
+	printf "%s" "$mesg_with_comment_and_newlines" >expect
 
-[main b41531e] message (no editor)
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - with hook (-F)
+ok 30 - prepare file with comment line and trailing newlines
 
-expecting success of 7505.9 'with hook (-F editor)': 
+expecting success of 7502.31 'cleanup commit messages (verbatim option,-t)': 
 
-	echo "more" >> file &&
-	git add file &&
-	(echo more more | GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -e -F -) &&
-	test "$(git log -1 --pretty=format:%s)" = message
+	echo >>negative &&
+	git commit --cleanup=verbatim --no-status -t expect -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
 
 
-[main d73cd02] message
+[main 8914337] # text
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 9 - with hook (-F editor)
+ 1 file changed, 2 insertions(+)
+ok 31 - cleanup commit messages (verbatim option,-t)
 
-expecting success of 7505.10 'with hook (-C)': 
+expecting success of 7502.32 'cleanup commit messages (verbatim option,-F)': 
 
-	head=$(git rev-parse HEAD) &&
-	echo "more" >> file &&
-	git add file &&
-	git commit -C $head &&
-	test "$(git log -1 --pretty=format:%s)" = "$head (no editor)"
+	echo >>negative &&
+	git commit --cleanup=verbatim -F expect -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
 
 
-[main b4108db] d73cd02f48887fc07727596c4670b88c78bd0dc1 (no editor)
+[main 50317d6] # text
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:30:13 2005 -0700
  1 file changed, 1 insertion(+)
-ok 10 - with hook (-C)
+ok 32 - cleanup commit messages (verbatim option,-F)
 
-expecting success of 7505.11 'with hook (editor)': 
+expecting success of 7502.33 'cleanup commit messages (verbatim option,-m)': 
 
-	echo "more more" >> file &&
-	git add file &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
-	test "$(git log -1 --pretty=format:%s)" = default
+	echo >>negative &&
+	git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
 
 
-[main 23ea42a] default
+[main 3ead1ca] # text
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 11 - with hook (editor)
+ok 33 - cleanup commit messages (verbatim option,-m)
 
-expecting success of 7505.12 'with hook (--amend)': 
+expecting success of 7502.34 'cleanup commit messages (whitespace option,-F)': 
 
-	head=$(git rev-parse HEAD) &&
-	echo "more" >> file &&
-	git add file &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --amend &&
-	test "$(git log -1 --pretty=format:%s)" = "$head"
+	echo >>negative &&
+	test_write_lines "" "# text" "" >text &&
+	echo "# text" >expect &&
+	git commit --cleanup=whitespace -F text -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
 
 
-[main 145405a] 23ea42a596f1c37e87d80762ba2516f619fea230
+[main 77206d3] # text
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:30:13 2005 -0700
- 1 file changed, 2 insertions(+)
-ok 12 - with hook (--amend)
+ 1 file changed, 1 insertion(+)
+ok 34 - cleanup commit messages (whitespace option,-F)
 
-expecting success of 7505.13 'with hook (-c)': 
+expecting success of 7502.35 'cleanup commit messages (scissors option,-F,-e)': 
 
-	head=$(git rev-parse HEAD) &&
-	echo "more" >> file &&
-	git add file &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head &&
-	test "$(git log -1 --pretty=format:%s)" = "$head"
+	echo >>negative &&
+	cat >text <<-\EOF &&
 
+	# to be kept
 
-[main a3af052] 145405a29530e37af3d6f413fa50ea2e361258ce
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:30:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 13 - with hook (-c)
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	# ------------------------ >8 ------------------------
+	to be removed
+	# ------------------------ >8 ------------------------
+	to be removed, too
+	EOF
 
-expecting success of 7505.14 'with hook (merge)': 
+	cat >expect <<-\EOF &&
+	# to be kept
 
-	test_when_finished "git checkout -f main" &&
-	git checkout -B other HEAD@{1} &&
-	echo "more" >>file &&
-	git add file &&
-	git commit -m other &&
-	git checkout - &&
-	git merge --no-ff other &&
-	test "$(git log -1 --pretty=format:%s)" = "merge (no editor)"
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	EOF
+	git commit --cleanup=scissors -e -F text -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
 
-Switched to a new branch 'other'
-[other 0b0ee29] message (no editor)
+[main e047c4e] # to be kept
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
-Already on 'main'
-ok 14 - with hook (merge)
+ok 35 - cleanup commit messages (scissors option,-F,-e)
 
-expecting success of 7505.15 'with hook and editor (merge)': 
+expecting success of 7502.36 'cleanup commit messages (scissors option,-F,-e, scissors on first line)': 
 
-	test_when_finished "git checkout -f main" &&
-	git checkout -B other HEAD@{1} &&
-	echo "more" >>file &&
-	git add file &&
-	git commit -m other &&
-	git checkout - &&
-	env GIT_EDITOR="\"\$FAKE_EDITOR\"" git merge --no-ff -e other &&
-	test "$(git log -1 --pretty=format:%s)" = "merge"
+	echo >>negative &&
+	cat >text <<-\EOF &&
+	# ------------------------ >8 ------------------------
+	to be removed
+	EOF
+	git commit --cleanup=scissors -e -F text -a --allow-empty-message &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_must_be_empty actual
 
-Switched to and reset branch 'other'
-[other 84ca9e8] message (no editor)
+[main 5e5571b] 
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- file | 1 +
- 1 file changed, 1 insertion(+)
-Already on 'main'
-ok 15 - with hook and editor (merge)
-
-expecting success of 7505.16 'with hook (rebase -i)': 
-		test_when_finished "\
-			git rebase --abort
-			git checkout -f main
-			git branch -D tmp" &&
-		git checkout -b tmp rebase-me &&
-		GIT_SEQUENCE_EDITOR="cp rebase-todo" &&
-		GIT_EDITOR="\"$FAKE_EDITOR\"" &&
-		(
-			export GIT_SEQUENCE_EDITOR GIT_EDITOR &&
-			test_must_fail git rebase -i $mode b &&
-			echo x >a &&
-			git add a &&
-			test_must_fail git rebase --continue &&
-			echo x >b &&
-			git add b &&
-			git commit &&
-			git rebase --continue &&
-			echo y >a &&
-			git add a &&
-			git commit &&
-			git rebase --continue &&
-			echo y >b &&
-			git add b &&
-			git rebase --continue
-		) &&
-		git log --pretty=%s -g -n18 HEAD@{1} >actual &&
-		test_cmp "$TEST_DIRECTORY/t7505/expected-rebase${mode:--i}" actual
-	
-Switched to a new branch 'tmp'
-Rebasing (1/15)
Auto-merging a
-CONFLICT (add/add): Merge conflict in a
-error: could not apply 0391433... rebase-a
-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 advice.mergeConflict false"
-Could not apply 0391433... 
-[detached HEAD f04682c] message [pick rebase-a]
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/15)
Auto-merging b
-CONFLICT (add/add): Merge conflict in b
-error: could not apply 21e9a5f... rebase-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 advice.mergeConflict false"
-Could not apply 21e9a5f... 
-[detached HEAD fc19041] merge [pick rebase-b]
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (3/15)
Rebasing (4/15)
Rebasing (5/15)
Rebasing (6/15)
Rebasing (7/15)
[detached HEAD 597943f] message [squash rebase-5]
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (8/15)
[detached HEAD 62a0091] HEAD [reword rebase-6]
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (9/15)
Rebasing (10/15)
Rebasing (11/15)
[detached HEAD 332415b] message [fixup rebase-9]
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (12/15)
Stopped at 58c3130...  
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-[detached HEAD 6a3b292] default [edit rebase-10]
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (13/15)
Rebasing (14/15)
[detached HEAD c6c0051] message [squash rebase-12]
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:30:13 2005 -0700
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Rebasing (15/15)
Stopped at 8f82bdf...  
-You can amend the commit now, with
-
-  git commit --amend 
+ok 36 - cleanup commit messages (scissors option,-F,-e, scissors on first line)
 
-Once you are satisfied with your changes, run
+expecting success of 7502.37 'cleanup commit messages (strip option,-F)': 
 
-  git rebase --continue
-[detached HEAD 8bcb406] message [edit rebase-13]
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:30:13 2005 -0700
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Successfully rebased and updated refs/heads/tmp.
-fatal: no rebase in progress
-Switched to branch 'main'
-Deleted branch tmp (was 8bcb406).
-ok 16 - with hook (rebase -i)
+	echo >>negative &&
+	test_write_lines "" "# text" "sample" "" >text &&
+	echo sample >expect &&
+	git commit --cleanup=strip -F text -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
 
-expecting success of 7505.17 'with hook (cherry-pick)': 
-	test_when_finished "git checkout -f main" &&
-	git checkout -B other b &&
-	git cherry-pick rebase-1 &&
-	test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
 
-Switched to and reset branch 'other'
-[other 755fb84] message (no editor)
+[main 5968d26] sample
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 c
-Switched to branch 'main'
-ok 17 - with hook (cherry-pick)
+ok 37 - cleanup commit messages (strip option,-F)
 
-expecting success of 7505.18 'with hook and editor (cherry-pick)': 
-	test_when_finished "git checkout -f main" &&
-	git checkout -B other b &&
-	git cherry-pick -e rebase-1 &&
-	test "$(git log -1 --pretty=format:%s)" = merge
+expecting success of 7502.38 'cleanup commit messages (strip option,-F,-e)': 
 
-Switched to and reset branch 'other'
-[other 611267b] merge
+	echo >>negative &&
+	test_write_lines "" "sample" "" >text &&
+	git commit -e -F text -a &&
+	head -n 4 .git/COMMIT_EDITMSG >actual
+
+[main 6ab3315] sample
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 c
-Switched to branch 'main'
-ok 18 - with hook and editor (cherry-pick)
-
-expecting success of 7505.19 'setup: commit-msg hook that always fails': 
-	test_hook --setup --clobber prepare-commit-msg <<-\EOF
-	exit 1
-	EOF
+ok 38 - cleanup commit messages (strip option,-F,-e)
 
-ok 19 - setup: commit-msg hook that always fails
+expecting success of 7502.39 'cleanup commit messages (strip option,-F,-e): output': 
+	test_cmp expect actual
 
-expecting success of 7505.20 'with failing hook': 
+ok 39 - cleanup commit messages (strip option,-F,-e): output
 
-	test_when_finished "git checkout -f main" &&
-	head=$(git rev-parse HEAD) &&
-	echo "more" >> file &&
-	git add file &&
-	test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
+expecting success of 7502.40 'cleanup commit message (fail on invalid cleanup mode option)': 
+	test_must_fail git commit --cleanup=non-existent
 
+fatal: Invalid cleanup mode non-existent
+ok 40 - cleanup commit message (fail on invalid cleanup mode option)
 
-Already on 'main'
-ok 20 - with failing hook
+expecting success of 7502.41 'cleanup commit message (fail on invalid cleanup mode configuration)': 
+	test_must_fail git -c commit.cleanup=non-existent commit
 
-expecting success of 7505.21 'with failing hook (--no-verify)': 
+fatal: Invalid cleanup mode non-existent
+ok 41 - cleanup commit message (fail on invalid cleanup mode configuration)
 
-	test_when_finished "git checkout -f main" &&
-	head=$(git rev-parse HEAD) &&
-	echo "more" >> file &&
+expecting success of 7502.42 'cleanup commit message (no config and no option uses default)': 
+	echo content >>file &&
 	git add file &&
-	test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git commit --no-status
+	) &&
+	commit_msg_is "commit message"
 
+[main 06a0f0b] commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 42 - cleanup commit message (no config and no option uses default)
 
-Already on 'main'
-ok 21 - with failing hook (--no-verify)
+expecting success of 7502.43 'cleanup commit message (option overrides default)': 
+	echo content >>file &&
+	git add file &&
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git commit --cleanup=whitespace --no-status
+	) &&
+	commit_msg_is "commit message # comment"
 
-expecting success of 7505.22 'with failing hook (merge)': 
+[main 8348171] commit message # comment
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 43 - cleanup commit message (option overrides default)
 
-	test_when_finished "git checkout -f main" &&
-	git checkout -B other HEAD@{1} &&
-	echo "more" >> file &&
+expecting success of 7502.44 'cleanup commit message (config overrides default)': 
+	echo content >>file &&
 	git add file &&
-	test_hook --remove prepare-commit-msg &&
-	git commit -m other &&
-	test_hook --setup prepare-commit-msg <<-\EOF &&
-	exit 1
-	EOF
-	git checkout - &&
-	test_must_fail git merge --no-ff other
-
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git -c commit.cleanup=whitespace commit --no-status
+	) &&
+	commit_msg_is "commit message # comment"
 
-Switched to and reset branch 'other'
-[other 056e6c0] other
+[main c4a33b1] commit message # comment
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Not committing merge; use 'git commit' to complete the merge.
-Already on 'main'
-ok 22 - with failing hook (merge)
+ok 44 - cleanup commit message (config overrides default)
 
-expecting success of 7505.23 'with failing hook (cherry-pick)': 
-	test_when_finished "git checkout -f main" &&
-	git checkout -B other b &&
-	test_must_fail git cherry-pick rebase-1 2>actual &&
-	test $(grep -c prepare-commit-msg actual) = 1
+expecting success of 7502.45 'cleanup commit message (option overrides config)': 
+	echo content >>file &&
+	git add file &&
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git -c commit.cleanup=whitespace commit --cleanup=default
+	) &&
+	commit_msg_is "commit message"
 
-Switched to and reset branch 'other'
-Switched to branch 'main'
-warning: cancelling a cherry picking in progress
-ok 23 - with failing hook (cherry-pick)
+[main 7b9798a] commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 45 - cleanup commit message (option overrides config)
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7507-commit-verbose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7507-commit-verbose/.git/
-expecting success of 7507.1 'setup': 
-	echo content >file &&
+expecting success of 7502.46 'cleanup commit message (default, -m)': 
+	echo content >>file &&
 	git add file &&
-	git commit -F message
+	git commit -m "message #comment " &&
+	commit_msg_is "message #comment"
 
-[master (root-commit) 5621fbe] subject
+[main f675c53] message #comment
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
+ok 46 - cleanup commit message (default, -m)
 
-expecting success of 7507.2 'initial commit shows verbose diff': 
-	git commit --amend -v &&
-	test_line_count = 1 out
+expecting success of 7502.47 'cleanup commit message (whitespace option, -m)': 
+	echo content >>file &&
+	git add file &&
+	git commit --cleanup=whitespace --no-status -m "message #comment " &&
+	commit_msg_is "message #comment"
 
-[master 5621fbe] subject
+[main 8e56e6c] message #comment
  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
+ok 47 - cleanup commit message (whitespace option, -m)
 
-expecting success of 7507.3 'second commit': 
-	echo content modified >file &&
+expecting success of 7502.48 'cleanup commit message (whitespace config, -m)': 
+	echo content >>file &&
 	git add file &&
-	git commit -F message
+	git -c commit.cleanup=whitespace commit --no-status -m "message #comment " &&
+	commit_msg_is "message #comment"
 
-[master aa8777f] subject
+[main 7207f92] message #comment
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - second commit
+ 1 file changed, 1 insertion(+)
+ok 48 - cleanup commit message (whitespace config, -m)
 
-expecting success of 7507.4 'verbose diff is stripped out': 
-	git commit --amend -v &&
-	check_message message &&
-	test_line_count = 1 out
+expecting success of 7502.49 'message shows author when it is not equal to committer': 
+	echo >>negative &&
+	git commit -e -m "sample" -a &&
+	test_grep \
+	  "^# Author: *A U Thor <author@example.com>\$" \
+	  .git/COMMIT_EDITMSG
 
-[master aa8777f] subject
+[main 96a295c] sample
  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
+ 1 file changed, 1 insertion(+)
+# Author:    A U Thor <author@example.com>
+ok 49 - message shows author when it is not equal to committer
 
-expecting success of 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
+expecting success of 7502.50 'message shows date when it is explicitly set': 
+	git commit --allow-empty -e -m foo --date="2010-01-02T03:04:05" &&
+	test_grep \
+	  "^# Date: *Sat Jan 2 03:04:05 2010 +0000" \
+	  .git/COMMIT_EDITMSG
 
-[master aa8777f] subject
+[main 1d86a4b] foo
  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)
+ Date: Sat Jan 2 03:04:05 2010 +0000
+# Date:      Sat Jan 2 03:04:05 2010 +0000
+ok 50 - message shows date when it is explicitly set
 
-expecting success of 7507.6 'diff in message is retained without -v': 
-	git commit --amend -F diff &&
-	check_message diff
+expecting success of 7502.51 'message does not have multiple scissors lines': 
+	git commit --cleanup=scissors -v --allow-empty -e -m foo &&
+	test $(grep -c -e "--- >8 ---" .git/COMMIT_EDITMSG) -eq 1
 
-[master 5165ef5] This is an example commit message that contains a diff.
+[main 215259a] foo
  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
+ok 51 - message does not have multiple scissors lines
 
-expecting success of 7507.7 'diff in message is retained with -v': 
-	git commit --amend -F diff -v &&
-	check_message diff
+checking prerequisite: AUTOIDENT
 
-[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
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-AUTOIDENT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-AUTOIDENT" &&
+	sane_unset GIT_AUTHOR_NAME &&
+	sane_unset GIT_AUTHOR_EMAIL &&
+	git var GIT_AUTHOR_IDENT
 
-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"
-	) &&
+)
+second user <pbuilder2@codethink04-arm64.debian.net> 1112912533 -0700
+prerequisite AUTOIDENT ok
+expecting success of 7502.52 'message shows committer when it is automatic': 
+
+	echo >>negative &&
 	(
-		GIT_EDITOR=cat &&
-		export GIT_EDITOR &&
-		test_must_fail git commit -a -v 2>err
+		sane_unset GIT_COMMITTER_EMAIL &&
+		sane_unset GIT_COMMITTER_NAME &&
+		git commit -e -m "sample" -a
 	) &&
-	test_grep "Aborting commit due to empty commit message." err
+	# 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
 
-Cloning into '/build/reproducible-path/git-2.47.2/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
+[main f5ce206] sample
  Author: A U Thor <author@example.com>
+ Committer: second user <pbuilder2@codethink04-arm64.debian.net>
+Your name and email address were configured automatically based
+on your username and hostname. Please check that they are accurate.
+You can suppress this message by setting them explicitly. Run the
+following command and follow the instructions in your editor to edit
+your configuration file:
+
+    git config --global --edit
+
+After doing this, you may fix the identity used for this commit with:
+
+    git commit --amend --reset-author
+
  1 file changed, 1 insertion(+)
+# Committer: second user <pbuilder2@codethink04-arm64.debian.net>
+ok 52 - message shows committer when it is automatic
 
-# 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
+checking prerequisite: FAIL_PREREQS
 
-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
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
+		test_bool_env GIT_TEST_FAIL_PREREQS false
+	
+)
+prerequisite FAIL_PREREQS not satisfied
+ok 53 # skip do not fire editor when committer is bogus (missing !AUTOIDENT of !FAIL_PREREQS,!AUTOIDENT)
 
+expecting success of 7502.54 'do not fire editor if -m <msg> was given': 
+	echo tick >file &&
+	git add file &&
+	echo "editor not started" >.git/result &&
+	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" git commit -m tick) &&
+	test "$(cat .git/result)" = "editor not started"
 
-; 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
+[main b3aefca] tick
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+ok 54 - do not fire editor if -m <msg> was given
 
-expecting success of 7507.10 'verbose diff is stripped with multi-byte comment char': 
+expecting success of 7502.55 'do not fire editor if -m "" was given': 
+	echo tock >file &&
+	git add file &&
+	echo "editor not started" >.git/result &&
+	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" \
+	 git commit -m "" --allow-empty-message) &&
+	test "$(cat .git/result)" = "editor not started"
+
+[main 6fc5d44] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 55 - do not fire editor if -m "" was given
+
+expecting success of 7502.56 'do not fire editor in the presence of conflicts': 
+
+	git clean -f &&
+	echo f >g &&
+	git add g &&
+	git commit -m "add g" &&
+	git branch second &&
+	echo main >g &&
+	echo g >h &&
+	git add g h &&
+	git commit -m "modify g and add h" &&
+	git checkout second &&
+	echo second >g &&
+	git add g &&
+	git commit -m second &&
+	# Must fail due to conflict
+	test_must_fail git cherry-pick -n main &&
+	echo "editor not started" >.git/result &&
 	(
-		GIT_EDITOR=cat &&
+		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
 		export GIT_EDITOR &&
-		test_must_fail git -c core.commentchar="foo>" commit -a -v >out 2>err
+		test_must_fail git commit
 	) &&
-	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
+	test "$(cat .git/result)" = "editor not started"
 
-expecting success of 7507.11 'status does not verbose without --verbose': 
-	git status >actual &&
-	! grep "^diff --git" actual
+Removing act
+Removing actual
+Removing commit.msg
+Removing commit_msg_is.actual
+Removing commit_msg_is.expect
+Removing current.1
+Removing current.2
+Removing exp
+Removing expect
+Removing expected
+Removing ident
+Removing msg
+Removing raw
+Removing text
+[main d6e1120] add g
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g
+[main c77b361] modify g and add h
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 h
+Switched to branch 'second'
+[second cb85b8b] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging g
+CONFLICT (content): Merge conflict in g
+error: could not apply c77b361... modify g and add h
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: Disable this message with "git config advice.mergeConflict false"
+error: Committing is not possible because you have unmerged files.
+hint: Fix them up in the work tree, and then use 'git add/rm <file>'
+hint: as appropriate to mark resolution and make a commit.
+fatal: Exiting because of an unresolved conflict.
+U	g
+ok 56 - do not fire editor in the presence of conflicts
 
-ok 11 - status does not verbose without --verbose
+expecting success of 7502.57 'a SIGTERM should break locks': 
+	echo >>negative &&
+	! "$SHELL_PATH" -c '
+	  echo kill -TERM $$ >>.git/FAKE_EDITOR
+	  GIT_EDITOR=.git/FAKE_EDITOR
+	  export GIT_EDITOR
+	  exec git commit -a' &&
+	test ! -f .git/index.lock
 
-expecting success of 7507.12 'setup -v -v': 
-	echo dirty >file
+Terminated
+ok 57 - a SIGTERM should break locks
 
-ok 12 - setup -v -v
+expecting success of 7502.58 'Hand committing of a redundant merge removes dups': 
 
-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
+	git rev-parse second main >expect &&
+	test_must_fail git merge second main &&
+	git checkout main g &&
+	EDITOR=: git commit -a &&
+	git cat-file commit HEAD >raw &&
+	sed -n -e "s/^parent //p" -e "/^$/q" raw >actual &&
+	test_cmp expect actual
 
-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
+Auto-merging g
+CONFLICT (content): Merge conflict in g
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from b907ba1
+[second b94b2b3] Merge branch 'main' into second
  Author: A U Thor <author@example.com>
- 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
+ok 58 - Hand committing of a redundant merge removes dups
 
-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 7502.59 'A single-liner subject with a token plus colon is not a footer': 
 
-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
+	git reset --hard &&
+	git commit -s -m "hello: kitty" --allow-empty &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_line_count = 3 actual
 
-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
+HEAD is now at b94b2b3 Merge branch 'main' into second
+[second 8408c70] hello: kitty
  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
+ok 59 - A single-liner subject with a token plus colon is not a footer
 
-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 7502.60 'commit -s places sob on third line after two empty lines': 
+	git commit -s --allow-empty --allow-empty-message &&
+	cat <<-EOF >expect &&
 
-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
+	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
 
-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
+	EOF
+	sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual &&
+	test_cmp expect actual
 
-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
+[second 335a239] Signed-off-by: C O Mitter <committer@example.com>
  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
+ok 60 - commit -s places sob on third line after two empty lines
 
-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
+expecting success of 7502.61 'commit': 
+		try_commit "" &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at 335a239 Signed-off-by: C O Mitter <committer@example.com>
+[second e6896a3] message
  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
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 61 - commit
 
-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
+expecting success of 7502.62 'commit --status': 
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at e6896a3 message
+[second aae0cd6] message
  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
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 62 - commit --status
 
-expecting success of 7507.27 'commit.verbose=-2 and --verbose': 
-		git -c commit.verbose=-2 commit --amend --verbose &&
-		test_line_count = 1 out
+expecting success of 7502.63 'commit --no-status': 
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at aae0cd6 message
+[second 5ca52f0] message
  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
+ 1 file changed, 1 insertion(+)
+ok 63 - commit --no-status
 
-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
+expecting success of 7502.64 'commit with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit "" &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at 5ca52f0 message
+[second a3f2728] message
  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
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 64 - commit with commit.status = yes
 
-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
+expecting success of 7502.65 'commit with commit.status = no': 
+		test_config commit.status no &&
+		try_commit "" &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at a3f2728 message
+[second a4be5c9] message
  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
+ 1 file changed, 1 insertion(+)
+ok 65 - commit with commit.status = no
 
-expecting success of 7507.30 'commit.verbose=-1 and --verbose': 
-		git -c commit.verbose=-1 commit --amend --verbose &&
-		test_line_count = 1 out
+expecting success of 7502.66 'commit --status with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at a4be5c9 message
+[second ccf5b3a] message
  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
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 66 - commit --status with commit.status = yes
 
-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
+expecting success of 7502.67 'commit --no-status with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at ccf5b3a message
+[second ffcb402] message
  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
+ 1 file changed, 1 insertion(+)
+ok 67 - commit --no-status with commit.status = yes
 
-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
+expecting success of 7502.68 'commit --status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at ffcb402 message
+[second 3e1b053] message
  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
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 68 - commit --status with commit.status = no
 
-expecting success of 7507.33 'commit.verbose=0 and --verbose': 
-		git -c commit.verbose=0 commit --amend --verbose &&
-		test_line_count = 1 out
+expecting success of 7502.69 'commit --no-status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at 3e1b053 message
+[second fb6395e] message
  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
+ 1 file changed, 1 insertion(+)
+ok 69 - commit --no-status with commit.status = no
 
-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
+expecting success of 7502.70 'commit': 
+		try_commit "" &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at fb6395e message
+[second 1dcf2b5] message
  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
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 70 - commit
 
-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
+expecting success of 7502.71 'commit --status': 
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at 1dcf2b5 message
+[second b4fd6ef] message
  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
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 71 - commit --status
 
-expecting success of 7507.36 'commit.verbose=1 and --verbose': 
-		git -c commit.verbose=1 commit --amend --verbose &&
-		test_line_count = 1 out
+expecting success of 7502.72 'commit --no-status': 
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at b4fd6ef message
+[second f6d1bea] message
  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
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 72 - commit --no-status
 
-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
+expecting success of 7502.73 'commit with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit "" &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at f6d1bea message
+[second 13cf604] message
  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
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 73 - commit with commit.status = yes
 
-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
+expecting success of 7502.74 'commit with commit.status = no': 
+		test_config commit.status no &&
+		try_commit "" &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at 13cf604 message
+[second e261d72] message
  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
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 74 - commit with commit.status = no
 
-expecting success of 7507.39 'commit.verbose=2 and --verbose': 
-		git -c commit.verbose=2 commit --amend --verbose &&
-		test_line_count = 1 out
+expecting success of 7502.75 'commit --status with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at e261d72 message
+[second 6fdba1b] message
  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
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 75 - commit --status with commit.status = yes
 
-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
+expecting success of 7502.76 'commit --no-status with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at 6fdba1b message
+[second c35b18a] message
  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
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 76 - commit --no-status with commit.status = yes
 
-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
+expecting success of 7502.77 'commit --status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at c35b18a message
+[second 6c72121] message
  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
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 77 - commit --status with commit.status = no
 
-expecting success of 7507.42 'commit.verbose=3 and --verbose': 
-		git -c commit.verbose=3 commit --amend --verbose &&
-		test_line_count = 1 out
+expecting success of 7502.78 'commit --no-status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-[master 2f750a4] sub added
+HEAD is now at 6c72121 message
+[second 8d921f5] message
  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
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 78 - commit --no-status with commit.status = no
 
-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
+expecting success of 7502.79 'commit --status with custom comment character': 
+	test_config core.commentchar ";" &&
+	try_commit --status &&
+	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+
+HEAD is now at 8d921f5 message
+[second 21fb741] message ## Custom template
  Author: A U Thor <author@example.com>
- 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
+ 1 file changed, 1 insertion(+)
+## Custom template
+; Changes to be committed:
+ok 79 - commit --status with custom comment character
 
-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
+expecting success of 7502.80 'switch core.commentchar': 
+	test_commit "#foo" foo &&
+	GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
+	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+
+[second 936c61f] #foo
  Author: A U Thor <author@example.com>
- 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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[second 7327b29] message #foo
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+; Changes to be committed:
+ok 80 - switch core.commentchar
 
-expecting success of 7507.45 'status ignores commit.verbose=true': 
-	git -c commit.verbose=true status >actual &&
-	! grep "^diff --git actual"
+expecting success of 7502.81 'switch core.commentchar but out of options': 
+	cat >text <<\EOF &&
+# 1
+; 2
+@ 3
+! 4
+$ 5
+% 6
+^ 7
+& 8
+| 9
+: 10
+EOF
+	git commit --amend -F text &&
+	(
+		test_set_editor .git/FAKE_EDITOR &&
+		test_must_fail git -c core.commentChar=auto commit --amend
+	)
 
-ok 45 - status ignores commit.verbose=true
+[second 1a16233] # 1 ; 2 @ 3 ! 4 $ 5 % 6 ^ 7 & 8 | 9 : 10
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+fatal: unable to select a comment character that is not used
+in the current commit message
+ok 81 - switch core.commentchar but out of options
 
-# passed all 45 test(s)
-1..45
+# passed all 81 test(s)
+1..81
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7514-commit-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7514-commit-patch/.git/
-expecting success of 7514.1 'setup (initial)': 
-	echo line1 >file &&
-	git add file &&
-	git commit -m commit1
+*** t7510-signed-commit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7510-signed-commit/.git/
+checking prerequisite: GPG
 
-[master (root-commit) 8d800e1] commit1
+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 verify and show signatures (missing GPG)
+
+ok 3 # skip verify-commit exits failure on unknown signature (missing GPG)
+
+ok 4 # skip verify-commit exits success on untrusted signature (missing GPG)
+
+ok 5 # skip verify-commit exits success with matching minTrustLevel (missing GPG)
+
+ok 6 # skip verify-commit exits success with low minTrustLevel (missing GPG)
+
+ok 7 # skip verify-commit exits failure with high minTrustLevel (missing GPG)
+
+ok 8 # skip verify signatures with --raw (missing GPG)
+
+ok 9 # skip proper header is used for hash algorithm (missing GPG)
+
+ok 10 # skip show signed commit with signature (missing GPG)
+
+ok 11 # skip detect fudged signature (missing GPG)
+
+ok 12 # skip detect fudged signature with NUL (missing GPG)
+
+ok 13 # skip amending already signed commit (missing GPG)
+
+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 14 # skip bare signature (missing GPG2)
+
+ok 15 # skip show good signature with custom format (missing GPG)
+
+ok 16 # skip show bad signature with custom format (missing GPG)
+
+ok 17 # skip show untrusted signature with custom format (missing GPG)
+
+ok 18 # skip show untrusted signature with undefined trust level (missing GPG)
+
+ok 19 # skip show untrusted signature with ultimate trust level (missing GPG)
+
+ok 20 # skip show unknown signature with custom format (missing GPG)
+
+ok 21 # skip show lack of signature with custom format (missing GPG)
+
+ok 22 # skip log.showsignature behaves like --show-signature (missing GPG)
+
+ok 23 # skip check config gpg.format values (missing GPG)
+
+ok 24 # skip detect fudged commit with double signature (missing GPG)
+
+ok 25 # skip show double signature with custom format (missing GPG)
+
+ok 26 # skip verify-commit verifies multiply signed commits (missing GPG)
+
+expecting success of 7510.27 'custom `gpg.program`': 
+	write_script fake-gpg <<-\EOF &&
+	args="$*"
+
+	# skip uninteresting options
+	while case "$1" in
+	--status-fd=*|--keyid-format=*) ;; # skip
+	*) break;;
+	esac; do shift; done
+
+	case "$1" in
+	-bsau)
+		test -z "$LET_GPG_PROGRAM_FAIL" || {
+			echo "zOMG signing failed!" >&2
+			exit 1
+		}
+		cat >sign.file
+		echo "[GNUPG:] SIG_CREATED $args" >&2
+		echo "-----BEGIN PGP MESSAGE-----"
+		echo "$args"
+		echo "-----END PGP MESSAGE-----"
+		;;
+	--verify)
+		cat "$2" >verify.file
+		exit 0
+		;;
+	*)
+		echo "Unhandled args: $*" >&2
+		exit 1
+		;;
+	esac
+	EOF
+
+	test_config gpg.program "$(pwd)/fake-gpg" &&
+	git commit -S --allow-empty -m signed-commit &&
+	test_path_exists sign.file &&
+	git show --show-signature &&
+	test_path_exists verify.file &&
+
+	test_must_fail env LET_GPG_PROGRAM_FAIL=1 \
+	git commit -S --allow-empty -m must-fail 2>err &&
+	grep zOMG err
+
+[main (root-commit) 554da10] signed-commit
+ Author: A U Thor <author@example.com>
+commit 554da108591b1b44bd66564d7121378316c3ba6f
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    signed-commit
+zOMG signing failed!
+ok 27 - custom `gpg.program`
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7509-commit-authorship.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7509-commit-authorship/.git/
+expecting success of 7509.1 '-C option copies authorship and message': 
+	test_commit --author Frigate\ \<flying@over.world\> \
+		"Initial Commit" foo Initial Initial &&
+	echo "Test 1" >>foo &&
+	test_tick &&
+	git commit -a -C Initial &&
+	author_header Initial >expect &&
+	author_header HEAD >actual &&
+	test_cmp expect actual &&
+
+	message_body Initial >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
+
+[master (root-commit) 6c1fd11] Initial Commit
+ Author: Frigate <flying@over.world>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master 19b40bf] Initial Commit
+ Author: Frigate <flying@over.world>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 1 - -C option copies authorship and message
+
+expecting success of 7509.2 '-C option copies only the message with --reset-author': 
+	echo "Test 2" >>foo &&
+	test_tick &&
+	git commit -a -C Initial --reset-author &&
+	echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+	author_header HEAD >actual &&
+	test_cmp expect actual &&
+
+	message_body Initial >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
+
+[master 0381fd2] Initial Commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup (initial)
+ok 2 - -C option copies only the message with --reset-author
 
-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
+expecting success of 7509.3 '-c option copies authorship and message': 
+	echo "Test 3" >>foo &&
+	test_tick &&
+	EDITOR=: VISUAL=: git commit -a -c Initial &&
+	author_header Initial >expect &&
+	author_header HEAD >actual &&
+	test_cmp expect actual
 
-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
+[master fef56eb] Initial Commit
+ Author: Frigate <flying@over.world>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 3 - -c option copies authorship and message
+
+expecting success of 7509.4 '-c option copies only the message with --reset-author': 
+	echo "Test 4" >>foo &&
+	test_tick &&
+	EDITOR=: VISUAL=: git commit -a -c Initial --reset-author &&
+	echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+	author_header HEAD >actual &&
+	test_cmp expect actual &&
+
+	message_body Initial >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
+
+[master d241f1c] Initial Commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 2 - edit hunk "commit -p -m message"
+ok 4 - -c option copies only the message with --reset-author
 
-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
+expecting success of 7509.5 '--amend option copies authorship': 
+	git checkout Initial &&
+	echo "Test 5" >>foo &&
+	test_tick &&
+	git commit -a --amend -m "amend test" &&
+	author_header Initial >expect &&
+	author_header HEAD >actual &&
+	test_cmp expect actual &&
 
-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
+	echo "amend test" >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
+
+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 6c1fd11 Initial Commit
+[detached HEAD 7318ebc] amend test
+ Author: Frigate <flying@over.world>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+ok 5 - --amend option copies authorship
+
+expecting success of 7509.6 '--amend option with empty author': 
+	git cat-file commit Initial >tmp &&
+	sed "s/author [^<]* </author  </" tmp >empty-author &&
+	sha=$(git hash-object -t commit -w empty-author) &&
+	test_when_finished "remove_object $sha" &&
+	git checkout $sha &&
+	test_when_finished "git checkout Initial" &&
+	echo "Empty author test" >>foo &&
+	test_tick &&
+	test_must_fail git commit -a -m "empty author" --amend 2>err &&
+	test_grep "empty ident" err
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  7318ebc amend test
+
+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> 7318ebc
+
+HEAD is now at 488af46 Initial Commit
+fatal: empty ident name (for <flying@over.world>) not allowed
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  488af46 Initial Commit
+
+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> 488af46
+
+HEAD is now at 6c1fd11 Initial Commit
+M	foo
+ok 6 - --amend option with empty author
+
+expecting success of 7509.7 '--amend option with missing author': 
+	git cat-file commit Initial >tmp &&
+	sed "s/author [^<]* </author </" tmp >malformed &&
+	sha=$(git hash-object --literally -t commit -w malformed) &&
+	test_when_finished "remove_object $sha" &&
+	git checkout $sha &&
+	test_when_finished "git checkout Initial" &&
+	echo "Missing author test" >>foo &&
+	test_tick &&
+	test_must_fail git commit -a -m "malformed author" --amend 2>err &&
+	test_grep "empty ident" err
+
+Previous HEAD position was 6c1fd11 Initial Commit
+HEAD is now at 1dcf28c Initial Commit
+M	foo
+fatal: empty ident name (for <flying@over.world>) not allowed
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  1dcf28c Initial Commit
+
+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> 1dcf28c
+
+HEAD is now at 6c1fd11 Initial Commit
+M	foo
+ok 7 - --amend option with missing author
+
+expecting success of 7509.8 '--reset-author makes the commit ours even with --amend option': 
+	git checkout Initial &&
+	echo "Test 6" >>foo &&
+	test_tick &&
+	git commit -a --reset-author -m "Changed again" --amend &&
+	echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+	author_header HEAD >actual &&
+	test_cmp expect actual &&
+
+	echo "Changed again" >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
+
+HEAD is now at 6c1fd11 Initial Commit
+M	foo
+[detached HEAD 16b5be6] Changed again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 foo
+ok 8 - --reset-author makes the commit ours even with --amend option
+
+expecting success of 7509.9 '--reset-author and --author are mutually exclusive': 
+	git checkout Initial &&
+	echo "Test 7" >>foo &&
+	test_tick &&
+	test_must_fail git commit -a --reset-author --author="Xyzzy <frotz@nitfol.xz>"
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  16b5be6 Changed again
+
+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> 16b5be6
+
+HEAD is now at 6c1fd11 Initial Commit
+fatal: options '--reset-author' and '--author' cannot be used together
+ok 9 - --reset-author and --author are mutually exclusive
+
+expecting success of 7509.10 '--reset-author should be rejected without -c/-C/--amend': 
+	git checkout Initial &&
+	echo "Test 7" >>foo &&
+	test_tick &&
+	test_must_fail git commit -a --reset-author -m done
+
+HEAD is now at 6c1fd11 Initial Commit
+M	foo
+fatal: --reset-author can be used only with -C, -c or --amend.
+ok 10 - --reset-author should be rejected without -c/-C/--amend
+
+expecting success of 7509.11 'commit respects CHERRY_PICK_HEAD and MERGE_MSG': 
+	echo "cherry-pick 1a" >>foo &&
+	test_tick &&
+	git commit -am "cherry-pick 1" --author="Cherry <cherry@pick.er>" &&
+	git tag cherry-pick-head &&
+	git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) &&
+	echo "This is a MERGE_MSG" >.git/MERGE_MSG &&
+	echo "cherry-pick 1b" >>foo &&
+	test_tick &&
+	git commit -a &&
+	author_header cherry-pick-head >expect &&
+	author_header HEAD >actual &&
+	test_cmp expect actual &&
+
+	echo "This is a MERGE_MSG" >expect &&
+	message_body HEAD >actual &&
+	test_cmp expect actual
+
+[detached HEAD 7db2008] cherry-pick 1
+ Author: Cherry <cherry@pick.er>
+ 1 file changed, 3 insertions(+)
+[detached HEAD b9f2fd6] This is a MERGE_MSG
+ Author: Cherry <cherry@pick.er>
+ Date: Thu Apr 7 15:24:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 11 - commit respects CHERRY_PICK_HEAD and MERGE_MSG
+
+expecting success of 7509.12 '--reset-author with CHERRY_PICK_HEAD': 
+	git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) &&
+	echo "cherry-pick 2" >>foo &&
+	test_tick &&
+	git commit -am "cherry-pick 2" --reset-author &&
+	echo "author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+	author_header HEAD >actual &&
+	test_cmp expect actual
+
+[detached HEAD 9a09dbe] cherry-pick 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 3 - edit hunk "commit --dry-run -p -m message"
+ok 12 - --reset-author with CHERRY_PICK_HEAD
 
-# passed all 3 test(s)
-1..3
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7511-status-index.sh ***
@@ -475699,6 +474505,1294 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7514-commit-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7507-commit-verbose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7505-prepare-commit-msg-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7505-prepare-commit-msg-hook/.git/
+expecting success of 7505.1 'set up commits for rebasing': 
+	test_commit root &&
+	test_commit a a a &&
+	test_commit b b b &&
+	git checkout -b rebase-me root &&
+	test_commit rebase-a a aa &&
+	test_commit rebase-b b bb &&
+	for i in $(test_seq 1 13)
+	do
+		test_commit rebase-$i c $i || return 1
+	done &&
+	git checkout main &&
+
+	cat >rebase-todo <<-EOF
+	pick $(git rev-parse rebase-a)
+	pick $(git rev-parse rebase-b)
+	fixup $(git rev-parse rebase-1)
+	fixup $(git rev-parse rebase-2)
+	pick $(git rev-parse rebase-3)
+	fixup $(git rev-parse rebase-4)
+	squash $(git rev-parse rebase-5)
+	reword $(git rev-parse rebase-6)
+	squash $(git rev-parse rebase-7)
+	fixup $(git rev-parse rebase-8)
+	fixup $(git rev-parse rebase-9)
+	edit $(git rev-parse rebase-10)
+	squash $(git rev-parse rebase-11)
+	squash $(git rev-parse rebase-12)
+	edit $(git rev-parse rebase-13)
+	EOF
+
+[main (root-commit) dc6f871] root
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 root.t
+[main 0cf4349] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[main e24f16d] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+Switched to a new branch 'rebase-me'
+[rebase-me 0391433] rebase-a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[rebase-me 21e9a5f] rebase-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+[rebase-me 9bc7808] rebase-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c
+[rebase-me 2bdc1d4] rebase-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me 1aecffa] rebase-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me 9284a05] rebase-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me e8f1437] rebase-5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me 111c466] rebase-6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me 2238056] rebase-7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me 55c53f7] rebase-8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me 7ad5821] rebase-9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me 58c3130] rebase-10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me 2f28a77] rebase-11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me 6339e66] rebase-12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[rebase-me 8f82bdf] rebase-13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 1 - set up commits for rebasing
+
+expecting success of 7505.2 'with no hook': 
+
+	echo "foo" > file &&
+	git add file &&
+	git commit -m "first"
+
+
+[main 1f7238d] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 2 - with no hook
+
+expecting success of 7505.3 'setup fake editor for interactive editing': 
+	write_script fake-editor <<-\EOF &&
+	exit 0
+	EOF
+
+	## Not using test_set_editor here so we can easily ensure the editor variable
+	## is only set for the editor tests
+	FAKE_EDITOR="$(pwd)/fake-editor" &&
+	export FAKE_EDITOR
+
+ok 3 - setup fake editor for interactive editing
+
+expecting success of 7505.4 'setup prepare-commit-msg hook': 
+	test_hook --setup prepare-commit-msg <<\EOF
+GIT_DIR=$(git rev-parse --git-dir)
+if test -d "$GIT_DIR/rebase-merge"
+then
+	rebasing=1
+else
+	rebasing=0
+fi
+
+get_last_cmd () {
+	tail -n1 "$GIT_DIR/rebase-merge/done" | {
+		read cmd id _
+		git log --pretty="[$cmd %s]" -n1 $id
+	}
+}
+
+if test "$2" = commit
+then
+	if test $rebasing = 1
+	then
+		source="$3"
+	else
+		source=$(git rev-parse "$3")
+	fi
+else
+	source=${2-default}
+fi
+test "$GIT_EDITOR" = : && source="$source (no editor)"
+
+if test $rebasing = 1
+then
+	echo "$source $(get_last_cmd)" >"$1"
+else
+	sed -e "1s/.*/$source/" "$1" >msg.tmp
+	mv msg.tmp "$1"
+fi
+exit 0
+EOF
+
+ok 4 - setup prepare-commit-msg hook
+
+expecting success of 7505.5 'with hook (-m)': 
+
+	echo "more" >> file &&
+	git add file &&
+	git commit -m "more" &&
+	test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
+
+
+[main 3484e6e] message (no editor)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 5 - with hook (-m)
+
+expecting success of 7505.6 'with hook (-m editor)': 
+
+	echo "more" >> file &&
+	git add file &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -e -m "more more" &&
+	test "$(git log -1 --pretty=format:%s)" = message
+
+
+[main 2a0b963] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 6 - with hook (-m editor)
+
+expecting success of 7505.7 'with hook (-t)': 
+
+	echo "more" >> file &&
+	git add file &&
+	git commit -t "$(git rev-parse --git-dir)/template" &&
+	test "$(git log -1 --pretty=format:%s)" = template
+
+
+[main f42c353] template
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 7 - with hook (-t)
+
+expecting success of 7505.8 'with hook (-F)': 
+
+	echo "more" >> file &&
+	git add file &&
+	(echo more | git commit -F -) &&
+	test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
+
+
+[main b41531e] message (no editor)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 8 - with hook (-F)
+
+expecting success of 7505.9 'with hook (-F editor)': 
+
+	echo "more" >> file &&
+	git add file &&
+	(echo more more | GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -e -F -) &&
+	test "$(git log -1 --pretty=format:%s)" = message
+
+
+[main d73cd02] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 9 - with hook (-F editor)
+
+expecting success of 7505.10 'with hook (-C)': 
+
+	head=$(git rev-parse HEAD) &&
+	echo "more" >> file &&
+	git add file &&
+	git commit -C $head &&
+	test "$(git log -1 --pretty=format:%s)" = "$head (no editor)"
+
+
+[main b4108db] d73cd02f48887fc07727596c4670b88c78bd0dc1 (no editor)
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:30:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 10 - with hook (-C)
+
+expecting success of 7505.11 'with hook (editor)': 
+
+	echo "more more" >> file &&
+	git add file &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
+	test "$(git log -1 --pretty=format:%s)" = default
+
+
+[main 23ea42a] default
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 11 - with hook (editor)
+
+expecting success of 7505.12 'with hook (--amend)': 
+
+	head=$(git rev-parse HEAD) &&
+	echo "more" >> file &&
+	git add file &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --amend &&
+	test "$(git log -1 --pretty=format:%s)" = "$head"
+
+
+[main 145405a] 23ea42a596f1c37e87d80762ba2516f619fea230
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:30:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+ok 12 - with hook (--amend)
+
+expecting success of 7505.13 'with hook (-c)': 
+
+	head=$(git rev-parse HEAD) &&
+	echo "more" >> file &&
+	git add file &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head &&
+	test "$(git log -1 --pretty=format:%s)" = "$head"
+
+
+[main a3af052] 145405a29530e37af3d6f413fa50ea2e361258ce
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:30:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 13 - with hook (-c)
+
+expecting success of 7505.14 'with hook (merge)': 
+
+	test_when_finished "git checkout -f main" &&
+	git checkout -B other HEAD@{1} &&
+	echo "more" >>file &&
+	git add file &&
+	git commit -m other &&
+	git checkout - &&
+	git merge --no-ff other &&
+	test "$(git log -1 --pretty=format:%s)" = "merge (no editor)"
+
+Switched to a new branch 'other'
+[other 0b0ee29] message (no editor)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+Already on 'main'
+ok 14 - with hook (merge)
+
+expecting success of 7505.15 'with hook and editor (merge)': 
+
+	test_when_finished "git checkout -f main" &&
+	git checkout -B other HEAD@{1} &&
+	echo "more" >>file &&
+	git add file &&
+	git commit -m other &&
+	git checkout - &&
+	env GIT_EDITOR="\"\$FAKE_EDITOR\"" git merge --no-ff -e other &&
+	test "$(git log -1 --pretty=format:%s)" = "merge"
+
+Switched to and reset branch 'other'
+[other 84ca9e8] message (no editor)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+Already on 'main'
+ok 15 - with hook and editor (merge)
+
+expecting success of 7505.16 'with hook (rebase -i)': 
+		test_when_finished "\
+			git rebase --abort
+			git checkout -f main
+			git branch -D tmp" &&
+		git checkout -b tmp rebase-me &&
+		GIT_SEQUENCE_EDITOR="cp rebase-todo" &&
+		GIT_EDITOR="\"$FAKE_EDITOR\"" &&
+		(
+			export GIT_SEQUENCE_EDITOR GIT_EDITOR &&
+			test_must_fail git rebase -i $mode b &&
+			echo x >a &&
+			git add a &&
+			test_must_fail git rebase --continue &&
+			echo x >b &&
+			git add b &&
+			git commit &&
+			git rebase --continue &&
+			echo y >a &&
+			git add a &&
+			git commit &&
+			git rebase --continue &&
+			echo y >b &&
+			git add b &&
+			git rebase --continue
+		) &&
+		git log --pretty=%s -g -n18 HEAD@{1} >actual &&
+		test_cmp "$TEST_DIRECTORY/t7505/expected-rebase${mode:--i}" actual
+	
+Switched to a new branch 'tmp'
+Rebasing (1/15)
Auto-merging a
+CONFLICT (add/add): Merge conflict in a
+error: could not apply 0391433... rebase-a
+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 advice.mergeConflict false"
+Could not apply 0391433... 
+[detached HEAD f04682c] message [pick rebase-a]
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/15)
Auto-merging b
+CONFLICT (add/add): Merge conflict in b
+error: could not apply 21e9a5f... rebase-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 advice.mergeConflict false"
+Could not apply 21e9a5f... 
+[detached HEAD fc19041] merge [pick rebase-b]
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (3/15)
Rebasing (4/15)
Rebasing (5/15)
Rebasing (6/15)
Rebasing (7/15)
[detached HEAD 597943f] message [squash rebase-5]
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (8/15)
[detached HEAD 62a0091] HEAD [reword rebase-6]
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (9/15)
Rebasing (10/15)
Rebasing (11/15)
[detached HEAD 332415b] message [fixup rebase-9]
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (12/15)
Stopped at 58c3130...  
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+[detached HEAD 6a3b292] default [edit rebase-10]
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (13/15)
Rebasing (14/15)
[detached HEAD c6c0051] message [squash rebase-12]
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:30:13 2005 -0700
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Rebasing (15/15)
Stopped at 8f82bdf...  
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+[detached HEAD 8bcb406] message [edit rebase-13]
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:30:13 2005 -0700
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Successfully rebased and updated refs/heads/tmp.
+fatal: no rebase in progress
+Switched to branch 'main'
+Deleted branch tmp (was 8bcb406).
+ok 16 - with hook (rebase -i)
+
+expecting success of 7505.17 'with hook (cherry-pick)': 
+	test_when_finished "git checkout -f main" &&
+	git checkout -B other b &&
+	git cherry-pick rebase-1 &&
+	test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
+
+Switched to and reset branch 'other'
+[other 755fb84] message (no editor)
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c
+Switched to branch 'main'
+ok 17 - with hook (cherry-pick)
+
+expecting success of 7505.18 'with hook and editor (cherry-pick)': 
+	test_when_finished "git checkout -f main" &&
+	git checkout -B other b &&
+	git cherry-pick -e rebase-1 &&
+	test "$(git log -1 --pretty=format:%s)" = merge
+
+Switched to and reset branch 'other'
+[other 611267b] merge
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c
+Switched to branch 'main'
+ok 18 - with hook and editor (cherry-pick)
+
+expecting success of 7505.19 'setup: commit-msg hook that always fails': 
+	test_hook --setup --clobber prepare-commit-msg <<-\EOF
+	exit 1
+	EOF
+
+ok 19 - setup: commit-msg hook that always fails
+
+expecting success of 7505.20 'with failing hook': 
+
+	test_when_finished "git checkout -f main" &&
+	head=$(git rev-parse HEAD) &&
+	echo "more" >> file &&
+	git add file &&
+	test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
+
+
+Already on 'main'
+ok 20 - with failing hook
+
+expecting success of 7505.21 'with failing hook (--no-verify)': 
+
+	test_when_finished "git checkout -f main" &&
+	head=$(git rev-parse HEAD) &&
+	echo "more" >> file &&
+	git add file &&
+	test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head
+
+
+Already on 'main'
+ok 21 - with failing hook (--no-verify)
+
+expecting success of 7505.22 'with failing hook (merge)': 
+
+	test_when_finished "git checkout -f main" &&
+	git checkout -B other HEAD@{1} &&
+	echo "more" >> file &&
+	git add file &&
+	test_hook --remove prepare-commit-msg &&
+	git commit -m other &&
+	test_hook --setup prepare-commit-msg <<-\EOF &&
+	exit 1
+	EOF
+	git checkout - &&
+	test_must_fail git merge --no-ff other
+
+
+Switched to and reset branch 'other'
+[other 056e6c0] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+Not committing merge; use 'git commit' to complete the merge.
+Already on 'main'
+ok 22 - with failing hook (merge)
+
+expecting success of 7505.23 'with failing hook (cherry-pick)': 
+	test_when_finished "git checkout -f main" &&
+	git checkout -B other b &&
+	test_must_fail git cherry-pick rebase-1 2>actual &&
+	test $(grep -c prepare-commit-msg actual) = 1
+
+Switched to and reset branch 'other'
+Switched to branch 'main'
+warning: cancelling a cherry picking in progress
+ok 23 - with failing hook (cherry-pick)
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7515-status-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7515-status-symlinks/.git/
+expecting success of 7515.1 'setup': 
+	echo .gitignore >.gitignore &&
+	echo actual >>.gitignore &&
+	echo expect >>.gitignore &&
+	mkdir dir &&
+	echo x >dir/file1 &&
+	echo y >dir/file2 &&
+	git add dir &&
+	git commit -m initial &&
+	git tag initial
+
+[master (root-commit) 1048606] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 dir/file1
+ create mode 100644 dir/file2
+ok 1 - setup
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 7515.2 'symlink to a directory': 
+	test_when_finished "rm symlink" &&
+	ln -s dir symlink &&
+	echo "?? symlink" >expect &&
+	git status --porcelain >actual &&
+	test_cmp expect actual
+
+ok 2 - symlink to a directory
+
+expecting success of 7515.3 'symlink replacing a directory': 
+	test_when_finished "rm -rf copy && git reset --hard initial" &&
+	mkdir copy &&
+	cp dir/file1 copy/file1 &&
+	echo "changed in copy" >copy/file2 &&
+	git add copy &&
+	git commit -m second &&
+	rm -rf copy &&
+	ln -s dir copy &&
+	echo " D copy/file1" >expect &&
+	echo " D copy/file2" >>expect &&
+	echo "?? copy" >>expect &&
+	git status --porcelain >actual &&
+	test_cmp expect actual
+
+[master a9708ba] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 copy/file1
+ create mode 100644 copy/file2
+HEAD is now at 1048606 initial
+ok 3 - symlink replacing a directory
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7516-commit-races.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7516-commit-races/.git/
+expecting success of 7516.1 'race to create orphan commit': 
+	write_script hare-editor <<-\EOF &&
+	git commit --allow-empty -m hare
+	EOF
+	test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e &&
+	git show -s --pretty=format:%s >subject &&
+	grep hare subject &&
+	git show -s --pretty=format:%P >out &&
+	test_must_be_empty out
+
+[master (root-commit) ba9015c] hare
+ Author: A U Thor <author@example.com>
+fatal: cannot lock ref 'HEAD': reference already exists
+hare
+ok 1 - race to create orphan commit
+
+expecting success of 7516.2 'race to create non-orphan commit': 
+	write_script airplane-editor <<-\EOF &&
+	git commit --allow-empty -m airplane
+	EOF
+	git checkout --orphan branch &&
+	git commit --allow-empty -m base &&
+	git rev-parse HEAD >base &&
+	test_must_fail env EDITOR=./airplane-editor git commit --allow-empty -m ship -e &&
+	git show -s --pretty=format:%s >subject &&
+	grep airplane subject &&
+	git rev-parse HEAD^ >parent &&
+	test_cmp base parent
+
+Switched to a new branch 'branch'
+[branch (root-commit) a4b5938] base
+ Author: A U Thor <author@example.com>
+[branch 7381062] airplane
+ Author: A U Thor <author@example.com>
+fatal: cannot lock ref 'HEAD': is at 7381062986c200ad56d9a48e7a49719e434604a0 but expected a4b5938bdb0638bd7b0fd149a017cda4db88b551
+airplane
+ok 2 - race to create non-orphan commit
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7506-status-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7506-status-submodule/.git/
 expecting success of 7506.1 'setup': 
@@ -476216,116 +476310,6 @@
 1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7516-commit-races.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7516-commit-races/.git/
-expecting success of 7516.1 'race to create orphan commit': 
-	write_script hare-editor <<-\EOF &&
-	git commit --allow-empty -m hare
-	EOF
-	test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e &&
-	git show -s --pretty=format:%s >subject &&
-	grep hare subject &&
-	git show -s --pretty=format:%P >out &&
-	test_must_be_empty out
-
-[master (root-commit) ba9015c] hare
- Author: A U Thor <author@example.com>
-fatal: cannot lock ref 'HEAD': reference already exists
-hare
-ok 1 - race to create orphan commit
-
-expecting success of 7516.2 'race to create non-orphan commit': 
-	write_script airplane-editor <<-\EOF &&
-	git commit --allow-empty -m airplane
-	EOF
-	git checkout --orphan branch &&
-	git commit --allow-empty -m base &&
-	git rev-parse HEAD >base &&
-	test_must_fail env EDITOR=./airplane-editor git commit --allow-empty -m ship -e &&
-	git show -s --pretty=format:%s >subject &&
-	grep airplane subject &&
-	git rev-parse HEAD^ >parent &&
-	test_cmp base parent
-
-Switched to a new branch 'branch'
-[branch (root-commit) a4b5938] base
- Author: A U Thor <author@example.com>
-[branch 7381062] airplane
- Author: A U Thor <author@example.com>
-fatal: cannot lock ref 'HEAD': is at 7381062986c200ad56d9a48e7a49719e434604a0 but expected a4b5938bdb0638bd7b0fd149a017cda4db88b551
-airplane
-ok 2 - race to create non-orphan commit
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7515-status-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7515-status-symlinks/.git/
-expecting success of 7515.1 'setup': 
-	echo .gitignore >.gitignore &&
-	echo actual >>.gitignore &&
-	echo expect >>.gitignore &&
-	mkdir dir &&
-	echo x >dir/file1 &&
-	echo y >dir/file2 &&
-	git add dir &&
-	git commit -m initial &&
-	git tag initial
-
-[master (root-commit) 1048606] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 dir/file1
- create mode 100644 dir/file2
-ok 1 - setup
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 7515.2 'symlink to a directory': 
-	test_when_finished "rm symlink" &&
-	ln -s dir symlink &&
-	echo "?? symlink" >expect &&
-	git status --porcelain >actual &&
-	test_cmp expect actual
-
-ok 2 - symlink to a directory
-
-expecting success of 7515.3 'symlink replacing a directory': 
-	test_when_finished "rm -rf copy && git reset --hard initial" &&
-	mkdir copy &&
-	cp dir/file1 copy/file1 &&
-	echo "changed in copy" >copy/file2 &&
-	git add copy &&
-	git commit -m second &&
-	rm -rf copy &&
-	ln -s dir copy &&
-	echo " D copy/file1" >expect &&
-	echo " D copy/file2" >>expect &&
-	echo "?? copy" >>expect &&
-	git status --porcelain >actual &&
-	test_cmp expect actual
-
-[master a9708ba] second
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 copy/file1
- create mode 100644 copy/file2
-HEAD is now at 1048606 initial
-ok 3 - symlink replacing a directory
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7518-ident-corner-cases.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7518-ident-corner-cases/.git/
 expecting success of 7518.1 'empty name and missing email': 
@@ -476438,45 +476422,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7524-commit-summary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-
-[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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7517-per-repo-email.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7517-per-repo-email/.git/
 expecting success of 7517.1 'setup a likely user.useConfigOnly use case': 
@@ -476731,6 +476676,45 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7524-commit-summary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+
+[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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7521-ignored-mode.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7521-ignored-mode/.git/
 expecting success of 7521.1 'setup initial commit and ignore file': 
@@ -477048,21 +477032,6 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7527-builtin-fsmonitor.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7525-status-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7525-status-rename/.git/
 expecting success of 7525.1 'setup': 
@@ -477221,6 +477190,161 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7527-builtin-fsmonitor.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7528-signed-commit-ssh.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7526-commit-pathspec-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7526-commit-pathspec-file/.git/
 expecting success of 7526.1 'setup': 
@@ -477434,146 +477558,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7528-signed-commit-ssh.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7603-merge-reduce-heads.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7603-merge-reduce-heads/.git/
 expecting success of 7603.1 'setup': 
@@ -479768,585 +479752,6 @@
 1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7604-merge-custom-message.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7604-merge-custom-message/.git/
-expecting success of 7604.1 'setup': 
-	echo c0 >c0.c &&
-	git add c0.c &&
-	git commit -m c0 &&
-	git tag c0 &&
-	echo c1 >c1.c &&
-	git add c1.c &&
-	git commit -m c1 &&
-	git tag c1 &&
-	git reset --hard c0 &&
-	echo c2 >c2.c &&
-	git add c2.c &&
-	git commit -m c2 &&
-	git tag c2 &&
-	create_merge_msgs
-
-[master (root-commit) e4f5a3c] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 429abf0] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at e4f5a3c c0
-[master 028ea41] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 1 - setup
-
-expecting success of 7604.2 'merge c2 with a custom message': 
-	git reset --hard c1 &&
-	git merge -m "$(cat exp.subject)" c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp exp.subject actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 2 - merge c2 with a custom message
-
-expecting success of 7604.3 'merge --log appends to custom message': 
-	git reset --hard c1 &&
-	git merge --log -m "$(cat exp.subject)" c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp exp.log actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 3 - merge --log appends to custom message
-
-expecting success of 7604.4 'prepare file with comment line and trailing newlines': 
-	printf "%s" "$mesg_with_comment_and_newlines" >expect
-
-ok 4 - prepare file with comment line and trailing newlines
-
-expecting success of 7604.5 'cleanup commit messages (verbatim option)': 
-	git reset --hard c1 &&
-	git merge --cleanup=verbatim -F expect c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 5 - cleanup commit messages (verbatim option)
-
-expecting success of 7604.6 'cleanup commit messages (whitespace option)': 
-	git reset --hard c1 &&
-	test_write_lines "" "# text" "" >text &&
-	echo "# text" >expect &&
-	git merge --cleanup=whitespace -F text c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 6 - cleanup commit messages (whitespace option)
-
-expecting success of 7604.7 'cleanup merge messages (scissors option)': 
-	git reset --hard c1 &&
-	cat >text <<-\EOF &&
-
-	# to be kept
-
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	# ------------------------ >8 ------------------------
-	to be removed
-	# ------------------------ >8 ------------------------
-	to be removed, too
-	EOF
-
-	cat >expect <<-\EOF &&
-	# to be kept
-
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	EOF
-	git merge --cleanup=scissors -e -F text c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 7 - cleanup merge messages (scissors option)
-
-expecting success of 7604.8 'cleanup commit messages (strip option)': 
-	git reset --hard c1 &&
-	test_write_lines "" "# text" "sample" "" >text &&
-	echo sample >expect &&
-	git merge --cleanup=strip -F text c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 8 - cleanup commit messages (strip option)
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7605-merge-resolve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7602-merge-octopus-many.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
-
-[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
-
-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
-
-expecting success of 7602.3 'merge output uses pretty names': 
-	git reset --hard c1 &&
-	git merge c2 c3 c4 >actual &&
-	test_cmp expected actual
-
-HEAD is now at 429abf0 c1
-ok 3 - merge output uses pretty names
-
-expecting success of 7602.4 'merge reduces irrelevant remote heads': 
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		mv expected expected.tmp &&
-		sed s/recursive/ort/ expected.tmp >expected &&
-		rm expected.tmp
-	fi &&
-	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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7003-filter-branch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7003-filter-branch/.git/
 expecting success of 7003.1 'setup': 
@@ -480410,7 +479815,7 @@
 expecting success of 7003.2 'rewrite identically': 
 	git filter-branch branch
 
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (5/9) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (5/9) (1 seconds passed, remaining 0 predicted)    
 WARNING: Ref 'refs/heads/branch' is unchanged
 ok 2 - rewrite identically
 
@@ -480483,9 +479888,9 @@
 	git filter-branch -f --tree-filter "mv D.t doh || :" HEAD
 
 
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/9) (1 seconds passed, remaining 2 predicted)    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 e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    mv: cannot stat 'D.t': No such file or directory
+
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (2 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (2 seconds passed, remaining 1 predicted)    mv: cannot stat 'D.t': No such file or directory
+
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (5/9) (2 seconds passed, remaining 1 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (8/9) (3 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (8/9) (3 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 9 - rewrite, renaming a specific file
 
@@ -480501,10 +479906,10 @@
 	git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
 
 
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (2/9) (1 seconds passed, remaining 3 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 28e3b83a5f2c2b87fa77b674df1529da9f4a66b4 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite b0e1a7fc77c44f8710a324ce0cdaa5f0e3f41f41 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 284d35b48d5c7cf8f258f9d25690e5c3c38bb8c3 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 8d77ce9a0f051fe4d6b311099cfc061fc8fa238e (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3623c2fd76a1257ce6cfb529b64aa3e51d851ffd (5/9) (1 seconds passed, remaining 0 predicted)    
+
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) (1 seconds passed, remaining 1 predicted)    
Rewrite b0e1a7fc77c44f8710a324ce0cdaa5f0e3f41f41 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/9) (1 seconds passed, remaining 1 predicted)    mv: cannot stat 'dir': No such file or directory
+
Rewrite 284d35b48d5c7cf8f258f9d25690e5c3c38bb8c3 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 8d77ce9a0f051fe4d6b311099cfc061fc8fa238e (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 3623c2fd76a1257ce6cfb529b64aa3e51d851ffd (9/9) (2 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 11 - rewrite, renaming a specific directory
 
@@ -480522,7 +479927,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) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/9) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/9) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 Saving rewrite state to state
 ok 13 - populate --state-branch
@@ -480589,7 +479994,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 100644 A.t
-
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (2/2) (0 seconds passed, remaining 0 predicted)    
+
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (1/2) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (1/2) (1 seconds passed, remaining 1 predicted)    
 Ref 'refs/heads/sub' was rewritten
 Ref 'refs/heads/sub-earlier' was rewritten
 ok 17 - filter subdirectory only
@@ -480651,7 +480056,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) (1 seconds passed, remaining 7 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (2/16) (1 seconds passed, remaining 7 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (2/16) (1 seconds passed, remaining 7 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/16) (4 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (15/16) (4 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/directorymoved' was rewritten
 ok 20 - use index-filter to move into a subdirectory
 
@@ -480682,7 +480087,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) (1 seconds passed, remaining 1 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (6/17) (1 seconds passed, remaining 1 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) (1 seconds passed, remaining 1 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (6/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (13/17) (2 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (13/17) (2 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/17) (2 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (13/17) (2 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (13/17) (2 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/preserved-author' was rewritten
 ok 22 - author information is preserved
 
@@ -480707,7 +480112,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) (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) (2 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (15/18) (2 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (15/18) (2 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (15/18) (2 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) (1 seconds passed, remaining 3 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (4/18) (1 seconds passed, remaining 3 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (4/18) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/18) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/18) (1 seconds passed, remaining 3 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/18) (2 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (9/18) (2 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/18) (2 seconds passed, remaining 2 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/18) (2 seconds passed, remaining 2 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/18) (2 seconds passed, remaining 2 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (14/18) (3 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (14/18) (3 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (14/18) (3 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (14/18) (3 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (14/18) (3 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/removed-author' was rewritten
 ok 23 - remove a certain author's commits
 
@@ -480730,7 +480135,7 @@
 		git commit-tree \"\$@\";" main~2..main &&
 	git rev-parse --verify main
 
-
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (2/2) (0 seconds passed, remaining 0 predicted)    
+
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (2/2) (1 seconds passed, remaining 0 predicted)    
 WARNING: Ref 'refs/heads/main' is unchanged
 0261af146239dd954a19d76ae2a417dd3af8b791
 ok 25 - "map" works in commit filter
@@ -480798,7 +480203,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 foo/bar
-
Rewrite f7eadb255c93eb12be4926fbb2a3995c413564ba (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite ee48524f38405c7e2028be80dc8acfbef4c75c13 (2/3) (1 seconds passed, remaining 0 predicted)    
Rewrite 14fe8c608ef61b8d11aca607ef6c7a4e24b8b32d (2/3) (1 seconds passed, remaining 0 predicted)    
+
Rewrite f7eadb255c93eb12be4926fbb2a3995c413564ba (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite ee48524f38405c7e2028be80dc8acfbef4c75c13 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 14fe8c608ef61b8d11aca607ef6c7a4e24b8b32d (3/3) (0 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/main' was rewritten
 ok 27 - Subdirectory filter with disappearing trees
 
@@ -480809,7 +480214,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) (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
 T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
 ok 28 - Tag name filtering retains tag message
@@ -480823,7 +480228,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) (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
 S -> S (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
 gpg signature stripped from tag object 5e10caf7d74c3ace8930aa1d5449d4d0ceb2e9e0
@@ -480966,7 +480371,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) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (11/14) (2 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) (1 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/14) (2 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/14) (2 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/14) (2 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (9/14) (2 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (9/14) (2 seconds passed, remaining 1 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (14/14) (3 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 33 - Prune empty commits
 
@@ -480989,7 +480394,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) (1 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (4/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (4/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/15) (2 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/15) (2 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/15) (2 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (9/15) (2 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (9/15) (2 seconds passed, remaining 1 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (14/15) (3 seconds passed, remaining 0 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (14/15) (3 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/15) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/15) (1 seconds passed, remaining 6 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (2/15) (1 seconds passed, remaining 6 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/15) (1 seconds passed, remaining 6 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/15) (3 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/15) (3 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/15) (3 seconds passed, remaining 1 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (11/15) (3 seconds passed, remaining 1 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (15/15) (4 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 34 - prune empty collapsed merges
 
@@ -481002,7 +480407,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) (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 5b6cb848f343668f1f75c3258a59d12c1680d67f (7/14) (1 seconds passed, remaining 1 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) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite 5b6cb848f343668f1f75c3258a59d12c1680d67f (11/14) (2 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 35 - prune empty works even without index/tree filters
 
@@ -481014,7 +480419,7 @@
 	git branch -D testing &&
 	test_cmp expect actual
 
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (5/9) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (5/9) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/testing' was rewritten
 Deleted branch testing (was 00fc75b).
 ok 36 - --prune-empty is able to prune root commit
@@ -481063,7 +480468,7 @@
 [main b2d4813] change-foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-
Rewrite 7d219912875c3b539add35fdb1e3d70e5572ca7c (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite b2d4813d3ebe523582008cb287d933f8c14917be (2/2) (0 seconds passed, remaining 0 predicted)    
+
Rewrite 7d219912875c3b539add35fdb1e3d70e5572ca7c (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite b2d4813d3ebe523582008cb287d933f8c14917be (2/2) (1 seconds passed, remaining 0 predicted)    
 WARNING: Ref 'refs/heads/moved-foo' is unchanged
 Ref 'refs/heads/moved-bar' was rewritten
 Ref 'refs/heads/main' was rewritten
@@ -481160,7 +480565,7 @@
 					 } || :" HEAD &&
 	test $orig_head != $(git show-ref --hash --head HEAD)
 
-
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 7ee7826f2ddc0917bac6e5d913670b41b852d566 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 6407ca086f8a4bb75b4232261f845171f0aac7f3 (3/4) (1 seconds passed, remaining 0 predicted)    
Rewrite ba52dcad4030ad8ce04cc67fcea57fab8625822c (3/4) (1 seconds passed, remaining 0 predicted)    
+
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 7ee7826f2ddc0917bac6e5d913670b41b852d566 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 6407ca086f8a4bb75b4232261f845171f0aac7f3 (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite ba52dcad4030ad8ce04cc67fcea57fab8625822c (4/4) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/main' was rewritten
 warning: unable to rmdir 'submod': Directory not empty
 ok 41 - rewrite submodule with another content
@@ -481295,6 +480700,154 @@
 1..48
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7604-merge-custom-message.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7604-merge-custom-message/.git/
+expecting success of 7604.1 'setup': 
+	echo c0 >c0.c &&
+	git add c0.c &&
+	git commit -m c0 &&
+	git tag c0 &&
+	echo c1 >c1.c &&
+	git add c1.c &&
+	git commit -m c1 &&
+	git tag c1 &&
+	git reset --hard c0 &&
+	echo c2 >c2.c &&
+	git add c2.c &&
+	git commit -m c2 &&
+	git tag c2 &&
+	create_merge_msgs
+
+[master (root-commit) e4f5a3c] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 429abf0] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at e4f5a3c c0
+[master 028ea41] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 1 - setup
+
+expecting success of 7604.2 'merge c2 with a custom message': 
+	git reset --hard c1 &&
+	git merge -m "$(cat exp.subject)" c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp exp.subject actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 2 - merge c2 with a custom message
+
+expecting success of 7604.3 'merge --log appends to custom message': 
+	git reset --hard c1 &&
+	git merge --log -m "$(cat exp.subject)" c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp exp.log actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 3 - merge --log appends to custom message
+
+expecting success of 7604.4 'prepare file with comment line and trailing newlines': 
+	printf "%s" "$mesg_with_comment_and_newlines" >expect
+
+ok 4 - prepare file with comment line and trailing newlines
+
+expecting success of 7604.5 'cleanup commit messages (verbatim option)': 
+	git reset --hard c1 &&
+	git merge --cleanup=verbatim -F expect c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 5 - cleanup commit messages (verbatim option)
+
+expecting success of 7604.6 'cleanup commit messages (whitespace option)': 
+	git reset --hard c1 &&
+	test_write_lines "" "# text" "" >text &&
+	echo "# text" >expect &&
+	git merge --cleanup=whitespace -F text c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 6 - cleanup commit messages (whitespace option)
+
+expecting success of 7604.7 'cleanup merge messages (scissors option)': 
+	git reset --hard c1 &&
+	cat >text <<-\EOF &&
+
+	# to be kept
+
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	# ------------------------ >8 ------------------------
+	to be removed
+	# ------------------------ >8 ------------------------
+	to be removed, too
+	EOF
+
+	cat >expect <<-\EOF &&
+	# to be kept
+
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	EOF
+	git merge --cleanup=scissors -e -F text c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 7 - cleanup merge messages (scissors option)
+
+expecting success of 7604.8 'cleanup commit messages (strip option)': 
+	git reset --hard c1 &&
+	test_write_lines "" "# text" "sample" "" >text &&
+	echo sample >expect &&
+	git merge --cleanup=strip -F text c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 8 - cleanup commit messages (strip option)
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7519-status-fsmonitor.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7519-status-fsmonitor/.git/
 expecting success of 7519.1 'incompatible bare repo': 
@@ -481375,7 +480928,7 @@
 
 fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
 fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fsmonitor last update 1772611363062908280
+fsmonitor last update 1738203409516509242
 ok 6 - update-index --fsmonitor" adds the fsmonitor extension
 
 expecting success of 7519.7 'update-index --no-fsmonitor" removes the fsmonitor extension': 
@@ -481778,7 +481331,7 @@
 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 7519.30 'ignore .git changes when invalidating UNTR': 
@@ -482050,10 +481603,10 @@
 done.
 Cloning into 'sparse'...
 done.
-{"event":"region_enter","sid":"20260304T080253.566662Z-H8d819085-P000cd07d","thread":"main","time":"2026-03-04T08:02:53.567425Z","file":"fsmonitor.c","line":175,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20260304T080253.566662Z-H8d819085-P000cd07d","thread":"main","time":"2026-03-04T08:02:53.579148Z","file":"fsmonitor.c","line":185,"t_rel":0.011722,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_enter","sid":"20260304T080253.786000Z-H8d819085-P000cd165","thread":"main","time":"2026-03-04T08:02:53.786736Z","file":"fsmonitor.c","line":175,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20260304T080253.786000Z-H8d819085-P000cd165","thread":"main","time":"2026-03-04T08:02:53.797111Z","file":"fsmonitor.c","line":185,"t_rel":0.010373,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20250130T021702.022066Z-H5c947e1c-P001fa527","thread":"main","time":"2025-01-30T02:17:02.022822Z","file":"fsmonitor.c","line":175,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20250130T021702.022066Z-H5c947e1c-P001fa527","thread":"main","time":"2025-01-30T02:17:02.038073Z","file":"fsmonitor.c","line":185,"t_rel":0.015250,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20250130T021702.278018Z-H5c947e1c-P001fa5ea","thread":"main","time":"2025-01-30T02:17:02.278743Z","file":"fsmonitor.c","line":175,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20250130T021702.278018Z-H5c947e1c-P001fa5ea","thread":"main","time":"2025-01-30T02:17:02.299450Z","file":"fsmonitor.c","line":185,"t_rel":0.020706,"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(-)
@@ -482070,20 +481623,128 @@
 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 advice.sparseIndexExpanded false"
-{"event":"region_enter","sid":"20260304T080254.165916Z-H8d819085-P000cd342","thread":"main","time":"2026-03-04T08:02:54.189474Z","file":"sparse-index.c","line":369,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260304T080254.165916Z-H8d819085-P000cd342","thread":"main","time":"2026-03-04T08:02:54.226179Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260304T080254.165916Z-H8d819085-P000cd342","thread":"main","time":"2026-03-04T08:02:54.190049Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000574,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260304T080254.165916Z-H8d819085-P000cd342","thread":"main","time":"2026-03-04T08:02:54.226225Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000045,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260304T080254.165916Z-H8d819085-P000cd342","thread":"main","time":"2026-03-04T08:02:54.166657Z","file":"fsmonitor.c","line":175,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_enter","sid":"20260304T080254.165916Z-H8d819085-P000cd342","thread":"main","time":"2026-03-04T08:02:54.205183Z","file":"fsmonitor.c","line":175,"nesting":2,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20260304T080254.165916Z-H8d819085-P000cd342","thread":"main","time":"2026-03-04T08:02:54.188893Z","file":"fsmonitor.c","line":185,"t_rel":0.022236,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20260304T080254.165916Z-H8d819085-P000cd342","thread":"main","time":"2026-03-04T08:02:54.225082Z","file":"fsmonitor.c","line":185,"t_rel":0.019899,"nesting":2,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20250130T021702.975158Z-H5c947e1c-P001fa7f5","thread":"main","time":"2025-01-30T02:17:02.993340Z","file":"sparse-index.c","line":369,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250130T021702.975158Z-H5c947e1c-P001fa7f5","thread":"main","time":"2025-01-30T02:17:03.040566Z","file":"sparse-index.c","line":369,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250130T021702.975158Z-H5c947e1c-P001fa7f5","thread":"main","time":"2025-01-30T02:17:02.993852Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000513,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250130T021702.975158Z-H5c947e1c-P001fa7f5","thread":"main","time":"2025-01-30T02:17:03.040640Z","file":"sparse-index.c","line":451,"repo":1,"t_rel":0.000074,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250130T021702.975158Z-H5c947e1c-P001fa7f5","thread":"main","time":"2025-01-30T02:17:02.975928Z","file":"fsmonitor.c","line":175,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20250130T021702.975158Z-H5c947e1c-P001fa7f5","thread":"main","time":"2025-01-30T02:17:03.019563Z","file":"fsmonitor.c","line":175,"nesting":2,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20250130T021702.975158Z-H5c947e1c-P001fa7f5","thread":"main","time":"2025-01-30T02:17:02.993170Z","file":"fsmonitor.c","line":185,"t_rel":0.017241,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20250130T021702.975158Z-H5c947e1c-P001fa7f5","thread":"main","time":"2025-01-30T02:17:03.039492Z","file":"fsmonitor.c","line":185,"t_rel":0.019928,"nesting":2,"category":"fsm_hook","label":"query"}
 ok 33 - status succeeds with sparse index
 
 # passed all 33 test(s)
 1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7605-merge-resolve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7606-merge-custom.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7606-merge-custom/.git/
 expecting success of 7606.1 'set up custom strategy': 
@@ -482158,8 +481819,8 @@
  c2.c | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
  create mode 100644 c2.c
---- head.old	2026-03-04 08:02:53.967352315 +0000
-+++ head.new	2026-03-04 08:02:54.071352315 +0000
+--- head.old	2025-01-30 02:17:04.342015876 +0000
++++ head.new	2025-01-30 02:17:04.514016907 +0000
 @@ -1 +1 @@
 -7b51d7cdbd54b8c470d864639e1136d88ce718ef
 +5127482d58f03334905cdbe3564c8d092aa56dbe
@@ -482198,8 +481859,8 @@
  2 files changed, 1 insertion(+), 1 deletion(-)
  delete mode 100644 c1.c
  create mode 100644 c3.c
---- head.old	2026-03-04 08:02:54.243352315 +0000
-+++ head.new	2026-03-04 08:02:54.371352315 +0000
+--- head.old	2025-01-30 02:17:04.786018539 +0000
++++ head.new	2025-01-30 02:17:04.950019522 +0000
 @@ -1 +1 @@
 -7b51d7cdbd54b8c470d864639e1136d88ce718ef
 +f5f2abda42595469639ae786a37808202e35dcf0
@@ -482258,90 +481919,327 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7612-merge-verify-signatures.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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)
+*** t7602-merge-octopus-many.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
 
-ok 8 # skip merge commit with untrusted signature with verification and low minTrustLevel (missing GPG)
+[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
 
-ok 9 # skip merge commit with untrusted signature with merge.verifySignatures=true (missing GPG)
+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
 
-ok 10 # skip merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel (missing GPG)
+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
 
-ok 11 # skip merge signed commit with verification (missing GPG)
+expecting success of 7602.3 'merge output uses pretty names': 
+	git reset --hard c1 &&
+	git merge c2 c3 c4 >actual &&
+	test_cmp expected actual
 
-ok 12 # skip merge signed commit with merge.verifySignatures=true (missing GPG)
+HEAD is now at 429abf0 c1
+ok 3 - merge output uses pretty names
 
-ok 13 # skip merge commit with bad signature without verification (missing GPG)
+expecting success of 7602.4 'merge reduces irrelevant remote heads': 
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		mv expected expected.tmp &&
+		sed s/recursive/ort/ expected.tmp >expected &&
+		rm expected.tmp
+	fi &&
+	GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
+	test_cmp expected actual
 
-ok 14 # skip merge commit with bad signature with merge.verifySignatures=false (missing GPG)
+ok 4 - merge reduces irrelevant remote heads
 
-ok 15 # skip merge commit with bad signature with merge.verifySignatures=true and --no-verify-signatures (missing GPG)
+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
 
-ok 16 # skip merge unsigned commit into unborn branch (missing GPG)
+HEAD is now at e4f5a3c c0
+ok 5 - merge fast-forward output uses pretty names
 
-# passed all 16 test(s)
-1..16
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7608-merge-messages.sh ***
@@ -482484,6 +482382,173 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7612-merge-verify-signatures.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7614-merge-signoff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7611-merge-abort.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7611-merge-abort/.git/
 expecting success of 7611.1 'setup': 
@@ -482743,87 +482808,6 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7614-merge-signoff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7615-diff-algo-with-mergy-operations.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7615-diff-algo-with-mergy-operations/.git/
 expecting success of 7615.1 'setup': 
@@ -482922,48 +482906,21 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 ok 6 - cherry-pick c2 to c1 with recursive merge strategy succeeds with -Xdiff-algorithm=histogram
 
-expecting success of 7615.7 'cherry-pick c2 to c1 with recursive merge strategy succeeds with diff.algorithm = histogram': 
-	git reset --hard c1 &&
-	git config diff.algorithm histogram &&
-	git cherry-pick --strategy recursive c2
-
-HEAD is now at 4e619f0 c1
-Auto-merging file.c
-[master 07529b3] c2
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 7 - cherry-pick c2 to c1 with recursive merge strategy succeeds with diff.algorithm = histogram
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7702-repack-cyclic-alternate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7702-repack-cyclic-alternate/.git/
-expecting success of 7702.1 'setup': 
-	GIT_OBJECT_DIRECTORY=.git//../.git/objects &&
-	export GIT_OBJECT_DIRECTORY &&
-	touch a &&
-	git add a &&
-	git commit -m 1 &&
-	git repack -adl &&
-	echo "$(pwd)"/.git/objects/../objects >.git/objects/info/alternates
-
-[master (root-commit) 9b08673] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-ok 1 - setup
-
-expecting success of 7702.2 're-packing repository with itsself as alternate': 
-	git repack -adl &&
-	git fsck
+expecting success of 7615.7 'cherry-pick c2 to c1 with recursive merge strategy succeeds with diff.algorithm = histogram': 
+	git reset --hard c1 &&
+	git config diff.algorithm histogram &&
+	git cherry-pick --strategy recursive c2
 
-ok 2 - re-packing repository with itsself as alternate
+HEAD is now at 4e619f0 c1
+Auto-merging file.c
+[master 07529b3] c2
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 7 - cherry-pick c2 to c1 with recursive merge strategy succeeds with diff.algorithm = histogram
 
-# passed all 2 test(s)
-1..2
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7513-interpret-trailers.sh ***
@@ -485080,6 +485037,33 @@
 1..99
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7702-repack-cyclic-alternate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7702-repack-cyclic-alternate/.git/
+expecting success of 7702.1 'setup': 
+	GIT_OBJECT_DIRECTORY=.git//../.git/objects &&
+	export GIT_OBJECT_DIRECTORY &&
+	touch a &&
+	git add a &&
+	git commit -m 1 &&
+	git repack -adl &&
+	echo "$(pwd)"/.git/objects/../objects >.git/objects/info/alternates
+
+[master (root-commit) 9b08673] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ok 1 - setup
+
+expecting success of 7702.2 're-packing repository with itsself as alternate': 
+	git repack -adl &&
+	git fsck
+
+ok 2 - re-packing repository with itsself as alternate
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7601-merge-pull-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7601-merge-pull-config/.git/
 expecting success of 7601.1 'setup': 
@@ -486252,1923 +486236,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7600-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/.git/
-expecting success of 7600.1 'setup': 
-	git add file &&
-	test_tick &&
-	git commit -m "commit 0" &&
-	git tag c0 &&
-	c0=$(git rev-parse HEAD) &&
-	cp file.1 file &&
-	git add file &&
-	cp file.1 other &&
-	git add other &&
-	test_tick &&
-	git commit -m "commit 1" &&
-	git tag c1 &&
-	c1=$(git rev-parse HEAD) &&
-	git reset --hard "$c0" &&
-	cp file.5 file &&
-	git add file &&
-	test_tick &&
-	git commit -m "commit 2" &&
-	git tag c2 &&
-	c2=$(git rev-parse HEAD) &&
-	git reset --hard "$c0" &&
-	cp file.9y file &&
-	git add file &&
-	test_tick &&
-	git commit -m "commit 7" &&
-	git tag c7 &&
-	git reset --hard "$c0" &&
-	cp file.9 file &&
-	git add file &&
-	test_tick &&
-	git commit -m "commit 3" &&
-	git tag c3 &&
-	c3=$(git rev-parse HEAD) &&
-	git reset --hard "$c0" &&
-	create_merge_msgs
-
-[main (root-commit) 88012a2] commit 0
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file
-[main dc8b979] commit 1
- Author: A U Thor <author@example.com>
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-HEAD is now at 88012a2 commit 0
-[main ac59201] commit 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 88012a2 commit 0
-[main 63f6a48] commit 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 88012a2 commit 0
-[main 8976188] commit 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 88012a2 commit 0
-ok 1 - setup
-
-expecting success of 7600.2 'test option parsing': 
-	test_must_fail git merge -$ c1 &&
-	test_must_fail git merge --no-such c1 &&
-	test_must_fail git merge -s foobar c1 &&
-	test_must_fail git merge -s=foobar c1 &&
-	test_must_fail git merge -m &&
-	test_must_fail git merge --abort foobar &&
-	test_must_fail git merge --abort --quiet &&
-	test_must_fail git merge --continue foobar &&
-	test_must_fail git merge --continue --quiet &&
-	test_must_fail git merge
-
-error: unknown switch `$'
-usage: git merge [<options>] [<commit>...]
-   or: git merge --abort
-   or: git merge --continue
-
-    -n                    do not show a diffstat at the end of the merge
-    --[no-]stat           show a diffstat at the end of the merge
-    --[no-]summary        (synonym to --stat)
-    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
-    --[no-]squash         create a single commit instead of doing a merge
-    --[no-]commit         perform a commit if the merge succeeds (default)
-    -e, --[no-]edit       edit message before committing
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    --[no-]ff             allow fast-forward (default)
-    --ff-only             abort if fast-forward is not possible
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --[no-]verify-signatures
-                          verify that the named commit has a valid GPG signature
-    -s, --[no-]strategy <strategy>
-                          merge strategy to use
-    -X, --[no-]strategy-option <option=value>
-                          option for selected merge strategy
-    -m, --[no-]message <message>
-                          merge commit message (for a non-fast-forward merge)
-    -F, --file <path>     read message from file
-    --[no-]into-name <name>
-                          use <name> instead of the real target
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]abort          abort the current in-progress merge
-    --[no-]quit           --abort but leave index and working tree alone
-    --[no-]continue       continue the current in-progress merge
-    --[no-]allow-unrelated-histories
-                          allow merging unrelated histories
-    --[no-]progress       force progress reporting
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG sign commit
-    --[no-]autostash      automatically stash/stash pop before and after
-    --[no-]overwrite-ignore
-                          update ignored files (default)
-    --[no-]signoff        add a Signed-off-by trailer
-    --no-verify           bypass pre-merge-commit and commit-msg hooks
-    --verify              opposite of --no-verify
-
-error: unknown option `no-such'
-usage: git merge [<options>] [<commit>...]
-   or: git merge --abort
-   or: git merge --continue
-
-    -n                    do not show a diffstat at the end of the merge
-    --[no-]stat           show a diffstat at the end of the merge
-    --[no-]summary        (synonym to --stat)
-    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
-    --[no-]squash         create a single commit instead of doing a merge
-    --[no-]commit         perform a commit if the merge succeeds (default)
-    -e, --[no-]edit       edit message before committing
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    --[no-]ff             allow fast-forward (default)
-    --ff-only             abort if fast-forward is not possible
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --[no-]verify-signatures
-                          verify that the named commit has a valid GPG signature
-    -s, --[no-]strategy <strategy>
-                          merge strategy to use
-    -X, --[no-]strategy-option <option=value>
-                          option for selected merge strategy
-    -m, --[no-]message <message>
-                          merge commit message (for a non-fast-forward merge)
-    -F, --file <path>     read message from file
-    --[no-]into-name <name>
-                          use <name> instead of the real target
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]abort          abort the current in-progress merge
-    --[no-]quit           --abort but leave index and working tree alone
-    --[no-]continue       continue the current in-progress merge
-    --[no-]allow-unrelated-histories
-                          allow merging unrelated histories
-    --[no-]progress       force progress reporting
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG sign commit
-    --[no-]autostash      automatically stash/stash pop before and after
-    --[no-]overwrite-ignore
-                          update ignored files (default)
-    --[no-]signoff        add a Signed-off-by trailer
-    --no-verify           bypass pre-merge-commit and commit-msg hooks
-    --verify              opposite of --no-verify
-
-Could not find merge strategy 'foobar'.
-Available strategies are: octopus ours recursive resolve subtree.
-Could not find merge strategy '=foobar'.
-Available strategies are: octopus ours recursive resolve subtree.
-error: switch `m' requires a value
-fatal: --abort expects no arguments
-
-usage: git merge [<options>] [<commit>...]
-   or: git merge --abort
-   or: git merge --continue
-
-    -n                    do not show a diffstat at the end of the merge
-    --[no-]stat           show a diffstat at the end of the merge
-    --[no-]summary        (synonym to --stat)
-    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
-    --[no-]squash         create a single commit instead of doing a merge
-    --[no-]commit         perform a commit if the merge succeeds (default)
-    -e, --[no-]edit       edit message before committing
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    --[no-]ff             allow fast-forward (default)
-    --ff-only             abort if fast-forward is not possible
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --[no-]verify-signatures
-                          verify that the named commit has a valid GPG signature
-    -s, --[no-]strategy <strategy>
-                          merge strategy to use
-    -X, --[no-]strategy-option <option=value>
-                          option for selected merge strategy
-    -m, --[no-]message <message>
-                          merge commit message (for a non-fast-forward merge)
-    -F, --file <path>     read message from file
-    --[no-]into-name <name>
-                          use <name> instead of the real target
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]abort          abort the current in-progress merge
-    --[no-]quit           --abort but leave index and working tree alone
-    --[no-]continue       continue the current in-progress merge
-    --[no-]allow-unrelated-histories
-                          allow merging unrelated histories
-    --[no-]progress       force progress reporting
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG sign commit
-    --[no-]autostash      automatically stash/stash pop before and after
-    --[no-]overwrite-ignore
-                          update ignored files (default)
-    --[no-]signoff        add a Signed-off-by trailer
-    --no-verify           bypass pre-merge-commit and commit-msg hooks
-    --verify              opposite of --no-verify
-
-fatal: --abort expects no arguments
-
-usage: git merge [<options>] [<commit>...]
-   or: git merge --abort
-   or: git merge --continue
-
-    -n                    do not show a diffstat at the end of the merge
-    --[no-]stat           show a diffstat at the end of the merge
-    --[no-]summary        (synonym to --stat)
-    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
-    --[no-]squash         create a single commit instead of doing a merge
-    --[no-]commit         perform a commit if the merge succeeds (default)
-    -e, --[no-]edit       edit message before committing
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    --[no-]ff             allow fast-forward (default)
-    --ff-only             abort if fast-forward is not possible
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --[no-]verify-signatures
-                          verify that the named commit has a valid GPG signature
-    -s, --[no-]strategy <strategy>
-                          merge strategy to use
-    -X, --[no-]strategy-option <option=value>
-                          option for selected merge strategy
-    -m, --[no-]message <message>
-                          merge commit message (for a non-fast-forward merge)
-    -F, --file <path>     read message from file
-    --[no-]into-name <name>
-                          use <name> instead of the real target
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]abort          abort the current in-progress merge
-    --[no-]quit           --abort but leave index and working tree alone
-    --[no-]continue       continue the current in-progress merge
-    --[no-]allow-unrelated-histories
-                          allow merging unrelated histories
-    --[no-]progress       force progress reporting
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG sign commit
-    --[no-]autostash      automatically stash/stash pop before and after
-    --[no-]overwrite-ignore
-                          update ignored files (default)
-    --[no-]signoff        add a Signed-off-by trailer
-    --no-verify           bypass pre-merge-commit and commit-msg hooks
-    --verify              opposite of --no-verify
-
-fatal: --continue expects no arguments
-
-usage: git merge [<options>] [<commit>...]
-   or: git merge --abort
-   or: git merge --continue
-
-    -n                    do not show a diffstat at the end of the merge
-    --[no-]stat           show a diffstat at the end of the merge
-    --[no-]summary        (synonym to --stat)
-    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
-    --[no-]squash         create a single commit instead of doing a merge
-    --[no-]commit         perform a commit if the merge succeeds (default)
-    -e, --[no-]edit       edit message before committing
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    --[no-]ff             allow fast-forward (default)
-    --ff-only             abort if fast-forward is not possible
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --[no-]verify-signatures
-                          verify that the named commit has a valid GPG signature
-    -s, --[no-]strategy <strategy>
-                          merge strategy to use
-    -X, --[no-]strategy-option <option=value>
-                          option for selected merge strategy
-    -m, --[no-]message <message>
-                          merge commit message (for a non-fast-forward merge)
-    -F, --file <path>     read message from file
-    --[no-]into-name <name>
-                          use <name> instead of the real target
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]abort          abort the current in-progress merge
-    --[no-]quit           --abort but leave index and working tree alone
-    --[no-]continue       continue the current in-progress merge
-    --[no-]allow-unrelated-histories
-                          allow merging unrelated histories
-    --[no-]progress       force progress reporting
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG sign commit
-    --[no-]autostash      automatically stash/stash pop before and after
-    --[no-]overwrite-ignore
-                          update ignored files (default)
-    --[no-]signoff        add a Signed-off-by trailer
-    --no-verify           bypass pre-merge-commit and commit-msg hooks
-    --verify              opposite of --no-verify
-
-fatal: --continue expects no arguments
-
-usage: git merge [<options>] [<commit>...]
-   or: git merge --abort
-   or: git merge --continue
-
-    -n                    do not show a diffstat at the end of the merge
-    --[no-]stat           show a diffstat at the end of the merge
-    --[no-]summary        (synonym to --stat)
-    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
-    --[no-]squash         create a single commit instead of doing a merge
-    --[no-]commit         perform a commit if the merge succeeds (default)
-    -e, --[no-]edit       edit message before committing
-    --[no-]cleanup <mode> how to strip spaces and #comments from message
-    --[no-]ff             allow fast-forward (default)
-    --ff-only             abort if fast-forward is not possible
-    --[no-]rerere-autoupdate
-                          update the index with reused conflict resolution if possible
-    --[no-]verify-signatures
-                          verify that the named commit has a valid GPG signature
-    -s, --[no-]strategy <strategy>
-                          merge strategy to use
-    -X, --[no-]strategy-option <option=value>
-                          option for selected merge strategy
-    -m, --[no-]message <message>
-                          merge commit message (for a non-fast-forward merge)
-    -F, --file <path>     read message from file
-    --[no-]into-name <name>
-                          use <name> instead of the real target
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]abort          abort the current in-progress merge
-    --[no-]quit           --abort but leave index and working tree alone
-    --[no-]continue       continue the current in-progress merge
-    --[no-]allow-unrelated-histories
-                          allow merging unrelated histories
-    --[no-]progress       force progress reporting
-    -S, --[no-]gpg-sign[=<key-id>]
-                          GPG sign commit
-    --[no-]autostash      automatically stash/stash pop before and after
-    --[no-]overwrite-ignore
-                          update ignored files (default)
-    --[no-]signoff        add a Signed-off-by trailer
-    --no-verify           bypass pre-merge-commit and commit-msg hooks
-    --verify              opposite of --no-verify
-
-fatal: No remote for the current branch.
-ok 2 - test option parsing
-
-expecting success of 7600.3 'merge -h with invalid index': 
-	mkdir broken &&
-	(
-		cd broken &&
-		git init &&
-		>.git/index &&
-		test_expect_code 129 git merge -h 2>usage
-	) &&
-	test_grep "[Uu]sage: git merge" broken/usage
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/broken/.git/
-usage: git merge [<options>] [<commit>...]
-ok 3 - merge -h with invalid index
-
-expecting success of 7600.4 'reject non-strategy with a git-merge-foo name': 
-	test_must_fail git merge -s index c1
-
-Could not find merge strategy 'index'.
-Available strategies are: octopus ours recursive resolve subtree.
-ok 4 - reject non-strategy with a git-merge-foo name
-
-expecting success of 7600.5 'merge c0 with c1': 
-	echo "OBJID HEAD@{0}: merge c1: Fast-forward" >reflog.expected &&
-
-	git reset --hard c0 &&
-	git merge c1 &&
-	verify_merge file result.1 &&
-	verify_head "$c1" &&
-
-	git reflog -1 >reflog.actual &&
-	sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
-	test_cmp reflog.expected reflog.fuzzy
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-ok 5 - merge c0 with c1
-
-expecting success of 7600.6 'merge c0 with c1 with --ff-only': 
-	git reset --hard c0 &&
-	git merge --ff-only c1 &&
-	git merge --ff-only HEAD c0 c1 &&
-	verify_merge file result.1 &&
-	verify_head "$c1"
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-Already up to date.
-ok 6 - merge c0 with c1 with --ff-only
-
-expecting success of 7600.7 'merge from unborn branch': 
-	git checkout -f main &&
-	test_might_fail git branch -D kid &&
-
-	echo "OBJID HEAD@{0}: initial pull" >reflog.expected &&
-
-	git checkout --orphan kid &&
-	test_when_finished "git checkout -f main" &&
-	git rm -fr . &&
-	test_tick &&
-	git merge --ff-only c1 &&
-	verify_merge file result.1 &&
-	verify_head "$c1" &&
-
-	git reflog -1 >reflog.actual &&
-	sed "s/$_x05[0-9a-f][0-9a-f]/OBJID/g" reflog.actual >reflog.fuzzy &&
-	test_cmp reflog.expected reflog.fuzzy
-
-Already on 'main'
-error: branch 'kid' not found
-Switched to a new branch 'kid'
-rm 'file'
-rm 'other'
-Switched to branch 'main'
-ok 7 - merge from unborn branch
-
-expecting success of 7600.8 'merge c1 with c2': 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge c2 &&
-	verify_merge file result.1-5 msg.1-5 &&
-	verify_parents $c1 $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 8 - merge c1 with c2
-
-expecting success of 7600.9 'merge c1 with c2 when index.lock exists': 
-	test_when_finished rm .git/index.lock &&
-	git reset --hard c1 &&
-	>.git/index.lock &&
-	test_must_fail git merge c2 &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_path_is_missing .git/MERGE_MODE &&
-	test_path_is_missing .git/MERGE_MSG
-
-HEAD is now at dc8b979 commit 1
-fatal: Unable to write index.
-ok 9 - merge c1 with c2 when index.lock exists
-
-expecting success of 7600.10 'merge --squash c3 with c7': 
-	git reset --hard c3 &&
-	test_must_fail git merge --squash c7 &&
-	cat result.9z >file &&
-	git commit --no-edit -a &&
-
-	cat >expect <<-EOF &&
-	Squashed commit of the following:
-
-	$(git show -s c7)
-
-	# Conflicts:
-	#	file
-	EOF
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 8976188 commit 3
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Squash commit -- not updating HEAD
-Automatic merge failed; fix conflicts and then commit the result.
-[main 211f9ce] Squashed commit of the following:
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 10 - merge --squash c3 with c7
-
-expecting success of 7600.11 'merge --squash --autostash conflict does not attempt to apply autostash': 
-	git reset --hard c3 &&
-	>unrelated &&
-	git add unrelated &&
-	test_must_fail git merge --squash c7 --autostash >out 2>err &&
-	! grep "Applying autostash resulted in conflicts." err &&
-	grep "When finished, apply stashed changes with \`git stash pop\`" out
-
-HEAD is now at 8976188 commit 3
-When finished, apply stashed changes with `git stash pop`
-ok 11 - merge --squash --autostash conflict does not attempt to apply autostash
-
-expecting success of 7600.12 'merge c3 with c7 with commit.cleanup = scissors': 
-	git config commit.cleanup scissors &&
-	git reset --hard c3 &&
-	test_must_fail git merge c7 &&
-	cat result.9z >file &&
-	git commit --no-edit -a &&
-
-	cat >expect <<-\EOF &&
-	Merge tag 'c7'
-
-	# ------------------------ >8 ------------------------
-	# Do not modify or remove the line above.
-	# Everything below it will be ignored.
-	#
-	# Conflicts:
-	#	file
-	EOF
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 8976188 commit 3
-Autostash exists; creating a new stash entry.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-[main e024249] Merge tag 'c7'
- Author: A U Thor <author@example.com>
-ok 12 - merge c3 with c7 with commit.cleanup = scissors
-
-expecting success of 7600.13 'merge c3 with c7 with --squash commit.cleanup = scissors': 
-	git config commit.cleanup scissors &&
-	git reset --hard c3 &&
-	test_must_fail git merge --squash c7 &&
-	cat result.9z >file &&
-	git commit --no-edit -a &&
-
-	cat >expect <<-EOF &&
-	Squashed commit of the following:
-
-	$(git show -s c7)
-
-	# ------------------------ >8 ------------------------
-	# Do not modify or remove the line above.
-	# Everything below it will be ignored.
-	#
-	# Conflicts:
-	#	file
-	EOF
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 8976188 commit 3
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Squash commit -- not updating HEAD
-Automatic merge failed; fix conflicts and then commit the result.
-[main cb3ece3] Squashed commit of the following:
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - merge c3 with c7 with --squash commit.cleanup = scissors
-
-expecting success of 7600.14 'merge c1 with c2 and c3': 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge c2 c3 &&
-	verify_merge file result.1-5-9 msg.1-5-9 &&
-	verify_parents $c1 $c2 $c3
-
-HEAD is now at dc8b979 commit 1
-Trying simple merge with c2
-Simple merge did not work, trying automatic merge.
-Auto-merging file
-Trying simple merge with c3
-Simple merge did not work, trying automatic merge.
-Auto-merging file
-Merge made by the 'octopus' strategy.
- file | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-fatal: Needed a single revision
-ok 14 - merge c1 with c2 and c3
-
-expecting success of 7600.15 'merges with --ff-only': 
-	git reset --hard c1 &&
-	test_tick &&
-	test_must_fail git merge --ff-only c2 &&
-	test_must_fail git merge --ff-only c3 &&
-	test_must_fail git merge --ff-only c2 c3 &&
-	git reset --hard c0 &&
-	git merge c3 &&
-	verify_head $c3
-
-HEAD is now at dc8b979 commit 1
-hint: Diverging branches can't be fast-forwarded, you need to either:
-hint:
-hint: 	git merge --no-ff
-hint:
-hint: or:
-hint:
-hint: 	git rebase
-hint:
-hint: Disable this message with "git config advice.diverging false"
-fatal: Not possible to fast-forward, aborting.
-hint: Diverging branches can't be fast-forwarded, you need to either:
-hint:
-hint: 	git merge --no-ff
-hint:
-hint: or:
-hint:
-hint: 	git rebase
-hint:
-hint: Disable this message with "git config advice.diverging false"
-fatal: Not possible to fast-forward, aborting.
-hint: Diverging branches can't be fast-forwarded, you need to either:
-hint:
-hint: 	git merge --no-ff
-hint:
-hint: or:
-hint:
-hint: 	git rebase
-hint:
-hint: Disable this message with "git config advice.diverging false"
-fatal: Not possible to fast-forward, aborting.
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..8976188
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 15 - merges with --ff-only
-
-expecting success of 7600.16 'merges with merge.ff=only': 
-	git reset --hard c1 &&
-	test_tick &&
-	test_config merge.ff "only" &&
-	test_must_fail git merge c2 &&
-	test_must_fail git merge c3 &&
-	test_must_fail git merge c2 c3 &&
-	git reset --hard c0 &&
-	git merge c3 &&
-	verify_head $c3
-
-HEAD is now at dc8b979 commit 1
-hint: Diverging branches can't be fast-forwarded, you need to either:
-hint:
-hint: 	git merge --no-ff
-hint:
-hint: or:
-hint:
-hint: 	git rebase
-hint:
-hint: Disable this message with "git config advice.diverging false"
-fatal: Not possible to fast-forward, aborting.
-hint: Diverging branches can't be fast-forwarded, you need to either:
-hint:
-hint: 	git merge --no-ff
-hint:
-hint: or:
-hint:
-hint: 	git rebase
-hint:
-hint: Disable this message with "git config advice.diverging false"
-fatal: Not possible to fast-forward, aborting.
-hint: Diverging branches can't be fast-forwarded, you need to either:
-hint:
-hint: 	git merge --no-ff
-hint:
-hint: or:
-hint:
-hint: 	git rebase
-hint:
-hint: Disable this message with "git config advice.diverging false"
-fatal: Not possible to fast-forward, aborting.
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..8976188
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 16 - merges with merge.ff=only
-
-expecting success of 7600.17 'merge c0 with c1 (no-commit)': 
-	git reset --hard c0 &&
-	git merge --no-commit c1 &&
-	verify_merge file result.1 &&
-	verify_head $c1
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-ok 17 - merge c0 with c1 (no-commit)
-
-expecting success of 7600.18 'merge c1 with c2 (no-commit)': 
-	git reset --hard c1 &&
-	git merge --no-commit c2 &&
-	verify_merge file result.1-5 &&
-	verify_head $c1 &&
-	verify_mergeheads $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-ok 18 - merge c1 with c2 (no-commit)
-
-expecting success of 7600.19 'merge c1 with c2 and c3 (no-commit)': 
-	git reset --hard c1 &&
-	git merge --no-commit c2 c3 &&
-	verify_merge file result.1-5-9 &&
-	verify_head $c1 &&
-	verify_mergeheads $c2 $c3
-
-HEAD is now at dc8b979 commit 1
-Trying simple merge with c2
-Simple merge did not work, trying automatic merge.
-Auto-merging file
-Trying simple merge with c3
-Simple merge did not work, trying automatic merge.
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-ok 19 - merge c1 with c2 and c3 (no-commit)
-
-expecting success of 7600.20 'merge c0 with c1 (squash)': 
-	git reset --hard c0 &&
-	git merge --squash c1 &&
-	verify_merge file result.1 &&
-	verify_head $c0 &&
-	verify_no_mergehead &&
-	test_cmp squash.1 .git/SQUASH_MSG
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Fast-forward
-Squash commit -- not updating HEAD
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-ok 20 - merge c0 with c1 (squash)
-
-expecting success of 7600.21 'merge c0 with c1 (squash, ff-only)': 
-	git reset --hard c0 &&
-	git merge --squash --ff-only c1 &&
-	verify_merge file result.1 &&
-	verify_head $c0 &&
-	verify_no_mergehead &&
-	test_cmp squash.1 .git/SQUASH_MSG
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Fast-forward
-Squash commit -- not updating HEAD
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-ok 21 - merge c0 with c1 (squash, ff-only)
-
-expecting success of 7600.22 'merge c1 with c2 (squash)': 
-	git reset --hard c1 &&
-	git merge --squash c2 &&
-	verify_merge file result.1-5 &&
-	verify_head $c1 &&
-	verify_no_mergehead &&
-	test_cmp squash.1-5 .git/SQUASH_MSG
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-Squash commit -- not updating HEAD
-ok 22 - merge c1 with c2 (squash)
-
-expecting success of 7600.23 'unsuccessful merge of c1 with c2 (squash, ff-only)': 
-	git reset --hard c1 &&
-	test_must_fail git merge --squash --ff-only c2
-
-HEAD is now at dc8b979 commit 1
-hint: Diverging branches can't be fast-forwarded, you need to either:
-hint:
-hint: 	git merge --no-ff
-hint:
-hint: or:
-hint:
-hint: 	git rebase
-hint:
-hint: Disable this message with "git config advice.diverging false"
-fatal: Not possible to fast-forward, aborting.
-ok 23 - unsuccessful merge of c1 with c2 (squash, ff-only)
-
-expecting success of 7600.24 'merge c1 with c2 and c3 (squash)': 
-	git reset --hard c1 &&
-	git merge --squash c2 c3 &&
-	verify_merge file result.1-5-9 &&
-	verify_head $c1 &&
-	verify_no_mergehead &&
-	test_cmp squash.1-5-9 .git/SQUASH_MSG
-
-HEAD is now at dc8b979 commit 1
-Trying simple merge with c2
-Simple merge did not work, trying automatic merge.
-Auto-merging file
-Trying simple merge with c3
-Simple merge did not work, trying automatic merge.
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-Squash commit -- not updating HEAD
-ok 24 - merge c1 with c2 and c3 (squash)
-
-expecting success of 7600.25 'merge c1 with c2 (no-commit in config)': 
-	git reset --hard c1 &&
-	test_config branch.main.mergeoptions "--no-commit" &&
-	git merge c2 &&
-	verify_merge file result.1-5 &&
-	verify_head $c1 &&
-	verify_mergeheads $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-ok 25 - merge c1 with c2 (no-commit in config)
-
-expecting success of 7600.26 'merge c1 with c2 (log in config)': 
-	git reset --hard c1 &&
-	git merge --log c2 &&
-	git show -s --pretty=tformat:%s%n%b >expect &&
-
-	test_config branch.main.mergeoptions "--log" &&
-	git reset --hard c1 &&
-	git merge c2 &&
-	git show -s --pretty=tformat:%s%n%b >actual &&
-
-	test_cmp expect actual
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 26 - merge c1 with c2 (log in config)
-
-expecting success of 7600.27 'merge c1 with c2 (log in config gets overridden)': 
-	git reset --hard c1 &&
-	git merge c2 &&
-	git show -s --pretty=tformat:%s%n%b >expect &&
-
-	test_config branch.main.mergeoptions "--no-log" &&
-	test_config merge.log "true" &&
-	git reset --hard c1 &&
-	git merge c2 &&
-	git show -s --pretty=tformat:%s%n%b >actual &&
-
-	test_cmp expect actual
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 27 - merge c1 with c2 (log in config gets overridden)
-
-expecting success of 7600.28 'merge c1 with c2 (squash in config)': 
-	git reset --hard c1 &&
-	test_config branch.main.mergeoptions "--squash" &&
-	git merge c2 &&
-	verify_merge file result.1-5 &&
-	verify_head $c1 &&
-	verify_no_mergehead &&
-	test_cmp squash.1-5 .git/SQUASH_MSG
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-Squash commit -- not updating HEAD
-ok 28 - merge c1 with c2 (squash in config)
-
-expecting success of 7600.29 'override config option -n with --summary': 
-	git reset --hard c1 &&
-	test_config branch.main.mergeoptions "-n" &&
-	test_tick &&
-	git merge --summary c2 >diffstat.txt &&
-	verify_merge file result.1-5 msg.1-5 &&
-	verify_parents $c1 $c2 &&
-	if ! grep "^ file |  *2 +-$" diffstat.txt
-	then
-		echo "[OOPS] diffstat was not generated with --summary"
-		false
-	fi
-
-HEAD is now at dc8b979 commit 1
-fatal: Needed a single revision
- file | 2 +-
-ok 29 - override config option -n with --summary
-
-expecting success of 7600.30 'override config option -n with --stat': 
-	git reset --hard c1 &&
-	test_config branch.main.mergeoptions "-n" &&
-	test_tick &&
-	git merge --stat c2 >diffstat.txt &&
-	verify_merge file result.1-5 msg.1-5 &&
-	verify_parents $c1 $c2 &&
-	if ! grep "^ file |  *2 +-$" diffstat.txt
-	then
-		echo "[OOPS] diffstat was not generated with --stat"
-		false
-	fi
-
-HEAD is now at dc8b979 commit 1
-fatal: Needed a single revision
- file | 2 +-
-ok 30 - override config option -n with --stat
-
-expecting success of 7600.31 'override config option --stat': 
-	git reset --hard c1 &&
-	test_config branch.main.mergeoptions "--stat" &&
-	test_tick &&
-	git merge -n c2 >diffstat.txt &&
-	verify_merge file result.1-5 msg.1-5 &&
-	verify_parents $c1 $c2 &&
-	if grep "^ file |  *2 +-$" diffstat.txt
-	then
-		echo "[OOPS] diffstat was generated"
-		false
-	fi
-
-HEAD is now at dc8b979 commit 1
-fatal: Needed a single revision
-ok 31 - override config option --stat
-
-expecting success of 7600.32 'merge c1 with c2 (override --no-commit)': 
-	git reset --hard c1 &&
-	test_config branch.main.mergeoptions "--no-commit" &&
-	test_tick &&
-	git merge --commit c2 &&
-	verify_merge file result.1-5 msg.1-5 &&
-	verify_parents $c1 $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 32 - merge c1 with c2 (override --no-commit)
-
-expecting success of 7600.33 'merge c1 with c2 (override --squash)': 
-	git reset --hard c1 &&
-	test_config branch.main.mergeoptions "--squash" &&
-	test_tick &&
-	git merge --no-squash c2 &&
-	verify_merge file result.1-5 msg.1-5 &&
-	verify_parents $c1 $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 33 - merge c1 with c2 (override --squash)
-
-expecting success of 7600.34 'merge c0 with c1 (no-ff)': 
-	git reset --hard c0 &&
-	test_tick &&
-	git merge --no-ff c1 &&
-	verify_merge file result.1 &&
-	verify_parents $c0 $c1
-
-HEAD is now at 88012a2 commit 0
-Merge made by the 'ort' strategy.
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-fatal: Needed a single revision
-ok 34 - merge c0 with c1 (no-ff)
-
-expecting success of 7600.35 'merge c0 with c1 (merge.ff=false)': 
-	git reset --hard c0 &&
-	test_config merge.ff "false" &&
-	test_tick &&
-	git merge c1 &&
-	verify_merge file result.1 &&
-	verify_parents $c0 $c1
-
-HEAD is now at 88012a2 commit 0
-Merge made by the 'ort' strategy.
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-fatal: Needed a single revision
-ok 35 - merge c0 with c1 (merge.ff=false)
-
-expecting success of 7600.36 'combine branch.main.mergeoptions with merge.ff': 
-	git reset --hard c0 &&
-	test_config branch.main.mergeoptions "--ff" &&
-	test_config merge.ff "false" &&
-	test_tick &&
-	git merge c1 &&
-	verify_merge file result.1 &&
-	verify_parents "$c0"
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-fatal: Needed a single revision
-ok 36 - combine branch.main.mergeoptions with merge.ff
-
-expecting success of 7600.37 'tolerate unknown values for merge.ff': 
-	git reset --hard c0 &&
-	test_config merge.ff "something-new" &&
-	test_tick &&
-	git merge c1 2>message &&
-	verify_head "$c1" &&
-	test_must_be_empty message
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-ok 37 - tolerate unknown values for merge.ff
-
-expecting success of 7600.38 'combining --squash and --no-ff is refused': 
-	git reset --hard c0 &&
-	test_must_fail git merge --squash --no-ff c1 &&
-	test_must_fail git merge --no-ff --squash c1
-
-HEAD is now at 88012a2 commit 0
-fatal: options '--squash' and '--no-ff.' cannot be used together
-fatal: options '--squash' and '--no-ff.' cannot be used together
-ok 38 - combining --squash and --no-ff is refused
-
-expecting success of 7600.39 'combining --squash and --commit is refused': 
-	git reset --hard c0 &&
-	test_must_fail git merge --squash --commit c1 &&
-	test_must_fail git merge --commit --squash c1
-
-HEAD is now at 88012a2 commit 0
-fatal: options '--squash' and '--commit.' cannot be used together
-fatal: options '--squash' and '--commit.' cannot be used together
-ok 39 - combining --squash and --commit is refused
-
-expecting success of 7600.40 'option --ff-only overwrites --no-ff': 
-	git merge --no-ff --ff-only c1 &&
-	test_must_fail git merge --no-ff --ff-only c2
-
-Updating 88012a2..dc8b979
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-hint: Diverging branches can't be fast-forwarded, you need to either:
-hint:
-hint: 	git merge --no-ff
-hint:
-hint: or:
-hint:
-hint: 	git rebase
-hint:
-hint: Disable this message with "git config advice.diverging false"
-fatal: Not possible to fast-forward, aborting.
-ok 40 - option --ff-only overwrites --no-ff
-
-expecting success of 7600.41 'option --no-ff overrides merge.ff=only config': 
-	git reset --hard c0 &&
-	test_config merge.ff only &&
-	git merge --no-ff c1
-
-HEAD is now at 88012a2 commit 0
-Merge made by the 'ort' strategy.
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-ok 41 - option --no-ff overrides merge.ff=only config
-
-expecting success of 7600.42 'merge c0 with c1 (ff overrides no-ff)': 
-	git reset --hard c0 &&
-	test_config branch.main.mergeoptions "--no-ff" &&
-	git merge --ff c1 &&
-	verify_merge file result.1 &&
-	verify_head $c1
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-ok 42 - merge c0 with c1 (ff overrides no-ff)
-
-expecting success of 7600.43 'merge log message': 
-	git reset --hard c0 &&
-	git merge --no-log c2 &&
-	git show -s --pretty=format:%b HEAD >msg.act &&
-	test_must_be_empty msg.act &&
-
-	git reset --hard c0 &&
-	test_config branch.main.mergeoptions "--no-ff" &&
-	git merge --no-log c2 &&
-	git show -s --pretty=format:%b HEAD >msg.act &&
-	test_must_be_empty msg.act &&
-
-	git merge --log c3 &&
-	git show -s --pretty=format:%b HEAD >msg.act &&
-	test_cmp msg.log msg.act &&
-
-	git reset --hard HEAD^ &&
-	test_config merge.log "yes" &&
-	git merge c3 &&
-	git show -s --pretty=format:%b HEAD >msg.act &&
-	test_cmp msg.log msg.act
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..ac59201
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 88012a2 commit 0
-Merge made by the 'ort' strategy.
- file | 2 +-
- 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(-)
-HEAD is now at 8e82df1 Merge tag 'c2'
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 43 - merge log message
-
-expecting success of 7600.44 'merge c1 with c0, c2, c0, and c1': 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge c0 c2 c0 c1 &&
-	verify_merge file result.1-5 &&
-	verify_parents $c1 $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 44 - merge c1 with c0, c2, c0, and c1
-
-expecting success of 7600.45 'merge c1 with c0, c2, c0, and c1': 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge c0 c2 c0 c1 &&
-	verify_merge file result.1-5 &&
-	verify_parents $c1 $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 45 - merge c1 with c0, c2, c0, and c1
-
-expecting success of 7600.46 'merge c1 with c1 and c2': 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge c1 c2 &&
-	verify_merge file result.1-5 &&
-	verify_parents $c1 $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 46 - merge c1 with c1 and c2
-
-expecting success of 7600.47 'merge fast-forward in a dirty tree': 
-	git reset --hard c0 &&
-	mv file file1 &&
-	cat file1 >file &&
-	rm -f file1 &&
-	git merge c2
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..ac59201
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 47 - merge fast-forward in a dirty tree
-
-expecting success of 7600.48 'in-index merge': 
-	git reset --hard c0 &&
-	git merge --no-ff -s resolve c1 >out &&
-	test_grep "Wonderful." out &&
-	verify_parents $c0 $c1
-
-HEAD is now at 88012a2 commit 0
-Wonderful.
-fatal: Needed a single revision
-ok 48 - in-index merge
-
-expecting success of 7600.49 'refresh the index before merging': 
-	git reset --hard c1 &&
-	cp file file.n && mv -f file.n file &&
-	git merge c3
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 49 - refresh the index before merging
-
-expecting success of 7600.50 'merge with --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git merge --autostash c2 2>err &&
-	test_grep "Applied autostash." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-5 merge-result &&
-	test_cmp result.1-5-9 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Applied autostash.
-ok 50 - merge with --autostash
-
-expecting success of 7600.51 'merge with merge.autoStash': 
-	test_config merge.autoStash true &&
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git merge c2 2>err &&
-	test_grep "Applied autostash." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-5 merge-result &&
-	test_cmp result.1-5-9 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Applied autostash.
-ok 51 - merge with merge.autoStash
-
-expecting success of 7600.52 'fast-forward merge with --autostash': 
-	git reset --hard c0 &&
-	git merge-file file file.orig file.5 &&
-	git merge --autostash c1 2>err &&
-	test_grep "Applied autostash." err &&
-	test_cmp result.1-5 file
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Created autostash: 4d9e18f
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-Applied autostash.
-ok 52 - fast-forward merge with --autostash
-
-expecting success of 7600.53 'failed fast-forward merge with --autostash': 
-	git reset --hard c0 &&
-	git merge-file file file.orig file.5 &&
-	cp file.5 other &&
-	test_when_finished "rm other" &&
-	test_must_fail git merge --autostash c1 2>err &&
-	test_grep "Applied autostash." err &&
-	test_cmp file.5 file
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Created autostash: 4d9e18f
-Applied autostash.
-ok 53 - failed fast-forward merge with --autostash
-
-expecting success of 7600.54 'octopus merge with --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.3 &&
-	git merge --autostash c2 c3 2>err &&
-	test_grep "Applied autostash." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-5-9 merge-result &&
-	test_cmp result.1-3-5-9 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: 27fb9f9
-Trying simple merge with c2
-Simple merge did not work, trying automatic merge.
-Auto-merging file
-Trying simple merge with c3
-Simple merge did not work, trying automatic merge.
-Auto-merging file
-Merge made by the 'octopus' strategy.
- file | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Applied autostash.
-ok 54 - octopus merge with --autostash
-
-expecting success of 7600.55 'failed merge (exit 2) with --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.5 &&
-	test_must_fail git merge -s recursive --autostash c2 c3 2>err &&
-	test_grep "Applied autostash." err &&
-	test_cmp result.1-5 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: 92dee98
-Applied autostash.
-ok 55 - failed merge (exit 2) with --autostash
-
-expecting success of 7600.56 'conflicted merge with --autostash, --abort restores stash': 
-	git reset --hard c3 &&
-	cp file.1 file &&
-	test_must_fail git merge --autostash c7 &&
-	git merge --abort 2>err &&
-	test_grep "Applied autostash." err &&
-	test_cmp file.1 file
-
-HEAD is now at 8976188 commit 3
-Created autostash: e782531
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-When finished, apply stashed changes with `git stash pop`
-Applied autostash.
-ok 56 - conflicted merge with --autostash, --abort restores stash
-
-expecting success of 7600.57 'completed merge (git commit) with --no-commit and --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git diff >expect &&
-	git merge --no-commit --autostash c2 &&
-	git stash show -p MERGE_AUTOSTASH >actual &&
-	test_cmp expect actual &&
-	git commit 2>err &&
-	test_grep "Applied autostash." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-5 merge-result &&
-	test_cmp result.1-5-9 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-When finished, apply stashed changes with `git stash pop`
-[main 35e0f0d] Merge tag 'c2'
- Author: A U Thor <author@example.com>
-Applied autostash.
-ok 57 - completed merge (git commit) with --no-commit and --autostash
-
-expecting success of 7600.58 'completed merge (git merge --continue) with --no-commit and --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git diff >expect &&
-	git merge --no-commit --autostash c2 &&
-	git stash show -p MERGE_AUTOSTASH >actual &&
-	test_cmp expect actual &&
-	git merge --continue 2>err &&
-	test_grep "Applied autostash." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-5 merge-result &&
-	test_cmp result.1-5-9 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-When finished, apply stashed changes with `git stash pop`
-[main 35e0f0d] Merge tag 'c2'
- Author: A U Thor <author@example.com>
-Applied autostash.
-ok 58 - completed merge (git merge --continue) with --no-commit and --autostash
-
-expecting success of 7600.59 'aborted merge (merge --abort) with --no-commit and --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git diff >expect &&
-	git merge --no-commit --autostash c2 &&
-	git stash show -p MERGE_AUTOSTASH >actual &&
-	test_cmp expect actual &&
-	git merge --abort 2>err &&
-	test_grep "Applied autostash." err &&
-	git diff >actual &&
-	test_cmp expect actual
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-When finished, apply stashed changes with `git stash pop`
-Applied autostash.
-ok 59 - aborted merge (merge --abort) with --no-commit and --autostash
-
-expecting success of 7600.60 'aborted merge (reset --hard) with --no-commit and --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git diff >expect &&
-	git merge --no-commit --autostash c2 &&
-	git stash show -p MERGE_AUTOSTASH >actual &&
-	test_cmp expect actual &&
-	git reset --hard 2>err &&
-	test_grep "Autostash exists; creating a new stash entry." err &&
-	git diff --exit-code
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-When finished, apply stashed changes with `git stash pop`
-HEAD is now at dc8b979 commit 1
-Autostash exists; creating a new stash entry.
-ok 60 - aborted merge (reset --hard) with --no-commit and --autostash
-
-expecting success of 7600.61 'quit merge with --no-commit and --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git diff >expect &&
-	git merge --no-commit --autostash c2 &&
-	git stash show -p MERGE_AUTOSTASH >actual &&
-	test_cmp expect actual &&
-	git diff HEAD >expect &&
-	git merge --quit 2>err &&
-	test_grep "Autostash exists; creating a new stash entry." err &&
-	git diff HEAD >actual &&
-	test_cmp expect actual
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-When finished, apply stashed changes with `git stash pop`
-Autostash exists; creating a new stash entry.
-ok 61 - quit merge with --no-commit and --autostash
-
-expecting success of 7600.62 'merge with conflicted --autostash changes': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9y &&
-	git diff >expect &&
-	test_when_finished "test_might_fail git stash drop" &&
-	git merge --autostash c3 2>err &&
-	test_grep "Applying autostash resulted in conflicts." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-9 merge-result &&
-	git stash show -p >actual &&
-	test_cmp expect actual
-
-HEAD is now at dc8b979 commit 1
-Created autostash: 098cf2e
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Applying autostash resulted in conflicts.
-Dropped refs/stash@{0} (098cf2e14a1e9d2feea2a6a4a433f28c1a9b286f)
-ok 62 - merge with conflicted --autostash changes
-
-expecting success of 7600.63 'merge early part of c2': 
-	git reset --hard c3 &&
-	echo c4 >c4.c &&
-	git add c4.c &&
-	git commit -m c4 &&
-	git tag c4 &&
-	echo c5 >c5.c &&
-	git add c5.c &&
-	git commit -m c5 &&
-	git tag c5 &&
-	git reset --hard c3 &&
-	echo c6 >c6.c &&
-	git add c6.c &&
-	git commit -m c6 &&
-	git tag c6 &&
-	git branch -f c5-branch c5 &&
-	git merge c5-branch~1 &&
-	git show -s --pretty=tformat:%s HEAD >actual.branch &&
-	git reset --keep HEAD^ &&
-	git merge c5~1 &&
-	git show -s --pretty=tformat:%s HEAD >actual.tag &&
-	test_cmp expected.branch actual.branch &&
-	test_cmp expected.tag actual.tag
-
-HEAD is now at 8976188 commit 3
-[main e193602] c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.c
-[main faccb43] c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c5.c
-HEAD is now at 8976188 commit 3
-[main bfc1f93] c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c6.c
-Merge made by the 'ort' strategy.
- c4.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.c
-Merge made by the 'ort' strategy.
- c4.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.c
-ok 63 - merge early part of c2
-
-expecting success of 7600.64 'merge --no-ff --no-commit && commit': 
-	git reset --hard c0 &&
-	git merge --no-ff --no-commit c1 &&
-	EDITOR=: git commit &&
-	verify_parents $c0 $c1
-
-HEAD is now at 88012a2 commit 0
-Automatic merge went well; stopped before committing as requested
-[main 214792f] Merge tag 'c1'
- Author: A U Thor <author@example.com>
-fatal: Needed a single revision
-ok 64 - merge --no-ff --no-commit && commit
-
-expecting success of 7600.65 'amending no-ff merge commit': 
-	EDITOR=: git commit --amend &&
-	verify_parents $c0 $c1
-
-[main 214792f] Merge tag 'c1'
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:34:13 2005 -0700
-fatal: Needed a single revision
-ok 65 - amending no-ff merge commit
-
-expecting success of 7600.66 'merge --no-ff --edit': 
-	git reset --hard c0 &&
-	EDITOR=./editor git merge --no-ff --edit c1 &&
-	verify_parents $c0 $c1 &&
-	git cat-file commit HEAD >raw &&
-	grep "work done on the side branch" raw &&
-	sed "1,/^$/d" >actual raw &&
-	test_cmp expected actual
-
-HEAD is now at 88012a2 commit 0
-Merge made by the 'ort' strategy.
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-fatal: Needed a single revision
-Merge work done on the side branch c1
-ok 66 - merge --no-ff --edit
-
-expecting success of 7600.67 'merge annotated/signed tag w/o tracking': 
-	test_when_finished "rm -rf dst; git tag -d anno1" &&
-	git tag -a -m "anno c1" anno1 c1 &&
-	git init dst &&
-	git rev-parse c1 >dst/expect &&
-	(
-		# c0 fast-forwards to c1 but because this repository
-		# is not a "downstream" whose refs/tags follows along
-		# tag from the "upstream", this pull defaults to --no-ff
-		cd dst &&
-		git pull .. c0 &&
-		git pull .. anno1 &&
-		git rev-parse HEAD^2 >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/dst/.git/
-From ..
- * tag               c0         -> FETCH_HEAD
-From ..
- * tag               anno1      -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-Deleted tag 'anno1' (was 0a8cfaf)
-ok 67 - merge annotated/signed tag w/o tracking
-
-expecting success of 7600.68 'merge annotated/signed tag w/ tracking': 
-	test_when_finished "rm -rf dst; git tag -d anno1" &&
-	git tag -a -m "anno c1" anno1 c1 &&
-	git init dst &&
-	git rev-parse c1 >dst/expect &&
-	(
-		# c0 fast-forwards to c1 and because this repository
-		# is a "downstream" whose refs/tags follows along
-		# tag from the "upstream", this pull defaults to --ff
-		cd dst &&
-		git remote add origin .. &&
-		git pull origin c0 &&
-		git fetch origin &&
-		git merge anno1 &&
-		git rev-parse HEAD >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/dst/.git/
-From ..
- * tag               c0         -> FETCH_HEAD
-From ..
- * [new branch]      c5-branch  -> origin/c5-branch
- * [new branch]      kid        -> origin/kid
- * [new branch]      main       -> origin/main
- * [new tag]         anno1      -> anno1
- * [new tag]         c0         -> c0
- * [new tag]         c1         -> c1
- * [new tag]         c5         -> c5
- * [new tag]         c3         -> c3
- * [new tag]         c4         -> c4
-Updating 88012a2..dc8b979
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-Deleted tag 'anno1' (was 0a8cfaf)
-ok 68 - merge annotated/signed tag w/ tracking
-
-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 69 # skip merge --ff-only tag (missing GPG)
-
-ok 70 # skip merge --no-edit tag should skip editor (missing GPG)
-
-expecting success of 7600.71 'set up mod-256 conflict scenario': 
-	# 256 near-identical stanzas...
-	for i in $(test_seq 1 256); do
-		for j in 1 2 3 4 5; do
-			echo $i-$j || return 1
-		done
-	done >file &&
-	git add file &&
-	git commit -m base &&
-
-	# one side changes the first line of each to "main"
-	sed s/-1/-main/ file >tmp &&
-	mv tmp file &&
-	git commit -am main &&
-
-	# and the other to "side"; merging the two will
-	# yield 256 separate conflicts
-	git checkout -b side HEAD^ &&
-	sed s/-1/-side/ file >tmp &&
-	mv tmp file &&
-	git commit -am side
-
-[main 94176f0] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1280 insertions(+), 9 deletions(-)
-[main 98e62a1] main
- Author: A U Thor <author@example.com>
- 1 file changed, 256 insertions(+), 256 deletions(-)
-Switched to a new branch 'side'
-[side aee02fe] side
- Author: A U Thor <author@example.com>
- 1 file changed, 256 insertions(+), 256 deletions(-)
-ok 71 - set up mod-256 conflict scenario
-
-expecting success of 7600.72 'merge detects mod-256 conflicts (recursive)': 
-	git reset --hard &&
-	test_must_fail git merge -s recursive main
-
-HEAD is now at aee02fe side
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 72 - merge detects mod-256 conflicts (recursive)
-
-expecting success of 7600.73 'merge detects mod-256 conflicts (resolve)': 
-	git reset --hard &&
-	test_must_fail git merge -s resolve main
-
-HEAD is now at aee02fe side
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-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 73 - merge detects mod-256 conflicts (resolve)
-
-expecting success of 7600.74 'merge nothing into void': 
-	git init void &&
-	(
-		cd void &&
-		git remote add up .. &&
-		git fetch up &&
-		test_must_fail git merge FETCH_HEAD
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/void/.git/
-From ..
- * [new branch]      c5-branch  -> up/c5-branch
- * [new branch]      kid        -> up/kid
- * [new branch]      main       -> up/main
- * [new branch]      side       -> up/side
- * [new tag]         c1         -> c1
- * [new tag]         c5         -> c5
- * [new tag]         c0         -> c0
- * [new tag]         c3         -> c3
- * [new tag]         c4         -> c4
-fatal: FETCH_HEAD - not something we can merge
-ok 74 - merge nothing into void
-
-expecting success of 7600.75 'merge can be completed with --continue': 
-	git reset --hard c0 &&
-	git merge --no-ff --no-commit c1 &&
-	git merge --continue &&
-	verify_parents $c0 $c1
-
-HEAD is now at 88012a2 commit 0
-Automatic merge went well; stopped before committing as requested
-[side c2921bd] Merge tag 'c1' into side
- Author: A U Thor <author@example.com>
-fatal: Needed a single revision
-ok 75 - merge can be completed with --continue
-
-expecting success of 7600.76 'killed merge can be completed with --continue': 
-	git reset --hard c0 &&
-	! "$SHELL_PATH" -c '
-	  echo kill -TERM $$ >>.git/FAKE_EDITOR
-	  GIT_EDITOR=.git/FAKE_EDITOR
-	  export GIT_EDITOR
-	  exec git merge --no-ff --edit c1' &&
-	git merge --continue &&
-	verify_parents $c0 $c1
-
-HEAD is now at 88012a2 commit 0
-Terminated
-[side c2921bd] Merge tag 'c1' into side
- Author: A U Thor <author@example.com>
-fatal: Needed a single revision
-ok 76 - killed merge can be completed with --continue
-
-expecting success of 7600.77 'merge --quit': 
-	git init merge-quit &&
-	(
-		cd merge-quit &&
-		test_commit base &&
-		echo one >>base.t &&
-		git commit -am one &&
-		git branch one &&
-		git checkout base &&
-		echo two >>base.t &&
-		git commit -am two &&
-		test_must_fail git -c rerere.enabled=true merge one &&
-		test_path_is_file .git/MERGE_HEAD &&
-		test_path_is_file .git/MERGE_MODE &&
-		test_path_is_file .git/MERGE_MSG &&
-		git rerere status >rerere.before &&
-		git merge --quit &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		test_path_is_missing .git/MERGE_MODE &&
-		test_path_is_missing .git/MERGE_MSG &&
-		git rerere status >rerere.after &&
-		test_must_be_empty rerere.after &&
-		! test_cmp rerere.after rerere.before
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/merge-quit/.git/
-[main (root-commit) 814a92b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[main cc12456] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'base'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 814a92b base
-[detached HEAD 89504c3] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Auto-merging base.t
-CONFLICT (content): Merge conflict in base.t
-Recorded preimage for 'base.t'
-Automatic merge failed; fix conflicts and then commit the result.
---- rerere.after	2026-03-04 08:03:04.119352315 +0000
-+++ rerere.before	2026-03-04 08:03:04.111352315 +0000
-@@ -0,0 +1 @@
-+base.t
-ok 77 - merge --quit
-
-expecting success of 7600.78 'merge suggests matching remote refname': 
-	git commit --allow-empty -m not-local &&
-	git update-ref refs/remotes/origin/not-local HEAD &&
-	git reset --hard HEAD^ &&
-
-	# This is white-box testing hackery; we happen to know
-	# that reading packed refs is more picky about the memory
-	# ownership of strings we pass to for_each_ref() callbacks.
-	git pack-refs --all --prune &&
-
-	test_must_fail git merge not-local 2>stderr &&
-	grep origin/not-local stderr
-
-[side 42f3c70] not-local
- Author: A U Thor <author@example.com>
-HEAD is now at c2921bd Merge tag 'c1' into side
-	origin/not-local
-ok 78 - merge suggests matching remote refname
-
-expecting success of 7600.79 'suggested names are not ambiguous': 
-	git update-ref refs/heads/origin/not-local HEAD &&
-	test_must_fail git merge not-local 2>stderr &&
-	grep remotes/origin/not-local stderr
-
-	remotes/origin/not-local
-ok 79 - suggested names are not ambiguous
-
-# passed all 79 test(s)
-1..79
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7406-submodule-update.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/.git/
 expecting success of 7406.1 'setup a submodule tree': 
@@ -490001,114 +488068,2280 @@
 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
+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.47.2/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.47.2/t/trash directory.t7406-submodule-update/middle/.git/
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7406-submodule-update/top/.git/
+Cloning into '/build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t7406-submodule-update/middle) registered for path 'middle'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/top-clean/middle'...
+done.
+Submodule path 'middle': checked out '8c7b95e494a2782f61ae9299ca15d668e545d9a8'
+Submodule 'bottom' (/build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/bottom) registered for path 'middle/bottom'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/top-clean/middle/bottom'...
+done.
+Submodule path 'middle/bottom': checked out '581bdebe7becb965f64fee4b6315195d6f9b87df'
+ok 62 - setup clean recursive superproject
+
+expecting success of 7406.63 'submodule update should skip unmerged submodules': 
+	test_when_finished "rm -fr top-cloned" &&
+	cp -r top-clean top-cloned &&
+
+	# Create 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 1214144] upstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_commit.t
+From /build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/bottom
+   581bdeb..1214144  main            -> origin/main
+ * [new tag]         upstream_commit -> upstream_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 1214144 upstream_commit
+[main 02206c0] upstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/middle
+   8c7b95e..02206c0  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 02206c0 upstream_commit
+[main 3de434e] upstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 732f4af] downstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 downstream_commit.t
+[detached HEAD bd1874b] downstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/middle
+   8c7b95e..02206c0  main       -> origin/main
+Fetching submodule bottom
+From /build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/bottom
+   581bdeb..1214144  main            -> origin/main
+ * [new tag]         upstream_commit -> upstream_commit
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (bottom), and either merge commit 1214144
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add bottom
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config advice.submoduleMergeConflict false"
+Failed to merge submodule bottom
+CONFLICT (submodule): Merge conflict in bottom
+Automatic merge failed; fix conflicts and then commit the result.
+Submodule path 'middle': 'true 8c7b95e494a2782f61ae9299ca15d668e545d9a8'
+ok 63 - submodule update should skip unmerged submodules
+
+expecting success of 7406.64 '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 4ad2ba9] downstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 downstream_commit.t
+ok 64 - submodule update --recursive skip submodules with strategy=none
+
+expecting success of 7406.65 'commit with staged submodule change': 
+	add_submodule_commit_and_validate
+
+[main f3de040] create submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+ok 65 - commit with staged submodule change
+
+expecting success of 7406.66 'commit with staged submodule change with ignoreSubmodules dirty': 
+	test_config diff.ignoreSubmodules dirty &&
+	add_submodule_commit_and_validate
+
+[main 9dbf457] create submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 66 - commit with staged submodule change with ignoreSubmodules dirty
+
+expecting success of 7406.67 'commit with staged submodule change with ignoreSubmodules all': 
+	test_config diff.ignoreSubmodules all &&
+	add_submodule_commit_and_validate
+
+[main 70ee70e] create submodule
+ Author: A U Thor <author@example.com>
+ok 67 - 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 68 # skip submodule paths must not follow symlinks (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,SYMLINKS)
+
+# passed all 68 test(s)
+1..68
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7811-grep-open.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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"
+
+ok 1 - determine default pager
+
+expecting success of 7811.2 'setup': 
+	test_commit initial grep.h "
+enum grep_pat_token {
+	GREP_PATTERN,
+	GREP_PATTERN_HEAD,
+	GREP_PATTERN_BODY,
+	GREP_AND,
+	GREP_OPEN_PAREN,
+	GREP_CLOSE_PAREN,
+	GREP_NOT,
+	GREP_OR,
+};" &&
+
+	test_commit add-user revision.c "
+	}
+	if (seen_dashdash)
+		read_pathspec_from_stdin(revs, &sb, prune);
+	strbuf_release(&sb);
+}
+
+static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
+{
+	append_grep_pattern(&revs->grep_filter, ptn, \"command line\", 0, what);
+" &&
+
+	mkdir subdir &&
+	test_commit subdir subdir/grep.c "enum grep_pat_token" &&
+
+	test_commit uninteresting unrelated "hello, world" &&
+
+	echo GREP_PATTERN >untracked
+
+[master (root-commit) 6a780d2] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 11 insertions(+)
+ create mode 100644 grep.h
+[master 7eeae3c] add-user
+ Author: A U Thor <author@example.com>
+ 1 file changed, 11 insertions(+)
+ create mode 100644 revision.c
+[master 22c3f1e] subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/grep.c
+[master cd972f3] uninteresting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated
+ok 2 - setup
+
+expecting success of 7811.3 'git grep -O': 
+	cat >$less <<-\EOF &&
+	#!/bin/sh
+	printf "%s\n" "$@" >pager-args
+	EOF
+	chmod +x $less &&
+	cat >expect.less <<-\EOF &&
+	+/*GREP_PATTERN
+	grep.h
+	EOF
+	echo grep.h >expect.notless &&
+
+	PATH=.:$PATH git grep -O GREP_PATTERN >out &&
+	{
+		test_cmp expect.less pager-args ||
+		test_cmp expect.notless pager-args
+	} &&
+	test_must_be_empty out
+
+--- expect.less	2025-01-30 02:17:17.690095931 +0000
++++ pager-args	2025-01-30 02:17:17.722096123 +0000
+@@ -1,2 +1 @@
+-+/*GREP_PATTERN
+ grep.h
+ok 3 - git grep -O
+
+expecting success of 7811.4 'git grep -O --cached': 
+	test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
+	test_grep open-files-in-pager msg
+
+fatal: --open-files-in-pager only works on the worktree
+ok 4 - git grep -O --cached
+
+expecting success of 7811.5 'git grep -O --no-index': 
+	rm -f expect.less pager-args out &&
+	cat >expect <<-\EOF &&
+	grep.h
+	untracked
+	EOF
+
+	(
+		GIT_PAGER='printf "%s\n" >pager-args' &&
+		export GIT_PAGER &&
+		git grep --no-index -O GREP_PATTERN >out
+	) &&
+	test_cmp expect pager-args &&
+	test_must_be_empty out
+
+ok 5 - git grep -O --no-index
+
+expecting success of 7811.6 'setup: fake "less"': 
+	cat >less <<-\EOF &&
+	#!/bin/sh
+	printf "%s\n" "$@" >actual
+	EOF
+	chmod +x less
+
+ok 6 - setup: fake "less"
+
+expecting success of 7811.7 'git grep -O jumps to line in less': 
+	cat >expect <<-\EOF &&
+	+/*GREP_PATTERN
+	grep.h
+	EOF
+
+	GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
+	test_cmp expect actual &&
+	test_must_be_empty out &&
+
+	git grep -O./less GREP_PATTERN >out2 &&
+	test_cmp expect actual &&
+	test_must_be_empty out2
+
+ok 7 - git grep -O jumps to line in less
+
+expecting success of 7811.8 'modified file': 
+	rm -f actual &&
+	cat >expect <<-\EOF &&
+	+/*enum grep_pat_token
+	grep.h
+	revision.c
+	subdir/grep.c
+	unrelated
+	EOF
+
+	test_when_finished "git reset --hard" &&
+	echo "enum grep_pat_token" >unrelated &&
+	GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
+	test_cmp expect actual &&
+	test_must_be_empty out
+
+HEAD is now at cd972f3 uninteresting
+ok 8 - modified file
+
+expecting success of 7811.9 'copes with color settings': 
+	rm -f actual &&
+	echo grep.h >expect &&
+	test_config color.grep always &&
+	test_config color.grep.filename yellow &&
+	test_config color.grep.separator green &&
+	git grep -O'printf "%s\n" >actual' GREP_AND &&
+	test_cmp expect actual
+
+ok 9 - copes with color settings
+
+expecting success of 7811.10 'run from subdir': 
+	rm -f actual &&
+	echo grep.c >expect &&
+
+	(
+		cd subdir &&
+		export GIT_PAGER &&
+		GIT_PAGER='printf "%s\n" >../args' &&
+		git grep -O "enum grep_pat_token" >../out &&
+		git grep -O"pwd >../dir; :" "enum grep_pat_token" >../out2
+	) &&
+	case $(cat dir) in
+	*subdir)
+		: good
+		;;
+	*)
+		false
+		;;
+	esac &&
+	test_cmp expect args &&
+	test_must_be_empty out &&
+	test_must_be_empty out2
+
+ok 10 - run from subdir
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7600-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/.git/
+expecting success of 7600.1 'setup': 
+	git add file &&
+	test_tick &&
+	git commit -m "commit 0" &&
+	git tag c0 &&
+	c0=$(git rev-parse HEAD) &&
+	cp file.1 file &&
+	git add file &&
+	cp file.1 other &&
+	git add other &&
+	test_tick &&
+	git commit -m "commit 1" &&
+	git tag c1 &&
+	c1=$(git rev-parse HEAD) &&
+	git reset --hard "$c0" &&
+	cp file.5 file &&
+	git add file &&
+	test_tick &&
+	git commit -m "commit 2" &&
+	git tag c2 &&
+	c2=$(git rev-parse HEAD) &&
+	git reset --hard "$c0" &&
+	cp file.9y file &&
+	git add file &&
+	test_tick &&
+	git commit -m "commit 7" &&
+	git tag c7 &&
+	git reset --hard "$c0" &&
+	cp file.9 file &&
+	git add file &&
+	test_tick &&
+	git commit -m "commit 3" &&
+	git tag c3 &&
+	c3=$(git rev-parse HEAD) &&
+	git reset --hard "$c0" &&
+	create_merge_msgs
+
+[main (root-commit) 88012a2] commit 0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file
+[main dc8b979] commit 1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+HEAD is now at 88012a2 commit 0
+[main ac59201] commit 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 88012a2 commit 0
+[main 63f6a48] commit 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 88012a2 commit 0
+[main 8976188] commit 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 88012a2 commit 0
+ok 1 - setup
+
+expecting success of 7600.2 'test option parsing': 
+	test_must_fail git merge -$ c1 &&
+	test_must_fail git merge --no-such c1 &&
+	test_must_fail git merge -s foobar c1 &&
+	test_must_fail git merge -s=foobar c1 &&
+	test_must_fail git merge -m &&
+	test_must_fail git merge --abort foobar &&
+	test_must_fail git merge --abort --quiet &&
+	test_must_fail git merge --continue foobar &&
+	test_must_fail git merge --continue --quiet &&
+	test_must_fail git merge
+
+error: unknown switch `$'
+usage: git merge [<options>] [<commit>...]
+   or: git merge --abort
+   or: git merge --continue
+
+    -n                    do not show a diffstat at the end of the merge
+    --[no-]stat           show a diffstat at the end of the merge
+    --[no-]summary        (synonym to --stat)
+    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
+    --[no-]squash         create a single commit instead of doing a merge
+    --[no-]commit         perform a commit if the merge succeeds (default)
+    -e, --[no-]edit       edit message before committing
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    --[no-]ff             allow fast-forward (default)
+    --ff-only             abort if fast-forward is not possible
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --[no-]verify-signatures
+                          verify that the named commit has a valid GPG signature
+    -s, --[no-]strategy <strategy>
+                          merge strategy to use
+    -X, --[no-]strategy-option <option=value>
+                          option for selected merge strategy
+    -m, --[no-]message <message>
+                          merge commit message (for a non-fast-forward merge)
+    -F, --file <path>     read message from file
+    --[no-]into-name <name>
+                          use <name> instead of the real target
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]abort          abort the current in-progress merge
+    --[no-]quit           --abort but leave index and working tree alone
+    --[no-]continue       continue the current in-progress merge
+    --[no-]allow-unrelated-histories
+                          allow merging unrelated histories
+    --[no-]progress       force progress reporting
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG sign commit
+    --[no-]autostash      automatically stash/stash pop before and after
+    --[no-]overwrite-ignore
+                          update ignored files (default)
+    --[no-]signoff        add a Signed-off-by trailer
+    --no-verify           bypass pre-merge-commit and commit-msg hooks
+    --verify              opposite of --no-verify
+
+error: unknown option `no-such'
+usage: git merge [<options>] [<commit>...]
+   or: git merge --abort
+   or: git merge --continue
+
+    -n                    do not show a diffstat at the end of the merge
+    --[no-]stat           show a diffstat at the end of the merge
+    --[no-]summary        (synonym to --stat)
+    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
+    --[no-]squash         create a single commit instead of doing a merge
+    --[no-]commit         perform a commit if the merge succeeds (default)
+    -e, --[no-]edit       edit message before committing
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    --[no-]ff             allow fast-forward (default)
+    --ff-only             abort if fast-forward is not possible
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --[no-]verify-signatures
+                          verify that the named commit has a valid GPG signature
+    -s, --[no-]strategy <strategy>
+                          merge strategy to use
+    -X, --[no-]strategy-option <option=value>
+                          option for selected merge strategy
+    -m, --[no-]message <message>
+                          merge commit message (for a non-fast-forward merge)
+    -F, --file <path>     read message from file
+    --[no-]into-name <name>
+                          use <name> instead of the real target
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]abort          abort the current in-progress merge
+    --[no-]quit           --abort but leave index and working tree alone
+    --[no-]continue       continue the current in-progress merge
+    --[no-]allow-unrelated-histories
+                          allow merging unrelated histories
+    --[no-]progress       force progress reporting
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG sign commit
+    --[no-]autostash      automatically stash/stash pop before and after
+    --[no-]overwrite-ignore
+                          update ignored files (default)
+    --[no-]signoff        add a Signed-off-by trailer
+    --no-verify           bypass pre-merge-commit and commit-msg hooks
+    --verify              opposite of --no-verify
+
+Could not find merge strategy 'foobar'.
+Available strategies are: octopus ours recursive resolve subtree.
+Could not find merge strategy '=foobar'.
+Available strategies are: octopus ours recursive resolve subtree.
+error: switch `m' requires a value
+fatal: --abort expects no arguments
+
+usage: git merge [<options>] [<commit>...]
+   or: git merge --abort
+   or: git merge --continue
+
+    -n                    do not show a diffstat at the end of the merge
+    --[no-]stat           show a diffstat at the end of the merge
+    --[no-]summary        (synonym to --stat)
+    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
+    --[no-]squash         create a single commit instead of doing a merge
+    --[no-]commit         perform a commit if the merge succeeds (default)
+    -e, --[no-]edit       edit message before committing
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    --[no-]ff             allow fast-forward (default)
+    --ff-only             abort if fast-forward is not possible
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --[no-]verify-signatures
+                          verify that the named commit has a valid GPG signature
+    -s, --[no-]strategy <strategy>
+                          merge strategy to use
+    -X, --[no-]strategy-option <option=value>
+                          option for selected merge strategy
+    -m, --[no-]message <message>
+                          merge commit message (for a non-fast-forward merge)
+    -F, --file <path>     read message from file
+    --[no-]into-name <name>
+                          use <name> instead of the real target
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]abort          abort the current in-progress merge
+    --[no-]quit           --abort but leave index and working tree alone
+    --[no-]continue       continue the current in-progress merge
+    --[no-]allow-unrelated-histories
+                          allow merging unrelated histories
+    --[no-]progress       force progress reporting
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG sign commit
+    --[no-]autostash      automatically stash/stash pop before and after
+    --[no-]overwrite-ignore
+                          update ignored files (default)
+    --[no-]signoff        add a Signed-off-by trailer
+    --no-verify           bypass pre-merge-commit and commit-msg hooks
+    --verify              opposite of --no-verify
+
+fatal: --abort expects no arguments
+
+usage: git merge [<options>] [<commit>...]
+   or: git merge --abort
+   or: git merge --continue
+
+    -n                    do not show a diffstat at the end of the merge
+    --[no-]stat           show a diffstat at the end of the merge
+    --[no-]summary        (synonym to --stat)
+    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
+    --[no-]squash         create a single commit instead of doing a merge
+    --[no-]commit         perform a commit if the merge succeeds (default)
+    -e, --[no-]edit       edit message before committing
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    --[no-]ff             allow fast-forward (default)
+    --ff-only             abort if fast-forward is not possible
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --[no-]verify-signatures
+                          verify that the named commit has a valid GPG signature
+    -s, --[no-]strategy <strategy>
+                          merge strategy to use
+    -X, --[no-]strategy-option <option=value>
+                          option for selected merge strategy
+    -m, --[no-]message <message>
+                          merge commit message (for a non-fast-forward merge)
+    -F, --file <path>     read message from file
+    --[no-]into-name <name>
+                          use <name> instead of the real target
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]abort          abort the current in-progress merge
+    --[no-]quit           --abort but leave index and working tree alone
+    --[no-]continue       continue the current in-progress merge
+    --[no-]allow-unrelated-histories
+                          allow merging unrelated histories
+    --[no-]progress       force progress reporting
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG sign commit
+    --[no-]autostash      automatically stash/stash pop before and after
+    --[no-]overwrite-ignore
+                          update ignored files (default)
+    --[no-]signoff        add a Signed-off-by trailer
+    --no-verify           bypass pre-merge-commit and commit-msg hooks
+    --verify              opposite of --no-verify
+
+fatal: --continue expects no arguments
+
+usage: git merge [<options>] [<commit>...]
+   or: git merge --abort
+   or: git merge --continue
+
+    -n                    do not show a diffstat at the end of the merge
+    --[no-]stat           show a diffstat at the end of the merge
+    --[no-]summary        (synonym to --stat)
+    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
+    --[no-]squash         create a single commit instead of doing a merge
+    --[no-]commit         perform a commit if the merge succeeds (default)
+    -e, --[no-]edit       edit message before committing
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    --[no-]ff             allow fast-forward (default)
+    --ff-only             abort if fast-forward is not possible
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --[no-]verify-signatures
+                          verify that the named commit has a valid GPG signature
+    -s, --[no-]strategy <strategy>
+                          merge strategy to use
+    -X, --[no-]strategy-option <option=value>
+                          option for selected merge strategy
+    -m, --[no-]message <message>
+                          merge commit message (for a non-fast-forward merge)
+    -F, --file <path>     read message from file
+    --[no-]into-name <name>
+                          use <name> instead of the real target
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]abort          abort the current in-progress merge
+    --[no-]quit           --abort but leave index and working tree alone
+    --[no-]continue       continue the current in-progress merge
+    --[no-]allow-unrelated-histories
+                          allow merging unrelated histories
+    --[no-]progress       force progress reporting
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG sign commit
+    --[no-]autostash      automatically stash/stash pop before and after
+    --[no-]overwrite-ignore
+                          update ignored files (default)
+    --[no-]signoff        add a Signed-off-by trailer
+    --no-verify           bypass pre-merge-commit and commit-msg hooks
+    --verify              opposite of --no-verify
+
+fatal: --continue expects no arguments
+
+usage: git merge [<options>] [<commit>...]
+   or: git merge --abort
+   or: git merge --continue
+
+    -n                    do not show a diffstat at the end of the merge
+    --[no-]stat           show a diffstat at the end of the merge
+    --[no-]summary        (synonym to --stat)
+    --[no-]log[=<n>]      add (at most <n>) entries from shortlog to merge commit message
+    --[no-]squash         create a single commit instead of doing a merge
+    --[no-]commit         perform a commit if the merge succeeds (default)
+    -e, --[no-]edit       edit message before committing
+    --[no-]cleanup <mode> how to strip spaces and #comments from message
+    --[no-]ff             allow fast-forward (default)
+    --ff-only             abort if fast-forward is not possible
+    --[no-]rerere-autoupdate
+                          update the index with reused conflict resolution if possible
+    --[no-]verify-signatures
+                          verify that the named commit has a valid GPG signature
+    -s, --[no-]strategy <strategy>
+                          merge strategy to use
+    -X, --[no-]strategy-option <option=value>
+                          option for selected merge strategy
+    -m, --[no-]message <message>
+                          merge commit message (for a non-fast-forward merge)
+    -F, --file <path>     read message from file
+    --[no-]into-name <name>
+                          use <name> instead of the real target
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]abort          abort the current in-progress merge
+    --[no-]quit           --abort but leave index and working tree alone
+    --[no-]continue       continue the current in-progress merge
+    --[no-]allow-unrelated-histories
+                          allow merging unrelated histories
+    --[no-]progress       force progress reporting
+    -S, --[no-]gpg-sign[=<key-id>]
+                          GPG sign commit
+    --[no-]autostash      automatically stash/stash pop before and after
+    --[no-]overwrite-ignore
+                          update ignored files (default)
+    --[no-]signoff        add a Signed-off-by trailer
+    --no-verify           bypass pre-merge-commit and commit-msg hooks
+    --verify              opposite of --no-verify
+
+fatal: No remote for the current branch.
+ok 2 - test option parsing
+
+expecting success of 7600.3 'merge -h with invalid index': 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init &&
+		>.git/index &&
+		test_expect_code 129 git merge -h 2>usage
+	) &&
+	test_grep "[Uu]sage: git merge" broken/usage
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/broken/.git/
+usage: git merge [<options>] [<commit>...]
+ok 3 - merge -h with invalid index
+
+expecting success of 7600.4 'reject non-strategy with a git-merge-foo name': 
+	test_must_fail git merge -s index c1
+
+Could not find merge strategy 'index'.
+Available strategies are: octopus ours recursive resolve subtree.
+ok 4 - reject non-strategy with a git-merge-foo name
+
+expecting success of 7600.5 'merge c0 with c1': 
+	echo "OBJID HEAD@{0}: merge c1: Fast-forward" >reflog.expected &&
+
+	git reset --hard c0 &&
+	git merge c1 &&
+	verify_merge file result.1 &&
+	verify_head "$c1" &&
+
+	git reflog -1 >reflog.actual &&
+	sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
+	test_cmp reflog.expected reflog.fuzzy
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+ok 5 - merge c0 with c1
+
+expecting success of 7600.6 'merge c0 with c1 with --ff-only': 
+	git reset --hard c0 &&
+	git merge --ff-only c1 &&
+	git merge --ff-only HEAD c0 c1 &&
+	verify_merge file result.1 &&
+	verify_head "$c1"
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+Already up to date.
+ok 6 - merge c0 with c1 with --ff-only
+
+expecting success of 7600.7 'merge from unborn branch': 
+	git checkout -f main &&
+	test_might_fail git branch -D kid &&
+
+	echo "OBJID HEAD@{0}: initial pull" >reflog.expected &&
+
+	git checkout --orphan kid &&
+	test_when_finished "git checkout -f main" &&
+	git rm -fr . &&
+	test_tick &&
+	git merge --ff-only c1 &&
+	verify_merge file result.1 &&
+	verify_head "$c1" &&
+
+	git reflog -1 >reflog.actual &&
+	sed "s/$_x05[0-9a-f][0-9a-f]/OBJID/g" reflog.actual >reflog.fuzzy &&
+	test_cmp reflog.expected reflog.fuzzy
+
+Already on 'main'
+error: branch 'kid' not found
+Switched to a new branch 'kid'
+rm 'file'
+rm 'other'
+Switched to branch 'main'
+ok 7 - merge from unborn branch
+
+expecting success of 7600.8 'merge c1 with c2': 
+	git reset --hard c1 &&
+	test_tick &&
+	git merge c2 &&
+	verify_merge file result.1-5 msg.1-5 &&
+	verify_parents $c1 $c2
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 8 - merge c1 with c2
+
+expecting success of 7600.9 'merge c1 with c2 when index.lock exists': 
+	test_when_finished rm .git/index.lock &&
+	git reset --hard c1 &&
+	>.git/index.lock &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_path_is_missing .git/MERGE_MODE &&
+	test_path_is_missing .git/MERGE_MSG
+
+HEAD is now at dc8b979 commit 1
+fatal: Unable to write index.
+ok 9 - merge c1 with c2 when index.lock exists
+
+expecting success of 7600.10 'merge --squash c3 with c7': 
+	git reset --hard c3 &&
+	test_must_fail git merge --squash c7 &&
+	cat result.9z >file &&
+	git commit --no-edit -a &&
+
+	cat >expect <<-EOF &&
+	Squashed commit of the following:
+
+	$(git show -s c7)
+
+	# Conflicts:
+	#	file
+	EOF
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 8976188 commit 3
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Squash commit -- not updating HEAD
+Automatic merge failed; fix conflicts and then commit the result.
+[main 211f9ce] Squashed commit of the following:
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 10 - merge --squash c3 with c7
+
+expecting success of 7600.11 'merge --squash --autostash conflict does not attempt to apply autostash': 
+	git reset --hard c3 &&
+	>unrelated &&
+	git add unrelated &&
+	test_must_fail git merge --squash c7 --autostash >out 2>err &&
+	! grep "Applying autostash resulted in conflicts." err &&
+	grep "When finished, apply stashed changes with \`git stash pop\`" out
+
+HEAD is now at 8976188 commit 3
+When finished, apply stashed changes with `git stash pop`
+ok 11 - merge --squash --autostash conflict does not attempt to apply autostash
+
+expecting success of 7600.12 'merge c3 with c7 with commit.cleanup = scissors': 
+	git config commit.cleanup scissors &&
+	git reset --hard c3 &&
+	test_must_fail git merge c7 &&
+	cat result.9z >file &&
+	git commit --no-edit -a &&
+
+	cat >expect <<-\EOF &&
+	Merge tag 'c7'
+
+	# ------------------------ >8 ------------------------
+	# Do not modify or remove the line above.
+	# Everything below it will be ignored.
+	#
+	# Conflicts:
+	#	file
+	EOF
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 8976188 commit 3
+Autostash exists; creating a new stash entry.
+Your changes are safe in the stash.
+You can run "git stash pop" or "git stash drop" at any time.
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+[main e024249] Merge tag 'c7'
+ Author: A U Thor <author@example.com>
+ok 12 - merge c3 with c7 with commit.cleanup = scissors
+
+expecting success of 7600.13 'merge c3 with c7 with --squash commit.cleanup = scissors': 
+	git config commit.cleanup scissors &&
+	git reset --hard c3 &&
+	test_must_fail git merge --squash c7 &&
+	cat result.9z >file &&
+	git commit --no-edit -a &&
+
+	cat >expect <<-EOF &&
+	Squashed commit of the following:
+
+	$(git show -s c7)
+
+	# ------------------------ >8 ------------------------
+	# Do not modify or remove the line above.
+	# Everything below it will be ignored.
+	#
+	# Conflicts:
+	#	file
+	EOF
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 8976188 commit 3
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Squash commit -- not updating HEAD
+Automatic merge failed; fix conflicts and then commit the result.
+[main cb3ece3] Squashed commit of the following:
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - merge c3 with c7 with --squash commit.cleanup = scissors
+
+expecting success of 7600.14 'merge c1 with c2 and c3': 
+	git reset --hard c1 &&
+	test_tick &&
+	git merge c2 c3 &&
+	verify_merge file result.1-5-9 msg.1-5-9 &&
+	verify_parents $c1 $c2 $c3
+
+HEAD is now at dc8b979 commit 1
+Trying simple merge with c2
+Simple merge did not work, trying automatic merge.
+Auto-merging file
+Trying simple merge with c3
+Simple merge did not work, trying automatic merge.
+Auto-merging file
+Merge made by the 'octopus' strategy.
+ file | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+fatal: Needed a single revision
+ok 14 - merge c1 with c2 and c3
+
+expecting success of 7600.15 'merges with --ff-only': 
+	git reset --hard c1 &&
+	test_tick &&
+	test_must_fail git merge --ff-only c2 &&
+	test_must_fail git merge --ff-only c3 &&
+	test_must_fail git merge --ff-only c2 c3 &&
+	git reset --hard c0 &&
+	git merge c3 &&
+	verify_head $c3
+
+HEAD is now at dc8b979 commit 1
+hint: Diverging branches can't be fast-forwarded, you need to either:
+hint:
+hint: 	git merge --no-ff
+hint:
+hint: or:
+hint:
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
+hint: Diverging branches can't be fast-forwarded, you need to either:
+hint:
+hint: 	git merge --no-ff
+hint:
+hint: or:
+hint:
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
+hint: Diverging branches can't be fast-forwarded, you need to either:
+hint:
+hint: 	git merge --no-ff
+hint:
+hint: or:
+hint:
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..8976188
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - merges with --ff-only
+
+expecting success of 7600.16 'merges with merge.ff=only': 
+	git reset --hard c1 &&
+	test_tick &&
+	test_config merge.ff "only" &&
+	test_must_fail git merge c2 &&
+	test_must_fail git merge c3 &&
+	test_must_fail git merge c2 c3 &&
+	git reset --hard c0 &&
+	git merge c3 &&
+	verify_head $c3
+
+HEAD is now at dc8b979 commit 1
+hint: Diverging branches can't be fast-forwarded, you need to either:
+hint:
+hint: 	git merge --no-ff
+hint:
+hint: or:
+hint:
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
+hint: Diverging branches can't be fast-forwarded, you need to either:
+hint:
+hint: 	git merge --no-ff
+hint:
+hint: or:
+hint:
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
+hint: Diverging branches can't be fast-forwarded, you need to either:
+hint:
+hint: 	git merge --no-ff
+hint:
+hint: or:
+hint:
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..8976188
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 16 - merges with merge.ff=only
+
+expecting success of 7600.17 'merge c0 with c1 (no-commit)': 
+	git reset --hard c0 &&
+	git merge --no-commit c1 &&
+	verify_merge file result.1 &&
+	verify_head $c1
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+ok 17 - merge c0 with c1 (no-commit)
+
+expecting success of 7600.18 'merge c1 with c2 (no-commit)': 
+	git reset --hard c1 &&
+	git merge --no-commit c2 &&
+	verify_merge file result.1-5 &&
+	verify_head $c1 &&
+	verify_mergeheads $c2
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+ok 18 - merge c1 with c2 (no-commit)
+
+expecting success of 7600.19 'merge c1 with c2 and c3 (no-commit)': 
+	git reset --hard c1 &&
+	git merge --no-commit c2 c3 &&
+	verify_merge file result.1-5-9 &&
+	verify_head $c1 &&
+	verify_mergeheads $c2 $c3
+
+HEAD is now at dc8b979 commit 1
+Trying simple merge with c2
+Simple merge did not work, trying automatic merge.
+Auto-merging file
+Trying simple merge with c3
+Simple merge did not work, trying automatic merge.
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+ok 19 - merge c1 with c2 and c3 (no-commit)
+
+expecting success of 7600.20 'merge c0 with c1 (squash)': 
+	git reset --hard c0 &&
+	git merge --squash c1 &&
+	verify_merge file result.1 &&
+	verify_head $c0 &&
+	verify_no_mergehead &&
+	test_cmp squash.1 .git/SQUASH_MSG
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Fast-forward
+Squash commit -- not updating HEAD
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+ok 20 - merge c0 with c1 (squash)
+
+expecting success of 7600.21 'merge c0 with c1 (squash, ff-only)': 
+	git reset --hard c0 &&
+	git merge --squash --ff-only c1 &&
+	verify_merge file result.1 &&
+	verify_head $c0 &&
+	verify_no_mergehead &&
+	test_cmp squash.1 .git/SQUASH_MSG
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Fast-forward
+Squash commit -- not updating HEAD
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+ok 21 - merge c0 with c1 (squash, ff-only)
+
+expecting success of 7600.22 'merge c1 with c2 (squash)': 
+	git reset --hard c1 &&
+	git merge --squash c2 &&
+	verify_merge file result.1-5 &&
+	verify_head $c1 &&
+	verify_no_mergehead &&
+	test_cmp squash.1-5 .git/SQUASH_MSG
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+Squash commit -- not updating HEAD
+ok 22 - merge c1 with c2 (squash)
+
+expecting success of 7600.23 'unsuccessful merge of c1 with c2 (squash, ff-only)': 
+	git reset --hard c1 &&
+	test_must_fail git merge --squash --ff-only c2
+
+HEAD is now at dc8b979 commit 1
+hint: Diverging branches can't be fast-forwarded, you need to either:
+hint:
+hint: 	git merge --no-ff
+hint:
+hint: or:
+hint:
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
+ok 23 - unsuccessful merge of c1 with c2 (squash, ff-only)
+
+expecting success of 7600.24 'merge c1 with c2 and c3 (squash)': 
+	git reset --hard c1 &&
+	git merge --squash c2 c3 &&
+	verify_merge file result.1-5-9 &&
+	verify_head $c1 &&
+	verify_no_mergehead &&
+	test_cmp squash.1-5-9 .git/SQUASH_MSG
+
+HEAD is now at dc8b979 commit 1
+Trying simple merge with c2
+Simple merge did not work, trying automatic merge.
+Auto-merging file
+Trying simple merge with c3
+Simple merge did not work, trying automatic merge.
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+Squash commit -- not updating HEAD
+ok 24 - merge c1 with c2 and c3 (squash)
+
+expecting success of 7600.25 'merge c1 with c2 (no-commit in config)': 
+	git reset --hard c1 &&
+	test_config branch.main.mergeoptions "--no-commit" &&
+	git merge c2 &&
+	verify_merge file result.1-5 &&
+	verify_head $c1 &&
+	verify_mergeheads $c2
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+ok 25 - merge c1 with c2 (no-commit in config)
+
+expecting success of 7600.26 'merge c1 with c2 (log in config)': 
+	git reset --hard c1 &&
+	git merge --log c2 &&
+	git show -s --pretty=tformat:%s%n%b >expect &&
+
+	test_config branch.main.mergeoptions "--log" &&
+	git reset --hard c1 &&
+	git merge c2 &&
+	git show -s --pretty=tformat:%s%n%b >actual &&
+
+	test_cmp expect actual
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 26 - merge c1 with c2 (log in config)
+
+expecting success of 7600.27 'merge c1 with c2 (log in config gets overridden)': 
+	git reset --hard c1 &&
+	git merge c2 &&
+	git show -s --pretty=tformat:%s%n%b >expect &&
+
+	test_config branch.main.mergeoptions "--no-log" &&
+	test_config merge.log "true" &&
+	git reset --hard c1 &&
+	git merge c2 &&
+	git show -s --pretty=tformat:%s%n%b >actual &&
+
+	test_cmp expect actual
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 27 - merge c1 with c2 (log in config gets overridden)
+
+expecting success of 7600.28 'merge c1 with c2 (squash in config)': 
+	git reset --hard c1 &&
+	test_config branch.main.mergeoptions "--squash" &&
+	git merge c2 &&
+	verify_merge file result.1-5 &&
+	verify_head $c1 &&
+	verify_no_mergehead &&
+	test_cmp squash.1-5 .git/SQUASH_MSG
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+Squash commit -- not updating HEAD
+ok 28 - merge c1 with c2 (squash in config)
+
+expecting success of 7600.29 'override config option -n with --summary': 
+	git reset --hard c1 &&
+	test_config branch.main.mergeoptions "-n" &&
+	test_tick &&
+	git merge --summary c2 >diffstat.txt &&
+	verify_merge file result.1-5 msg.1-5 &&
+	verify_parents $c1 $c2 &&
+	if ! grep "^ file |  *2 +-$" diffstat.txt
+	then
+		echo "[OOPS] diffstat was not generated with --summary"
+		false
+	fi
+
+HEAD is now at dc8b979 commit 1
+fatal: Needed a single revision
+ file | 2 +-
+ok 29 - override config option -n with --summary
+
+expecting success of 7600.30 'override config option -n with --stat': 
+	git reset --hard c1 &&
+	test_config branch.main.mergeoptions "-n" &&
+	test_tick &&
+	git merge --stat c2 >diffstat.txt &&
+	verify_merge file result.1-5 msg.1-5 &&
+	verify_parents $c1 $c2 &&
+	if ! grep "^ file |  *2 +-$" diffstat.txt
+	then
+		echo "[OOPS] diffstat was not generated with --stat"
+		false
+	fi
+
+HEAD is now at dc8b979 commit 1
+fatal: Needed a single revision
+ file | 2 +-
+ok 30 - override config option -n with --stat
+
+expecting success of 7600.31 'override config option --stat': 
+	git reset --hard c1 &&
+	test_config branch.main.mergeoptions "--stat" &&
+	test_tick &&
+	git merge -n c2 >diffstat.txt &&
+	verify_merge file result.1-5 msg.1-5 &&
+	verify_parents $c1 $c2 &&
+	if grep "^ file |  *2 +-$" diffstat.txt
+	then
+		echo "[OOPS] diffstat was generated"
+		false
+	fi
+
+HEAD is now at dc8b979 commit 1
+fatal: Needed a single revision
+ok 31 - override config option --stat
+
+expecting success of 7600.32 'merge c1 with c2 (override --no-commit)': 
+	git reset --hard c1 &&
+	test_config branch.main.mergeoptions "--no-commit" &&
+	test_tick &&
+	git merge --commit c2 &&
+	verify_merge file result.1-5 msg.1-5 &&
+	verify_parents $c1 $c2
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 32 - merge c1 with c2 (override --no-commit)
+
+expecting success of 7600.33 'merge c1 with c2 (override --squash)': 
+	git reset --hard c1 &&
+	test_config branch.main.mergeoptions "--squash" &&
+	test_tick &&
+	git merge --no-squash c2 &&
+	verify_merge file result.1-5 msg.1-5 &&
+	verify_parents $c1 $c2
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 33 - merge c1 with c2 (override --squash)
+
+expecting success of 7600.34 'merge c0 with c1 (no-ff)': 
+	git reset --hard c0 &&
+	test_tick &&
+	git merge --no-ff c1 &&
+	verify_merge file result.1 &&
+	verify_parents $c0 $c1
+
+HEAD is now at 88012a2 commit 0
+Merge made by the 'ort' strategy.
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+fatal: Needed a single revision
+ok 34 - merge c0 with c1 (no-ff)
+
+expecting success of 7600.35 'merge c0 with c1 (merge.ff=false)': 
+	git reset --hard c0 &&
+	test_config merge.ff "false" &&
+	test_tick &&
+	git merge c1 &&
+	verify_merge file result.1 &&
+	verify_parents $c0 $c1
+
+HEAD is now at 88012a2 commit 0
+Merge made by the 'ort' strategy.
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+fatal: Needed a single revision
+ok 35 - merge c0 with c1 (merge.ff=false)
+
+expecting success of 7600.36 'combine branch.main.mergeoptions with merge.ff': 
+	git reset --hard c0 &&
+	test_config branch.main.mergeoptions "--ff" &&
+	test_config merge.ff "false" &&
+	test_tick &&
+	git merge c1 &&
+	verify_merge file result.1 &&
+	verify_parents "$c0"
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+fatal: Needed a single revision
+ok 36 - combine branch.main.mergeoptions with merge.ff
+
+expecting success of 7600.37 'tolerate unknown values for merge.ff': 
+	git reset --hard c0 &&
+	test_config merge.ff "something-new" &&
+	test_tick &&
+	git merge c1 2>message &&
+	verify_head "$c1" &&
+	test_must_be_empty message
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+ok 37 - tolerate unknown values for merge.ff
+
+expecting success of 7600.38 'combining --squash and --no-ff is refused': 
+	git reset --hard c0 &&
+	test_must_fail git merge --squash --no-ff c1 &&
+	test_must_fail git merge --no-ff --squash c1
+
+HEAD is now at 88012a2 commit 0
+fatal: options '--squash' and '--no-ff.' cannot be used together
+fatal: options '--squash' and '--no-ff.' cannot be used together
+ok 38 - combining --squash and --no-ff is refused
+
+expecting success of 7600.39 'combining --squash and --commit is refused': 
+	git reset --hard c0 &&
+	test_must_fail git merge --squash --commit c1 &&
+	test_must_fail git merge --commit --squash c1
+
+HEAD is now at 88012a2 commit 0
+fatal: options '--squash' and '--commit.' cannot be used together
+fatal: options '--squash' and '--commit.' cannot be used together
+ok 39 - combining --squash and --commit is refused
+
+expecting success of 7600.40 'option --ff-only overwrites --no-ff': 
+	git merge --no-ff --ff-only c1 &&
+	test_must_fail git merge --no-ff --ff-only c2
+
+Updating 88012a2..dc8b979
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+hint: Diverging branches can't be fast-forwarded, you need to either:
+hint:
+hint: 	git merge --no-ff
+hint:
+hint: or:
+hint:
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
+ok 40 - option --ff-only overwrites --no-ff
+
+expecting success of 7600.41 'option --no-ff overrides merge.ff=only config': 
+	git reset --hard c0 &&
+	test_config merge.ff only &&
+	git merge --no-ff c1
+
+HEAD is now at 88012a2 commit 0
+Merge made by the 'ort' strategy.
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+ok 41 - option --no-ff overrides merge.ff=only config
+
+expecting success of 7600.42 'merge c0 with c1 (ff overrides no-ff)': 
+	git reset --hard c0 &&
+	test_config branch.main.mergeoptions "--no-ff" &&
+	git merge --ff c1 &&
+	verify_merge file result.1 &&
+	verify_head $c1
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+ok 42 - merge c0 with c1 (ff overrides no-ff)
+
+expecting success of 7600.43 'merge log message': 
+	git reset --hard c0 &&
+	git merge --no-log c2 &&
+	git show -s --pretty=format:%b HEAD >msg.act &&
+	test_must_be_empty msg.act &&
+
+	git reset --hard c0 &&
+	test_config branch.main.mergeoptions "--no-ff" &&
+	git merge --no-log c2 &&
+	git show -s --pretty=format:%b HEAD >msg.act &&
+	test_must_be_empty msg.act &&
+
+	git merge --log c3 &&
+	git show -s --pretty=format:%b HEAD >msg.act &&
+	test_cmp msg.log msg.act &&
+
+	git reset --hard HEAD^ &&
+	test_config merge.log "yes" &&
+	git merge c3 &&
+	git show -s --pretty=format:%b HEAD >msg.act &&
+	test_cmp msg.log msg.act
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..ac59201
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 88012a2 commit 0
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 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(-)
+HEAD is now at 8e82df1 Merge tag 'c2'
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 43 - merge log message
+
+expecting success of 7600.44 'merge c1 with c0, c2, c0, and c1': 
+	git reset --hard c1 &&
+	test_tick &&
+	git merge c0 c2 c0 c1 &&
+	verify_merge file result.1-5 &&
+	verify_parents $c1 $c2
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 44 - merge c1 with c0, c2, c0, and c1
+
+expecting success of 7600.45 'merge c1 with c0, c2, c0, and c1': 
+	git reset --hard c1 &&
+	test_tick &&
+	git merge c0 c2 c0 c1 &&
+	verify_merge file result.1-5 &&
+	verify_parents $c1 $c2
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 45 - merge c1 with c0, c2, c0, and c1
+
+expecting success of 7600.46 'merge c1 with c1 and c2': 
+	git reset --hard c1 &&
+	test_tick &&
+	git merge c1 c2 &&
+	verify_merge file result.1-5 &&
+	verify_parents $c1 $c2
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 46 - merge c1 with c1 and c2
+
+expecting success of 7600.47 'merge fast-forward in a dirty tree': 
+	git reset --hard c0 &&
+	mv file file1 &&
+	cat file1 >file &&
+	rm -f file1 &&
+	git merge c2
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..ac59201
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 47 - merge fast-forward in a dirty tree
+
+expecting success of 7600.48 'in-index merge': 
+	git reset --hard c0 &&
+	git merge --no-ff -s resolve c1 >out &&
+	test_grep "Wonderful." out &&
+	verify_parents $c0 $c1
+
+HEAD is now at 88012a2 commit 0
+Wonderful.
+fatal: Needed a single revision
+ok 48 - in-index merge
+
+expecting success of 7600.49 'refresh the index before merging': 
+	git reset --hard c1 &&
+	cp file file.n && mv -f file.n file &&
+	git merge c3
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 49 - refresh the index before merging
+
+expecting success of 7600.50 'merge with --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git merge --autostash c2 2>err &&
+	test_grep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
+
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Applied autostash.
+ok 50 - merge with --autostash
+
+expecting success of 7600.51 'merge with merge.autoStash': 
+	test_config merge.autoStash true &&
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git merge c2 2>err &&
+	test_grep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
+
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Applied autostash.
+ok 51 - merge with merge.autoStash
+
+expecting success of 7600.52 'fast-forward merge with --autostash': 
+	git reset --hard c0 &&
+	git merge-file file file.orig file.5 &&
+	git merge --autostash c1 2>err &&
+	test_grep "Applied autostash." err &&
+	test_cmp result.1-5 file
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Created autostash: 4d9e18f
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+Applied autostash.
+ok 52 - fast-forward merge with --autostash
+
+expecting success of 7600.53 'failed fast-forward merge with --autostash': 
+	git reset --hard c0 &&
+	git merge-file file file.orig file.5 &&
+	cp file.5 other &&
+	test_when_finished "rm other" &&
+	test_must_fail git merge --autostash c1 2>err &&
+	test_grep "Applied autostash." err &&
+	test_cmp file.5 file
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Created autostash: 4d9e18f
+Applied autostash.
+ok 53 - failed fast-forward merge with --autostash
+
+expecting success of 7600.54 'octopus merge with --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.3 &&
+	git merge --autostash c2 c3 2>err &&
+	test_grep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5-9 merge-result &&
+	test_cmp result.1-3-5-9 file
+
+HEAD is now at dc8b979 commit 1
+Created autostash: 27fb9f9
+Trying simple merge with c2
+Simple merge did not work, trying automatic merge.
+Auto-merging file
+Trying simple merge with c3
+Simple merge did not work, trying automatic merge.
+Auto-merging file
+Merge made by the 'octopus' strategy.
+ file | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Applied autostash.
+ok 54 - octopus merge with --autostash
+
+expecting success of 7600.55 'failed merge (exit 2) with --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.5 &&
+	test_must_fail git merge -s recursive --autostash c2 c3 2>err &&
+	test_grep "Applied autostash." err &&
+	test_cmp result.1-5 file
+
+HEAD is now at dc8b979 commit 1
+Created autostash: 92dee98
+Applied autostash.
+ok 55 - failed merge (exit 2) with --autostash
+
+expecting success of 7600.56 'conflicted merge with --autostash, --abort restores stash': 
+	git reset --hard c3 &&
+	cp file.1 file &&
+	test_must_fail git merge --autostash c7 &&
+	git merge --abort 2>err &&
+	test_grep "Applied autostash." err &&
+	test_cmp file.1 file
+
+HEAD is now at 8976188 commit 3
+Created autostash: e782531
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+When finished, apply stashed changes with `git stash pop`
+Applied autostash.
+ok 56 - conflicted merge with --autostash, --abort restores stash
+
+expecting success of 7600.57 'completed merge (git commit) with --no-commit and --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git commit 2>err &&
+	test_grep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
+
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+When finished, apply stashed changes with `git stash pop`
+[main 35e0f0d] Merge tag 'c2'
+ Author: A U Thor <author@example.com>
+Applied autostash.
+ok 57 - completed merge (git commit) with --no-commit and --autostash
+
+expecting success of 7600.58 'completed merge (git merge --continue) with --no-commit and --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git merge --continue 2>err &&
+	test_grep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
+
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+When finished, apply stashed changes with `git stash pop`
+[main 35e0f0d] Merge tag 'c2'
+ Author: A U Thor <author@example.com>
+Applied autostash.
+ok 58 - completed merge (git merge --continue) with --no-commit and --autostash
+
+expecting success of 7600.59 'aborted merge (merge --abort) with --no-commit and --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git merge --abort 2>err &&
+	test_grep "Applied autostash." err &&
+	git diff >actual &&
+	test_cmp expect actual
+
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+When finished, apply stashed changes with `git stash pop`
+Applied autostash.
+ok 59 - aborted merge (merge --abort) with --no-commit and --autostash
+
+expecting success of 7600.60 'aborted merge (reset --hard) with --no-commit and --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git reset --hard 2>err &&
+	test_grep "Autostash exists; creating a new stash entry." err &&
+	git diff --exit-code
+
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+When finished, apply stashed changes with `git stash pop`
+HEAD is now at dc8b979 commit 1
+Autostash exists; creating a new stash entry.
+ok 60 - aborted merge (reset --hard) with --no-commit and --autostash
+
+expecting success of 7600.61 'quit merge with --no-commit and --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git diff HEAD >expect &&
+	git merge --quit 2>err &&
+	test_grep "Autostash exists; creating a new stash entry." err &&
+	git diff HEAD >actual &&
+	test_cmp expect actual
+
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+When finished, apply stashed changes with `git stash pop`
+Autostash exists; creating a new stash entry.
+ok 61 - quit merge with --no-commit and --autostash
+
+expecting success of 7600.62 'merge with conflicted --autostash changes': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9y &&
+	git diff >expect &&
+	test_when_finished "test_might_fail git stash drop" &&
+	git merge --autostash c3 2>err &&
+	test_grep "Applying autostash resulted in conflicts." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-9 merge-result &&
+	git stash show -p >actual &&
+	test_cmp expect actual
+
+HEAD is now at dc8b979 commit 1
+Created autostash: 098cf2e
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Applying autostash resulted in conflicts.
+Dropped refs/stash@{0} (098cf2e14a1e9d2feea2a6a4a433f28c1a9b286f)
+ok 62 - merge with conflicted --autostash changes
+
+expecting success of 7600.63 'merge early part of c2': 
+	git reset --hard c3 &&
+	echo c4 >c4.c &&
+	git add c4.c &&
+	git commit -m c4 &&
+	git tag c4 &&
+	echo c5 >c5.c &&
+	git add c5.c &&
+	git commit -m c5 &&
+	git tag c5 &&
+	git reset --hard c3 &&
+	echo c6 >c6.c &&
+	git add c6.c &&
+	git commit -m c6 &&
+	git tag c6 &&
+	git branch -f c5-branch c5 &&
+	git merge c5-branch~1 &&
+	git show -s --pretty=tformat:%s HEAD >actual.branch &&
+	git reset --keep HEAD^ &&
+	git merge c5~1 &&
+	git show -s --pretty=tformat:%s HEAD >actual.tag &&
+	test_cmp expected.branch actual.branch &&
+	test_cmp expected.tag actual.tag
+
+HEAD is now at 8976188 commit 3
+[main e193602] c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.c
+[main faccb43] c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c5.c
+HEAD is now at 8976188 commit 3
+[main bfc1f93] c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c6.c
+Merge made by the 'ort' strategy.
+ c4.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.c
+Merge made by the 'ort' strategy.
+ c4.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.c
+ok 63 - merge early part of c2
+
+expecting success of 7600.64 'merge --no-ff --no-commit && commit': 
+	git reset --hard c0 &&
+	git merge --no-ff --no-commit c1 &&
+	EDITOR=: git commit &&
+	verify_parents $c0 $c1
+
+HEAD is now at 88012a2 commit 0
+Automatic merge went well; stopped before committing as requested
+[main 214792f] Merge tag 'c1'
+ Author: A U Thor <author@example.com>
+fatal: Needed a single revision
+ok 64 - merge --no-ff --no-commit && commit
+
+expecting success of 7600.65 'amending no-ff merge commit': 
+	EDITOR=: git commit --amend &&
+	verify_parents $c0 $c1
+
+[main 214792f] Merge tag 'c1'
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:34:13 2005 -0700
+fatal: Needed a single revision
+ok 65 - amending no-ff merge commit
+
+expecting success of 7600.66 'merge --no-ff --edit': 
+	git reset --hard c0 &&
+	EDITOR=./editor git merge --no-ff --edit c1 &&
+	verify_parents $c0 $c1 &&
+	git cat-file commit HEAD >raw &&
+	grep "work done on the side branch" raw &&
+	sed "1,/^$/d" >actual raw &&
+	test_cmp expected actual
+
+HEAD is now at 88012a2 commit 0
+Merge made by the 'ort' strategy.
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+fatal: Needed a single revision
+Merge work done on the side branch c1
+ok 66 - merge --no-ff --edit
+
+expecting success of 7600.67 'merge annotated/signed tag w/o tracking': 
+	test_when_finished "rm -rf dst; git tag -d anno1" &&
+	git tag -a -m "anno c1" anno1 c1 &&
+	git init dst &&
+	git rev-parse c1 >dst/expect &&
+	(
+		# c0 fast-forwards to c1 but because this repository
+		# is not a "downstream" whose refs/tags follows along
+		# tag from the "upstream", this pull defaults to --no-ff
+		cd dst &&
+		git pull .. c0 &&
+		git pull .. anno1 &&
+		git rev-parse HEAD^2 >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/dst/.git/
+From ..
+ * tag               c0         -> FETCH_HEAD
+From ..
+ * tag               anno1      -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+Deleted tag 'anno1' (was 0a8cfaf)
+ok 67 - merge annotated/signed tag w/o tracking
+
+expecting success of 7600.68 'merge annotated/signed tag w/ tracking': 
+	test_when_finished "rm -rf dst; git tag -d anno1" &&
+	git tag -a -m "anno c1" anno1 c1 &&
+	git init dst &&
+	git rev-parse c1 >dst/expect &&
+	(
+		# c0 fast-forwards to c1 and because this repository
+		# is a "downstream" whose refs/tags follows along
+		# tag from the "upstream", this pull defaults to --ff
+		cd dst &&
+		git remote add origin .. &&
+		git pull origin c0 &&
+		git fetch origin &&
+		git merge anno1 &&
+		git rev-parse HEAD >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/dst/.git/
+From ..
+ * tag               c0         -> FETCH_HEAD
+From ..
+ * [new branch]      c5-branch  -> origin/c5-branch
+ * [new branch]      kid        -> origin/kid
+ * [new branch]      main       -> origin/main
+ * [new tag]         anno1      -> anno1
+ * [new tag]         c0         -> c0
+ * [new tag]         c1         -> c1
+ * [new tag]         c5         -> c5
+ * [new tag]         c3         -> c3
+ * [new tag]         c4         -> c4
+Updating 88012a2..dc8b979
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+Deleted tag 'anno1' (was 0a8cfaf)
+ok 68 - merge annotated/signed tag w/ tracking
+
+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 69 # skip merge --ff-only tag (missing GPG)
+
+ok 70 # skip merge --no-edit tag should skip editor (missing GPG)
+
+expecting success of 7600.71 'set up mod-256 conflict scenario': 
+	# 256 near-identical stanzas...
+	for i in $(test_seq 1 256); do
+		for j in 1 2 3 4 5; do
+			echo $i-$j || return 1
+		done
+	done >file &&
+	git add file &&
+	git commit -m base &&
+
+	# one side changes the first line of each to "main"
+	sed s/-1/-main/ file >tmp &&
+	mv tmp file &&
+	git commit -am main &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/bottom/.git/
-[main (root-commit) 581bdeb] bottom
+	# and the other to "side"; merging the two will
+	# yield 256 separate conflicts
+	git checkout -b side HEAD^ &&
+	sed s/-1/-side/ file >tmp &&
+	mv tmp file &&
+	git commit -am side
+
+[main 94176f0] base
  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.47.2/t/trash directory.t7406-submodule-update/middle/.git/
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/middle/bottom'...
-done.
-[main (root-commit) 8c7b95e] middle
+ 1 file changed, 1280 insertions(+), 9 deletions(-)
+[main 98e62a1] main
  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.47.2/t/trash directory.t7406-submodule-update/top/.git/
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/top/middle'...
-done.
-[main (root-commit) ab8145a] top
+ 1 file changed, 256 insertions(+), 256 deletions(-)
+Switched to a new branch 'side'
+[side aee02fe] side
  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.47.2/t/trash directory.t7406-submodule-update/middle) registered for path 'middle'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/top-clean/middle'...
-done.
-Submodule path 'middle': checked out '8c7b95e494a2782f61ae9299ca15d668e545d9a8'
-Submodule 'bottom' (/build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/bottom) registered for path 'middle/bottom'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/top-clean/middle/bottom'...
-done.
-Submodule path 'middle/bottom': checked out '581bdebe7becb965f64fee4b6315195d6f9b87df'
-ok 62 - setup clean recursive superproject
+ 1 file changed, 256 insertions(+), 256 deletions(-)
+ok 71 - set up mod-256 conflict scenario
 
-expecting success of 7406.63 'submodule update should skip unmerged submodules': 
-	test_when_finished "rm -fr top-cloned" &&
-	cp -r top-clean top-cloned &&
+expecting success of 7600.72 'merge detects mod-256 conflicts (recursive)': 
+	git reset --hard &&
+	test_must_fail git merge -s recursive main
 
-	# 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" &&
+HEAD is now at aee02fe side
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 72 - merge detects mod-256 conflicts (recursive)
 
-	# Create a downstream conflict
-	test_commit -C top-cloned/middle/bottom downstream_commit &&
-	git -C top-cloned/middle add bottom &&
-	git -C top-cloned/middle commit -m "downstream_commit" &&
-	git -C top-cloned/middle fetch --recurse-submodules origin &&
-	test_must_fail git -C top-cloned/middle merge origin/main &&
+expecting success of 7600.73 'merge detects mod-256 conflicts (resolve)': 
+	git reset --hard &&
+	test_must_fail git merge -s resolve 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
+HEAD is now at aee02fe side
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+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 73 - merge detects mod-256 conflicts (resolve)
 
-[main 1214144] upstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream_commit.t
-From /build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/bottom
-   581bdeb..1214144  main            -> origin/main
- * [new tag]         upstream_commit -> upstream_commit
-Note: switching to 'FETCH_HEAD'.
+expecting success of 7600.74 'merge nothing into void': 
+	git init void &&
+	(
+		cd void &&
+		git remote add up .. &&
+		git fetch up &&
+		test_must_fail git merge 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.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/void/.git/
+From ..
+ * [new branch]      c5-branch  -> up/c5-branch
+ * [new branch]      kid        -> up/kid
+ * [new branch]      main       -> up/main
+ * [new branch]      side       -> up/side
+ * [new tag]         c1         -> c1
+ * [new tag]         c5         -> c5
+ * [new tag]         c0         -> c0
+ * [new tag]         c3         -> c3
+ * [new tag]         c4         -> c4
+fatal: FETCH_HEAD - not something we can merge
+ok 74 - merge nothing into void
 
-If you want to 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 7600.75 'merge can be completed with --continue': 
+	git reset --hard c0 &&
+	git merge --no-ff --no-commit c1 &&
+	git merge --continue &&
+	verify_parents $c0 $c1
 
-  git switch -c <new-branch-name>
+HEAD is now at 88012a2 commit 0
+Automatic merge went well; stopped before committing as requested
+[side c2921bd] Merge tag 'c1' into side
+ Author: A U Thor <author@example.com>
+fatal: Needed a single revision
+ok 75 - merge can be completed with --continue
 
-Or undo this operation with:
+expecting success of 7600.76 'killed merge can be completed with --continue': 
+	git reset --hard c0 &&
+	! "$SHELL_PATH" -c '
+	  echo kill -TERM $$ >>.git/FAKE_EDITOR
+	  GIT_EDITOR=.git/FAKE_EDITOR
+	  export GIT_EDITOR
+	  exec git merge --no-ff --edit c1' &&
+	git merge --continue &&
+	verify_parents $c0 $c1
 
-  git switch -
+HEAD is now at 88012a2 commit 0
+Terminated
+[side c2921bd] Merge tag 'c1' into side
+ Author: A U Thor <author@example.com>
+fatal: Needed a single revision
+ok 76 - killed merge can be completed with --continue
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7600.77 'merge --quit': 
+	git init merge-quit &&
+	(
+		cd merge-quit &&
+		test_commit base &&
+		echo one >>base.t &&
+		git commit -am one &&
+		git branch one &&
+		git checkout base &&
+		echo two >>base.t &&
+		git commit -am two &&
+		test_must_fail git -c rerere.enabled=true merge one &&
+		test_path_is_file .git/MERGE_HEAD &&
+		test_path_is_file .git/MERGE_MODE &&
+		test_path_is_file .git/MERGE_MSG &&
+		git rerere status >rerere.before &&
+		git merge --quit &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		test_path_is_missing .git/MERGE_MODE &&
+		test_path_is_missing .git/MERGE_MSG &&
+		git rerere status >rerere.after &&
+		test_must_be_empty rerere.after &&
+		! test_cmp rerere.after rerere.before
+	)
 
-HEAD is now at 1214144 upstream_commit
-[main 02206c0] upstream_commit
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7600-merge/merge-quit/.git/
+[main (root-commit) 814a92b] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/middle
-   8c7b95e..02206c0  main       -> origin/main
-Note: switching to 'FETCH_HEAD'.
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[main cc12456] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'base'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -490125,102 +490358,49 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 02206c0 upstream_commit
-[main 3de434e] upstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 732f4af] downstream_commit
+HEAD is now at 814a92b base
+[detached HEAD 89504c3] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 downstream_commit.t
-[detached HEAD bd1874b] downstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/middle
-   8c7b95e..02206c0  main       -> origin/main
-Fetching submodule bottom
-From /build/reproducible-path/git-2.47.2/t/trash directory.t7406-submodule-update/bottom
-   581bdeb..1214144  main            -> origin/main
- * [new tag]         upstream_commit -> upstream_commit
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (bottom), and either merge commit 1214144
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add bottom
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config advice.submoduleMergeConflict false"
-Failed to merge submodule bottom
-CONFLICT (submodule): Merge conflict in bottom
+Auto-merging base.t
+CONFLICT (content): Merge conflict in base.t
+Recorded preimage for 'base.t'
 Automatic merge failed; fix conflicts and then commit the result.
-Submodule path 'middle': 'true 8c7b95e494a2782f61ae9299ca15d668e545d9a8'
-ok 63 - submodule update should skip unmerged submodules
-
-expecting success of 7406.64 '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 4ad2ba9] downstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 downstream_commit.t
-ok 64 - submodule update --recursive skip submodules with strategy=none
-
-expecting success of 7406.65 'commit with staged submodule change': 
-	add_submodule_commit_and_validate
-
-[main f3de040] create submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-ok 65 - commit with staged submodule change
+--- rerere.after	2025-01-30 02:17:18.622101520 +0000
++++ rerere.before	2025-01-30 02:17:18.586101305 +0000
+@@ -0,0 +1 @@
++base.t
+ok 77 - merge --quit
 
-expecting success of 7406.66 'commit with staged submodule change with ignoreSubmodules dirty': 
-	test_config diff.ignoreSubmodules dirty &&
-	add_submodule_commit_and_validate
+expecting success of 7600.78 'merge suggests matching remote refname': 
+	git commit --allow-empty -m not-local &&
+	git update-ref refs/remotes/origin/not-local HEAD &&
+	git reset --hard HEAD^ &&
 
-[main 9dbf457] create submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 66 - commit with staged submodule change with ignoreSubmodules dirty
+	# This is white-box testing hackery; we happen to know
+	# that reading packed refs is more picky about the memory
+	# ownership of strings we pass to for_each_ref() callbacks.
+	git pack-refs --all --prune &&
 
-expecting success of 7406.67 'commit with staged submodule change with ignoreSubmodules all': 
-	test_config diff.ignoreSubmodules all &&
-	add_submodule_commit_and_validate
+	test_must_fail git merge not-local 2>stderr &&
+	grep origin/not-local stderr
 
-[main 70ee70e] create submodule
+[side 42f3c70] not-local
  Author: A U Thor <author@example.com>
-ok 67 - commit with staged submodule change with ignoreSubmodules all
-
-checking prerequisite: CASE_INSENSITIVE_FS
+HEAD is now at c2921bd Merge tag 'c1' into side
+	origin/not-local
+ok 78 - merge suggests matching remote refname
 
-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 7600.79 'suggested names are not ambiguous': 
+	git update-ref refs/heads/origin/not-local HEAD &&
+	test_must_fail git merge not-local 2>stderr &&
+	grep remotes/origin/not-local stderr
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 68 # skip submodule paths must not follow symlinks (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,SYMLINKS)
+	remotes/origin/not-local
+ok 79 - suggested names are not ambiguous
 
-# passed all 68 test(s)
-1..68
+# passed all 79 test(s)
+1..79
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7703-repack-geometric.sh ***
@@ -491157,8 +491337,8 @@
 
 Your branch is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)
---- shared-objects	2026-03-04 08:03:04.375352315 +0000
-+++ member-objects	2026-03-04 08:03:04.411352315 +0000
+--- shared-objects	2025-01-30 02:17:18.718102096 +0000
++++ member-objects	2025-01-30 02:17:18.770102408 +0000
 @@ -1,3 +1,3 @@
 -04646a23dde207060dc8a802fc9bd5d3c2c976bd
 -a0054e492840f572e48a3cb791d2e083afaf08f6
@@ -491268,202 +491448,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7811-grep-open.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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"
-
-ok 1 - determine default pager
-
-expecting success of 7811.2 'setup': 
-	test_commit initial grep.h "
-enum grep_pat_token {
-	GREP_PATTERN,
-	GREP_PATTERN_HEAD,
-	GREP_PATTERN_BODY,
-	GREP_AND,
-	GREP_OPEN_PAREN,
-	GREP_CLOSE_PAREN,
-	GREP_NOT,
-	GREP_OR,
-};" &&
-
-	test_commit add-user revision.c "
-	}
-	if (seen_dashdash)
-		read_pathspec_from_stdin(revs, &sb, prune);
-	strbuf_release(&sb);
-}
-
-static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
-{
-	append_grep_pattern(&revs->grep_filter, ptn, \"command line\", 0, what);
-" &&
-
-	mkdir subdir &&
-	test_commit subdir subdir/grep.c "enum grep_pat_token" &&
-
-	test_commit uninteresting unrelated "hello, world" &&
-
-	echo GREP_PATTERN >untracked
-
-[master (root-commit) 6a780d2] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 grep.h
-[master 7eeae3c] add-user
- Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 revision.c
-[master 22c3f1e] subdir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/grep.c
-[master cd972f3] uninteresting
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated
-ok 2 - setup
-
-expecting success of 7811.3 'git grep -O': 
-	cat >$less <<-\EOF &&
-	#!/bin/sh
-	printf "%s\n" "$@" >pager-args
-	EOF
-	chmod +x $less &&
-	cat >expect.less <<-\EOF &&
-	+/*GREP_PATTERN
-	grep.h
-	EOF
-	echo grep.h >expect.notless &&
-
-	PATH=.:$PATH git grep -O GREP_PATTERN >out &&
-	{
-		test_cmp expect.less pager-args ||
-		test_cmp expect.notless pager-args
-	} &&
-	test_must_be_empty out
-
---- expect.less	2026-03-04 08:03:05.495352315 +0000
-+++ pager-args	2026-03-04 08:03:05.519352315 +0000
-@@ -1,2 +1 @@
--+/*GREP_PATTERN
- grep.h
-ok 3 - git grep -O
-
-expecting success of 7811.4 'git grep -O --cached': 
-	test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
-	test_grep open-files-in-pager msg
-
-fatal: --open-files-in-pager only works on the worktree
-ok 4 - git grep -O --cached
-
-expecting success of 7811.5 'git grep -O --no-index': 
-	rm -f expect.less pager-args out &&
-	cat >expect <<-\EOF &&
-	grep.h
-	untracked
-	EOF
-
-	(
-		GIT_PAGER='printf "%s\n" >pager-args' &&
-		export GIT_PAGER &&
-		git grep --no-index -O GREP_PATTERN >out
-	) &&
-	test_cmp expect pager-args &&
-	test_must_be_empty out
-
-ok 5 - git grep -O --no-index
-
-expecting success of 7811.6 'setup: fake "less"': 
-	cat >less <<-\EOF &&
-	#!/bin/sh
-	printf "%s\n" "$@" >actual
-	EOF
-	chmod +x less
-
-ok 6 - setup: fake "less"
-
-expecting success of 7811.7 'git grep -O jumps to line in less': 
-	cat >expect <<-\EOF &&
-	+/*GREP_PATTERN
-	grep.h
-	EOF
-
-	GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
-	test_cmp expect actual &&
-	test_must_be_empty out &&
-
-	git grep -O./less GREP_PATTERN >out2 &&
-	test_cmp expect actual &&
-	test_must_be_empty out2
-
-ok 7 - git grep -O jumps to line in less
-
-expecting success of 7811.8 'modified file': 
-	rm -f actual &&
-	cat >expect <<-\EOF &&
-	+/*enum grep_pat_token
-	grep.h
-	revision.c
-	subdir/grep.c
-	unrelated
-	EOF
-
-	test_when_finished "git reset --hard" &&
-	echo "enum grep_pat_token" >unrelated &&
-	GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
-	test_cmp expect actual &&
-	test_must_be_empty out
-
-HEAD is now at cd972f3 uninteresting
-ok 8 - modified file
-
-expecting success of 7811.9 'copes with color settings': 
-	rm -f actual &&
-	echo grep.h >expect &&
-	test_config color.grep always &&
-	test_config color.grep.filename yellow &&
-	test_config color.grep.separator green &&
-	git grep -O'printf "%s\n" >actual' GREP_AND &&
-	test_cmp expect actual
-
-ok 9 - copes with color settings
-
-expecting success of 7811.10 'run from subdir': 
-	rm -f actual &&
-	echo grep.c >expect &&
-
-	(
-		cd subdir &&
-		export GIT_PAGER &&
-		GIT_PAGER='printf "%s\n" >../args' &&
-		git grep -O "enum grep_pat_token" >../out &&
-		git grep -O"pwd >../dir; :" "enum grep_pat_token" >../out2
-	) &&
-	case $(cat dir) in
-	*subdir)
-		: good
-		;;
-	*)
-		false
-		;;
-	esac &&
-	test_cmp expect args &&
-	test_must_be_empty out &&
-	test_must_be_empty out2
-
-ok 10 - run from subdir
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7812-grep-icase-non-ascii.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7812-grep-icase-non-ascii/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -491836,8 +491820,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-4f336f3df31054eabc05ac05f98bc024c8e05423 1772611381
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1772611381
+4f336f3df31054eabc05ac05f98bc024c8e05423 1738203434
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1738203434
 ok 3 - --max-cruft-size creates new packs when above threshold
 
 expecting success of 7704.4 '--max-cruft-size combines existing packs when below threshold': 
@@ -491865,8 +491849,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-4f336f3df31054eabc05ac05f98bc024c8e05423 1772611382
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1772611382
+4f336f3df31054eabc05ac05f98bc024c8e05423 1738203435
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1738203435
 ok 4 - --max-cruft-size combines existing packs when below threshold
 
 expecting success of 7704.5 '--max-cruft-size combines smaller packs first': 
@@ -492439,8 +492423,6 @@
 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
@@ -492496,8 +492478,6 @@
 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': 
@@ -492531,8 +492511,6 @@
 
 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': 
@@ -493397,8 +493375,8 @@
 
 Nothing new to pack.
 Nothing new to pack.
---- before	2026-03-04 08:03:07.551352315 +0000
-+++ after	2026-03-04 08:03:07.743352315 +0000
+--- before	2025-01-30 02:17:23.542131028 +0000
++++ after	2025-01-30 02:17:23.830132756 +0000
 @@ -1 +1 @@
 -8cd3b9bb7db0d633144114a81b7374e6a2b1b22c
 +3d2725684b43b31e3b81e5070d1847c9f1e2cf00
@@ -493664,6 +493642,2199 @@
 1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7112-reset-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/.git/
+expecting success of 7112.1 'git reset --keep --recurse-submodules: added submodule is checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 1 - git reset --keep --recurse-submodules: added submodule is checked out
+
+expecting success of 7112.2 'git reset --keep --recurse-submodules: added submodule is checked out in empty dir': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 2 - git reset --keep --recurse-submodules: added submodule is checked out in empty dir
+
+expecting success of 7112.3 'git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+ok 3 - git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule
+
+expecting success of 7112.4 'git reset --keep --recurse-submodules: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+ok 4 - git reset --keep --recurse-submodules: replace directory with submodule
+
+expecting success of 7112.5 'git reset --keep --recurse-submodules: nested submodules are checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 5 - git reset --keep --recurse-submodules: nested submodules are checked out
+
+expecting success of 7112.6 'git reset --keep --recurse-submodules: removed submodule removes submodules working tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+ok 6 - git reset --keep --recurse-submodules: removed submodule removes submodules working tree
+
+expecting success of 7112.7 'git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
+ok 7 - git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory
+
+expecting success of 7112.8 'git reset --keep --recurse-submodules: replace submodule with a file': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 8 - git reset --keep --recurse-submodules: replace submodule with a file
+
+checking known breakage of 7112.9 'git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/untrackedfile &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test -f sub1/untracked_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --keep --recurse-submodules replace_sub1_with_file
+not ok 9 - git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+
+expecting success of 7112.10 'git reset --keep --recurse-submodules: worktrees of nested submodules are removed': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t no_submodule origin/no_submodule &&
+			$command no_submodule &&
+			test_superproject_content origin/no_submodule &&
+			test_path_is_missing sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
+			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+ok 10 - git reset --keep --recurse-submodules: worktrees of nested submodules are removed
+
+expecting success of 7112.11 'git reset --keep --recurse-submodules: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 11 - git reset --keep --recurse-submodules: modified submodule updates submodule work tree
+
+expecting success of 7112.12 'git reset --keep --recurse-submodules: updating to a missing submodule commit fails': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			test_must_fail $command invalid_sub1 2>err &&
+			test_grep sub1 err &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+fatal: Could not reset index file to revision 'invalid_sub1'.
+ok 12 - git reset --keep --recurse-submodules: updating to a missing submodule commit fails
+
+expecting success of 7112.13 'git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git -C sub1 checkout -b keep_branch &&
+			git -C sub1 rev-parse HEAD >expect &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1 &&
+			git -C sub1 rev-parse keep_branch >actual &&
+			test_cmp expect actual &&
+			test_must_fail git -C sub1 symbolic-ref HEAD
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Switched to a new branch 'keep_branch'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+fatal: ref HEAD is not a symbolic ref
+ok 13 - git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead
+
+expecting success of 7112.14 'git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			: >sub1 &&
+			test_must_fail $command add_sub1 &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'add_sub1'.
+ok 14 - git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name
+
+expecting success of 7112.15 'git reset --keep --recurse-submodules: added submodule removes an untracked ignored file': 
+		test_when_finished "rm -rf submodule_update/.git/info" &&
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			: >sub1 &&
+			mkdir .git/info &&
+			echo sub1 >.git/info/exclude &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 15 - git reset --keep --recurse-submodules: added submodule removes an untracked ignored file
+
+checking known breakage of 7112.16 'git reset --keep --recurse-submodules: replace submodule with a directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_submodule_content sub1 origin/replace_sub1_with_directory
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+not ok 16 - git reset --keep --recurse-submodules: replace submodule with a directory # TODO known breakage
+
+checking known breakage of 7112.17 'git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+not ok 17 - git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
+
+expecting success of 7112.18 'git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule': 
+		test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			rm -rf .git/modules/sub1/info &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			mkdir .git/modules/sub1/info &&
+			echo ignored >.git/modules/sub1/info/exclude &&
+			: >sub1/ignored &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 18 - git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
+
+expecting success of 7112.19 'git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			git -c submodule.recurse=true $cmd_args modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 19 - git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree
+
+expecting success of 7112.20 'git reset --keep --recurse-submodules: modified submodule updates submodule recursively': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 20 - git reset --keep --recurse-submodules: modified submodule updates submodule recursively
+
+expecting success of 7112.21 'git reset --hard --recurse-submodules: added submodule is checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 21 - git reset --hard --recurse-submodules: added submodule is checked out
+
+expecting success of 7112.22 'git reset --hard --recurse-submodules: added submodule is checked out in empty dir': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 22 - git reset --hard --recurse-submodules: added submodule is checked out in empty dir
+
+expecting success of 7112.23 'git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
+ok 23 - git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule
+
+expecting success of 7112.24 'git reset --hard --recurse-submodules: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
+ok 24 - git reset --hard --recurse-submodules: replace directory with submodule
+
+expecting success of 7112.25 'git reset --hard --recurse-submodules: nested submodules are checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+HEAD is now at 953e869 update sub1, that updates nested sub
+ok 25 - git reset --hard --recurse-submodules: nested submodules are checked out
+
+expecting success of 7112.26 'git reset --hard --recurse-submodules: removed submodule removes submodules working tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 26 - git reset --hard --recurse-submodules: removed submodule removes submodules working tree
+
+expecting success of 7112.27 'git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 27 - git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory
+
+expecting success of 7112.28 'git reset --hard --recurse-submodules: replace submodule with a file': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+ok 28 - git reset --hard --recurse-submodules: replace submodule with a file
+
+checking known breakage of 7112.29 'git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/untrackedfile &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test -f sub1/untracked_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+test_must_fail: command succeeded: git reset --hard --recurse-submodules replace_sub1_with_file
+not ok 29 - git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+
+expecting success of 7112.30 'git reset --hard --recurse-submodules: worktrees of nested submodules are removed': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t no_submodule origin/no_submodule &&
+			$command no_submodule &&
+			test_superproject_content origin/no_submodule &&
+			test_path_is_missing sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
+			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+HEAD is now at 27611a5 Base
+ok 30 - git reset --hard --recurse-submodules: worktrees of nested submodules are removed
+
+expecting success of 7112.31 'git reset --hard --recurse-submodules: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+ok 31 - git reset --hard --recurse-submodules: modified submodule updates submodule work tree
+
+expecting success of 7112.32 'git reset --hard --recurse-submodules: updating to a missing submodule commit fails': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			test_must_fail $command invalid_sub1 2>err &&
+			test_grep sub1 err &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+fatal: Could not reset index file to revision 'invalid_sub1'.
+ok 32 - git reset --hard --recurse-submodules: updating to a missing submodule commit fails
+
+expecting success of 7112.33 'git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git -C sub1 checkout -b keep_branch &&
+			git -C sub1 rev-parse HEAD >expect &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1 &&
+			git -C sub1 rev-parse keep_branch >actual &&
+			test_cmp expect actual &&
+			test_must_fail git -C sub1 symbolic-ref HEAD
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Switched to a new branch 'keep_branch'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+fatal: ref HEAD is not a symbolic ref
+ok 33 - git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead
+
+expecting success of 7112.34 'git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 34 - git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
+
+expecting success of 7112.35 'git reset --hard --recurse-submodules: replace submodule with a directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+HEAD is now at cb28587 Replace sub1 with directory
+ok 35 - git reset --hard --recurse-submodules: replace submodule with a directory
+
+expecting success of 7112.36 'git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules/sub1 &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
+HEAD is now at cb28587 Replace sub1 with directory
+ok 36 - git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail
+
+expecting success of 7112.37 'git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/expect &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+ok 37 - git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files
+
+expecting success of 7112.38 'git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to_interested invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+HEAD is now at 3036e4e Revert "Invalid sub1 commit"
+ok 38 - git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit
+
+expecting success of 7112.39 'git reset --hard --recurse-submodules: updating submodules fixes .git links': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			echo "gitdir: bogus/path" >sub1/.git &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+ok 39 - git reset --hard --recurse-submodules: updating submodules fixes .git links
+
+expecting success of 7112.40 'git reset --hard --recurse-submodules: changed submodule worktree is reset': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			rm sub1/file1 &&
+			: >sub1/new_file &&
+			git -C sub1 add new_file &&
+			$command HEAD &&
+			test_path_is_file sub1/file1 &&
+			test_path_is_missing sub1/new_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+HEAD is now at 09bcf53 Add sub1
+ok 40 - git reset --hard --recurse-submodules: changed submodule worktree is reset
+
+expecting success of 7112.41 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 41 - git_test_func: added submodule creates empty directory
+
+expecting success of 7112.42 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 42 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 7112.43 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 43 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 7112.44 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 44 - git_test_func: replace directory with submodule
+
+expecting success of 7112.45 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 45 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 7112.46 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 46 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 7112.47 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 47 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 7112.48 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 48 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 7112.49 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
+not ok 49 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 7112.50 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
+not ok 50 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 7112.51 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 51 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 7112.52 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 52 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 7112.53 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 53 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 7112.54 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'add_sub1'.
+ok 54 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 7112.55 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 55 - git_test_func: added submodule creates empty directory
+
+expecting success of 7112.56 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 56 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 7112.57 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 57 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 7112.58 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 58 - git_test_func: replace directory with submodule
+
+expecting success of 7112.59 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 59 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 7112.60 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 60 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 7112.61 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 61 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 7112.62 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 62 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 7112.63 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
+not ok 63 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 7112.64 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
+not ok 64 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 7112.65 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 65 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 7112.66 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 66 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 7112.67 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 67 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 7112.68 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'add_sub1'.
+ok 68 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 7112.69 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 69 - git_test_func: added submodule creates empty directory
+
+expecting success of 7112.70 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 70 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 7112.71 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 71 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 7112.72 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 72 - git_test_func: replace directory with submodule
+
+expecting success of 7112.73 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 73 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 7112.74 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 74 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+checking known breakage of 7112.75 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at cb28587 Replace sub1 with directory
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
+not ok 75 - git_test_func: replace submodule with a directory must fail # TODO known breakage
+
+checking known breakage of 7112.76 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at cb28587 Replace sub1 with directory
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
+not ok 76 - git_test_func: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+
+checking known breakage of 7112.77 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
+not ok 77 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 7112.78 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
+not ok 78 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 7112.79 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 79 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 7112.80 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+HEAD is now at e6169bf Invalid sub1 commit
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 80 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 7112.81 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+HEAD is now at 3036e4e Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 81 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 7112.82 'git_test_func: added submodule does remove untracked unignored file with same name when forced': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 82 - git_test_func: added submodule does remove untracked unignored file with same name when forced
+
+# still have 12 known breakage(s)
+# passed all remaining 70 test(s)
+1..82
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t7609-mergetool--lib.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7609-mergetool--lib/.git/
+expecting success of 7609.1 'mergetool --tool=vimdiff creates the expected layout': 
+	. "$GIT_BUILD_DIR"/mergetools/vimdiff &&
+	run_unit_tests
+
+Test Case #01: OK
+Test Case #02: OK
+Test Case #03: OK
+Test Case #04: OK
+Test Case #05: OK
+Test Case #06: OK
+Test Case #07: OK
+Test Case #08: OK
+Test Case #09: OK
+Test Case #10: OK
+Test Case #11: OK
+Test Case #12: OK
+Test Case #13: OK
+Test Case #14: OK
+Test Case #15: OK
+Test Case #16: OK
+ok 1 - mergetool --tool=vimdiff creates the expected layout
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7508-status.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7508-status/.git/
 expecting success of 7508.1 'status -h in broken repository': 
@@ -495204,8 +497375,8 @@
 	git -c status.branch=true status -s >actual &&
 	! test_cmp expected_nobranch actual
 
---- expected_nobranch	2026-03-04 08:03:04.731352315 +0000
-+++ actual	2026-03-04 08:03:04.759352315 +0000
+--- expected_nobranch	2025-01-30 02:17:21.042116035 +0000
++++ actual	2025-01-30 02:17:21.066116178 +0000
 @@ -1,2 +1,3 @@
 +## main...upstream [ahead 2, behind 2]
   M dir1/modified
@@ -495309,2525 +497480,332 @@
 	git status --show-stash >expected_with_stash &&
 	test_grep "^Your stash currently has 1 entry$" expected_with_stash
 
-HEAD is now at 45c17dd message
-Saved working directory and index state WIP on main: 45c17dd message
-Your stash currently has 1 entry
-ok 109 - show stash info with "--show-stash"
-
-expecting success of 7508.110 'no stash info with "--show-stash --no-show-stash"': 
-	git status --show-stash --no-show-stash >expected_without_stash &&
-	test_cmp expected_default expected_without_stash
-
-ok 110 - no stash info with "--show-stash --no-show-stash"
-
-expecting success of 7508.111 '"status.showStash=false" weaker than "--show-stash"': 
-	git -c status.showStash=false status --show-stash >actual &&
-	test_cmp expected_with_stash actual
-
-ok 111 - "status.showStash=false" weaker than "--show-stash"
-
-expecting success of 7508.112 '"status.showStash=true" weaker than "--no-show-stash"': 
-	git -c status.showStash=true status --no-show-stash >actual &&
-	test_cmp expected_without_stash actual
-
-ok 112 - "status.showStash=true" weaker than "--no-show-stash"
-
-expecting success of 7508.113 'no additional info if no stash entries': 
-	git stash clear &&
-	git -c status.showStash=true status >actual &&
-	test_cmp expected_without_stash actual
-
-ok 113 - no additional info if no stash entries
-
-expecting success of 7508.114 '"No commits yet" should be noted in status output': 
-	git checkout --orphan empty-branch-1 &&
-	git status >output &&
-	test_grep "No commits yet" output
-
-Switched to a new branch 'empty-branch-1'
-No commits yet
-ok 114 - "No commits yet" should be noted in status output
-
-expecting success of 7508.115 '"No commits yet" should not be noted in status output': 
-	git checkout --orphan empty-branch-2 &&
-	test_commit test-commit-1 &&
-	git status >output &&
-	test_grep ! "No commits yet" output
-
-Switched to a new branch 'empty-branch-2'
-[empty-branch-2 (root-commit) f194efb] test-commit-1
- Author: A U Thor <author@example.com>
- 10 files changed, 7 insertions(+)
- create mode 100644 .gitconfig
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 dir2/added
- create mode 100644 modified
- create mode 160000 sm
- create mode 100644 test-commit-1.t
- create mode 100644 tracked
- create mode 100644 upstream1.t
- create mode 100644 upstream2.t
-ok 115 - "No commits yet" should not be noted in status output
-
-expecting success of 7508.116 '"Initial commit" should be noted in commit template': 
-	git checkout --orphan empty-branch-3 &&
-	touch to_be_committed_1 &&
-	git add to_be_committed_1 &&
-	git commit --dry-run >output &&
-	test_grep "Initial commit" output
-
-Switched to a new branch 'empty-branch-3'
-Initial commit
-ok 116 - "Initial commit" should be noted in commit template
-
-expecting success of 7508.117 '"Initial commit" should not be noted in commit template': 
-	git checkout --orphan empty-branch-4 &&
-	test_commit test-commit-2 &&
-	touch to_be_committed_2 &&
-	git add to_be_committed_2 &&
-	git commit --dry-run >output &&
-	test_grep ! "Initial commit" output
-
-Switched to a new branch 'empty-branch-4'
-[empty-branch-4 (root-commit) 92016e1] test-commit-2
- Author: A U Thor <author@example.com>
- 12 files changed, 8 insertions(+)
- create mode 100644 .gitconfig
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 dir2/added
- create mode 100644 modified
- create mode 160000 sm
- create mode 100644 test-commit-1.t
- create mode 100644 test-commit-2.t
- create mode 100644 to_be_committed_1
- create mode 100644 tracked
- create mode 100644 upstream1.t
- create mode 100644 upstream2.t
-ok 117 - "Initial commit" should not be noted in commit template
-
-expecting success of 7508.118 '--no-optional-locks prevents index update': 
-	test_set_magic_mtime .git/index &&
-	git --no-optional-locks status &&
-	test_is_magic_mtime .git/index &&
-	git status &&
-	! test_is_magic_mtime .git/index
-
-On branch empty-branch-4
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   to_be_committed_2
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-On branch empty-branch-4
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   to_be_committed_2
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
---- .git/test-mtime-expect	2026-03-04 08:03:13.219352315 +0000
-+++ .git/test-mtime-actual	2026-03-04 08:03:13.227352315 +0000
-@@ -1 +1 @@
--1234567890
-+1772611392
-ok 118 - --no-optional-locks prevents index update
-
-expecting success of 7508.119 'racy timestamps will be fixed for clean worktree': 
-	echo content >racy-dirty &&
-	echo content >racy-racy &&
-	git add racy* &&
-	git commit -m "racy test files" &&
-	# let status rewrite the index, if necessary; after that we expect
-	# no more index writes unless caused by racy timestamps; note that
-	# timestamps may already be racy now (depending on previous tests)
-	git status &&
-	test_set_magic_mtime .git/index &&
-	git status &&
-	! test_is_magic_mtime .git/index
-
-[empty-branch-4 1041e20] racy test files
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 racy-dirty
- create mode 100644 racy-racy
- create mode 100644 to_be_committed_2
-On branch empty-branch-4
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-nothing added to commit but untracked files present (use "git add" to track)
-On branch empty-branch-4
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-nothing added to commit but untracked files present (use "git add" to track)
---- .git/test-mtime-expect	2026-03-04 08:03:14.479352315 +0000
-+++ .git/test-mtime-actual	2026-03-04 08:03:14.499352315 +0000
-@@ -1 +1 @@
--1234567890
-+1772611393
-ok 119 - racy timestamps will be fixed for clean worktree
-
-expecting success of 7508.120 'racy timestamps will be fixed for dirty worktree': 
-	echo content2 >racy-dirty &&
-	git status &&
-	test_set_magic_mtime .git/index &&
-	git status &&
-	! test_is_magic_mtime .git/index
-
-On branch empty-branch-4
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   racy-dirty
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-no changes added to commit (use "git add" and/or "git commit -a")
-On branch empty-branch-4
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   racy-dirty
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-no changes added to commit (use "git add" and/or "git commit -a")
---- .git/test-mtime-expect	2026-03-04 08:03:15.659352315 +0000
-+++ .git/test-mtime-actual	2026-03-04 08:03:15.671352315 +0000
-@@ -1 +1 @@
--1234567890
-+1772611395
-ok 120 - racy timestamps will be fixed for dirty worktree
-
-expecting success of 7508.121 'setup slow status advice': 
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main git init slowstatus &&
-	(
-		cd slowstatus &&
-		cat >.gitignore <<-\EOF &&
-		/actual
-		/expected
-		/out
-		EOF
-		git add .gitignore &&
-		git commit -m "Add .gitignore" &&
-		git config advice.statusuoption true
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7508-status/slowstatus/.git/
-[main (root-commit) 557fde8] Add .gitignore
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 .gitignore
-ok 121 - setup slow status advice
-
-expecting success of 7508.122 'slow status advice when core.untrackedCache and fsmonitor are unset': 
-	(
-		cd slowstatus &&
-		git config core.untrackedCache false &&
-		git config core.fsmonitor false &&
-		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
-		cat >expected <<-\EOF &&
-		On branch main
-
-		It took 3.25 seconds to enumerate untracked files.
-		See 'git help status' for information on how to improve this.
-
-		nothing to commit, working tree clean
-		EOF
-		test_cmp expected actual
-	)
-
-ok 122 - slow status advice when core.untrackedCache and fsmonitor are unset
-
-expecting success of 7508.123 'slow status advice when core.untrackedCache true, but not fsmonitor': 
-	(
-		cd slowstatus &&
-		git config core.untrackedCache true &&
-		git config core.fsmonitor false &&
-		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
-		cat >expected <<-\EOF &&
-		On branch main
-
-		It took 3.25 seconds to enumerate untracked files.
-		See 'git help status' for information on how to improve this.
-
-		nothing to commit, working tree clean
-		EOF
-		test_cmp expected actual
-	)
-
-ok 123 - slow status advice when core.untrackedCache true, but not fsmonitor
-
-expecting success of 7508.124 'slow status advice when core.untrackedCache true, and fsmonitor': 
-	(
-		cd slowstatus &&
-		git config core.untrackedCache true &&
-		git config core.fsmonitor true &&
-		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
-		cat >expected <<-\EOF &&
-		On branch main
-
-		It took 3.25 seconds to enumerate untracked files,
-		but the results were cached, and subsequent runs may be faster.
-		See 'git help status' for information on how to improve this.
-
-		nothing to commit, working tree clean
-		EOF
-		test_cmp expected actual
-	)
-
-ok 124 - slow status advice when core.untrackedCache true, and fsmonitor
-
-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 125 # skip status does not re-read unchanged 4 or 8 GiB file (missing EXPENSIVE)
-
-# passed all 125 test(s)
-1..125
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7112-reset-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/.git/
-expecting success of 7112.1 'git reset --keep --recurse-submodules: added submodule is checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 1 - git reset --keep --recurse-submodules: added submodule is checked out
-
-expecting success of 7112.2 'git reset --keep --recurse-submodules: added submodule is checked out in empty dir': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 2 - git reset --keep --recurse-submodules: added submodule is checked out in empty dir
-
-expecting success of 7112.3 'git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-ok 3 - git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule
-
-expecting success of 7112.4 'git reset --keep --recurse-submodules: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-ok 4 - git reset --keep --recurse-submodules: replace directory with submodule
-
-expecting success of 7112.5 'git reset --keep --recurse-submodules: nested submodules are checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-ok 5 - git reset --keep --recurse-submodules: nested submodules are checked out
-
-expecting success of 7112.6 'git reset --keep --recurse-submodules: removed submodule removes submodules working tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-ok 6 - git reset --keep --recurse-submodules: removed submodule removes submodules working tree
-
-expecting success of 7112.7 'git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-ok 7 - git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory
-
-expecting success of 7112.8 'git reset --keep --recurse-submodules: replace submodule with a file': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 8 - git reset --keep --recurse-submodules: replace submodule with a file
-
-checking known breakage of 7112.9 'git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/untrackedfile &&
-			test_must_fail $command replace_sub1_with_file &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test -f sub1/untracked_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --keep --recurse-submodules replace_sub1_with_file
-not ok 9 - git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
-
-expecting success of 7112.10 'git reset --keep --recurse-submodules: worktrees of nested submodules are removed': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t no_submodule origin/no_submodule &&
-			$command no_submodule &&
-			test_superproject_content origin/no_submodule &&
-			test_path_is_missing sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
-			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-ok 10 - git reset --keep --recurse-submodules: worktrees of nested submodules are removed
-
-expecting success of 7112.11 'git reset --keep --recurse-submodules: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 11 - git reset --keep --recurse-submodules: modified submodule updates submodule work tree
-
-expecting success of 7112.12 'git reset --keep --recurse-submodules: updating to a missing submodule commit fails': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			test_must_fail $command invalid_sub1 2>err &&
-			test_grep sub1 err &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-fatal: Could not reset index file to revision 'invalid_sub1'.
-ok 12 - git reset --keep --recurse-submodules: updating to a missing submodule commit fails
-
-expecting success of 7112.13 'git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git -C sub1 checkout -b keep_branch &&
-			git -C sub1 rev-parse HEAD >expect &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1 &&
-			git -C sub1 rev-parse keep_branch >actual &&
-			test_cmp expect actual &&
-			test_must_fail git -C sub1 symbolic-ref HEAD
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Switched to a new branch 'keep_branch'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-fatal: ref HEAD is not a symbolic ref
-ok 13 - git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead
-
-expecting success of 7112.14 'git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			: >sub1 &&
-			test_must_fail $command add_sub1 &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'add_sub1'.
-ok 14 - git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name
-
-expecting success of 7112.15 'git reset --keep --recurse-submodules: added submodule removes an untracked ignored file': 
-		test_when_finished "rm -rf submodule_update/.git/info" &&
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			: >sub1 &&
-			mkdir .git/info &&
-			echo sub1 >.git/info/exclude &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 15 - git reset --keep --recurse-submodules: added submodule removes an untracked ignored file
-
-checking known breakage of 7112.16 'git reset --keep --recurse-submodules: replace submodule with a directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_submodule_content sub1 origin/replace_sub1_with_directory
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-not ok 16 - git reset --keep --recurse-submodules: replace submodule with a directory # TODO known breakage
-
-checking known breakage of 7112.17 'git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-not ok 17 - git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
-
-expecting success of 7112.18 'git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule': 
-		test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			rm -rf .git/modules/sub1/info &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			mkdir .git/modules/sub1/info &&
-			echo ignored >.git/modules/sub1/info/exclude &&
-			: >sub1/ignored &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 18 - git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
-
-expecting success of 7112.19 'git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			git -c submodule.recurse=true $cmd_args modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 19 - git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree
-
-expecting success of 7112.20 'git reset --keep --recurse-submodules: modified submodule updates submodule recursively': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-ok 20 - git reset --keep --recurse-submodules: modified submodule updates submodule recursively
-
-expecting success of 7112.21 'git reset --hard --recurse-submodules: added submodule is checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 21 - git reset --hard --recurse-submodules: added submodule is checked out
-
-expecting success of 7112.22 'git reset --hard --recurse-submodules: added submodule is checked out in empty dir': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 22 - git reset --hard --recurse-submodules: added submodule is checked out in empty dir
-
-expecting success of 7112.23 'git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
-ok 23 - git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule
-
-expecting success of 7112.24 'git reset --hard --recurse-submodules: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
-ok 24 - git reset --hard --recurse-submodules: replace directory with submodule
-
-expecting success of 7112.25 'git reset --hard --recurse-submodules: nested submodules are checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-HEAD is now at 953e869 update sub1, that updates nested sub
-ok 25 - git reset --hard --recurse-submodules: nested submodules are checked out
-
-expecting success of 7112.26 'git reset --hard --recurse-submodules: removed submodule removes submodules working tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 26 - git reset --hard --recurse-submodules: removed submodule removes submodules working tree
-
-expecting success of 7112.27 'git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 27 - git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory
-
-expecting success of 7112.28 'git reset --hard --recurse-submodules: replace submodule with a file': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-ok 28 - git reset --hard --recurse-submodules: replace submodule with a file
-
-checking known breakage of 7112.29 'git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/untrackedfile &&
-			test_must_fail $command replace_sub1_with_file &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test -f sub1/untracked_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-test_must_fail: command succeeded: git reset --hard --recurse-submodules replace_sub1_with_file
-not ok 29 - git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
-
-expecting success of 7112.30 'git reset --hard --recurse-submodules: worktrees of nested submodules are removed': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t no_submodule origin/no_submodule &&
-			$command no_submodule &&
-			test_superproject_content origin/no_submodule &&
-			test_path_is_missing sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
-			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-HEAD is now at 27611a5 Base
-ok 30 - git reset --hard --recurse-submodules: worktrees of nested submodules are removed
-
-expecting success of 7112.31 'git reset --hard --recurse-submodules: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-ok 31 - git reset --hard --recurse-submodules: modified submodule updates submodule work tree
-
-expecting success of 7112.32 'git reset --hard --recurse-submodules: updating to a missing submodule commit fails': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			test_must_fail $command invalid_sub1 2>err &&
-			test_grep sub1 err &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-fatal: Could not reset index file to revision 'invalid_sub1'.
-ok 32 - git reset --hard --recurse-submodules: updating to a missing submodule commit fails
-
-expecting success of 7112.33 'git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git -C sub1 checkout -b keep_branch &&
-			git -C sub1 rev-parse HEAD >expect &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1 &&
-			git -C sub1 rev-parse keep_branch >actual &&
-			test_cmp expect actual &&
-			test_must_fail git -C sub1 symbolic-ref HEAD
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Switched to a new branch 'keep_branch'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-fatal: ref HEAD is not a symbolic ref
-ok 33 - git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead
-
-expecting success of 7112.34 'git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 34 - git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
-
-expecting success of 7112.35 'git reset --hard --recurse-submodules: replace submodule with a directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-HEAD is now at cb28587 Replace sub1 with directory
-ok 35 - git reset --hard --recurse-submodules: replace submodule with a directory
-
-expecting success of 7112.36 'git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules/sub1 &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-HEAD is now at cb28587 Replace sub1 with directory
-ok 36 - git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail
-
-expecting success of 7112.37 'git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/expect &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-ok 37 - git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files
-
-expecting success of 7112.38 'git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to_interested invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-HEAD is now at 3036e4e Revert "Invalid sub1 commit"
-ok 38 - git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit
-
-expecting success of 7112.39 'git reset --hard --recurse-submodules: updating submodules fixes .git links': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			echo "gitdir: bogus/path" >sub1/.git &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-ok 39 - git reset --hard --recurse-submodules: updating submodules fixes .git links
-
-expecting success of 7112.40 'git reset --hard --recurse-submodules: changed submodule worktree is reset': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			rm sub1/file1 &&
-			: >sub1/new_file &&
-			git -C sub1 add new_file &&
-			$command HEAD &&
-			test_path_is_file sub1/file1 &&
-			test_path_is_missing sub1/new_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-HEAD is now at 09bcf53 Add sub1
-ok 40 - git reset --hard --recurse-submodules: changed submodule worktree is reset
+HEAD is now at 45c17dd message
+Saved working directory and index state WIP on main: 45c17dd message
+Your stash currently has 1 entry
+ok 109 - show stash info with "--show-stash"
 
-expecting success of 7112.41 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 41 - git_test_func: added submodule creates empty directory
+expecting success of 7508.110 'no stash info with "--show-stash --no-show-stash"': 
+	git status --show-stash --no-show-stash >expected_without_stash &&
+	test_cmp expected_default expected_without_stash
 
-expecting success of 7112.42 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 42 - git_test_func: added submodule leaves existing empty directory alone
+ok 110 - no stash info with "--show-stash --no-show-stash"
 
-expecting success of 7112.43 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 43 - git_test_func: replace tracked file with submodule creates empty directory
+expecting success of 7508.111 '"status.showStash=false" weaker than "--show-stash"': 
+	git -c status.showStash=false status --show-stash >actual &&
+	test_cmp expected_with_stash actual
 
-expecting success of 7112.44 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 44 - git_test_func: replace directory with submodule
+ok 111 - "status.showStash=false" weaker than "--show-stash"
 
-expecting success of 7112.45 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 45 - git_test_func: removed submodule leaves submodule directory and its contents in place
+expecting success of 7508.112 '"status.showStash=true" weaker than "--no-show-stash"': 
+	git -c status.showStash=true status --no-show-stash >actual &&
+	test_cmp expected_without_stash actual
 
-expecting success of 7112.46 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 46 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+ok 112 - "status.showStash=true" weaker than "--no-show-stash"
 
-expecting success of 7112.47 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 47 - git_test_func: replace submodule with a directory must fail
+expecting success of 7508.113 'no additional info if no stash entries': 
+	git stash clear &&
+	git -c status.showStash=true status >actual &&
+	test_cmp expected_without_stash actual
 
-expecting success of 7112.48 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 48 - git_test_func: replace submodule containing a .git directory with a directory must fail
+ok 113 - no additional info if no stash entries
 
-checking known breakage of 7112.49 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
-not ok 49 - git_test_func: replace submodule with a file must fail # TODO known breakage
+expecting success of 7508.114 '"No commits yet" should be noted in status output': 
+	git checkout --orphan empty-branch-1 &&
+	git status >output &&
+	test_grep "No commits yet" output
 
-checking known breakage of 7112.50 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
-not ok 50 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+Switched to a new branch 'empty-branch-1'
+No commits yet
+ok 114 - "No commits yet" should be noted in status output
 
-expecting success of 7112.51 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 51 - git_test_func: modified submodule does not update submodule work tree
+expecting success of 7508.115 '"No commits yet" should not be noted in status output': 
+	git checkout --orphan empty-branch-2 &&
+	test_commit test-commit-1 &&
+	git status >output &&
+	test_grep ! "No commits yet" output
 
-expecting success of 7112.52 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 52 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+Switched to a new branch 'empty-branch-2'
+[empty-branch-2 (root-commit) f194efb] test-commit-1
+ Author: A U Thor <author@example.com>
+ 10 files changed, 7 insertions(+)
+ create mode 100644 .gitconfig
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 dir2/added
+ create mode 100644 modified
+ create mode 160000 sm
+ create mode 100644 test-commit-1.t
+ create mode 100644 tracked
+ create mode 100644 upstream1.t
+ create mode 100644 upstream2.t
+ok 115 - "No commits yet" should not be noted in status output
 
-expecting success of 7112.53 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 53 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+expecting success of 7508.116 '"Initial commit" should be noted in commit template': 
+	git checkout --orphan empty-branch-3 &&
+	touch to_be_committed_1 &&
+	git add to_be_committed_1 &&
+	git commit --dry-run >output &&
+	test_grep "Initial commit" output
 
-expecting success of 7112.54 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'add_sub1'.
-ok 54 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+Switched to a new branch 'empty-branch-3'
+Initial commit
+ok 116 - "Initial commit" should be noted in commit template
 
-expecting success of 7112.55 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 55 - git_test_func: added submodule creates empty directory
+expecting success of 7508.117 '"Initial commit" should not be noted in commit template': 
+	git checkout --orphan empty-branch-4 &&
+	test_commit test-commit-2 &&
+	touch to_be_committed_2 &&
+	git add to_be_committed_2 &&
+	git commit --dry-run >output &&
+	test_grep ! "Initial commit" output
 
-expecting success of 7112.56 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 56 - git_test_func: added submodule leaves existing empty directory alone
+Switched to a new branch 'empty-branch-4'
+[empty-branch-4 (root-commit) 92016e1] test-commit-2
+ Author: A U Thor <author@example.com>
+ 12 files changed, 8 insertions(+)
+ create mode 100644 .gitconfig
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 dir2/added
+ create mode 100644 modified
+ create mode 160000 sm
+ create mode 100644 test-commit-1.t
+ create mode 100644 test-commit-2.t
+ create mode 100644 to_be_committed_1
+ create mode 100644 tracked
+ create mode 100644 upstream1.t
+ create mode 100644 upstream2.t
+ok 117 - "Initial commit" should not be noted in commit template
 
-expecting success of 7112.57 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 57 - git_test_func: replace tracked file with submodule creates empty directory
+expecting success of 7508.118 '--no-optional-locks prevents index update': 
+	test_set_magic_mtime .git/index &&
+	git --no-optional-locks status &&
+	test_is_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
 
-expecting success of 7112.58 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 58 - git_test_func: replace directory with submodule
+On branch empty-branch-4
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   to_be_committed_2
 
-expecting success of 7112.59 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 59 - git_test_func: removed submodule leaves submodule directory and its contents in place
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 7112.60 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 60 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+On branch empty-branch-4
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   to_be_committed_2
 
-expecting success of 7112.61 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 61 - git_test_func: replace submodule with a directory must fail
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 7112.62 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 62 - git_test_func: replace submodule containing a .git directory with a directory must fail
+--- .git/test-mtime-expect	2025-01-30 02:17:33.214189037 +0000
++++ .git/test-mtime-actual	2025-01-30 02:17:33.226189109 +0000
+@@ -1 +1 @@
+-1234567890
++1738203452
+ok 118 - --no-optional-locks prevents index update
 
-checking known breakage of 7112.63 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
-not ok 63 - git_test_func: replace submodule with a file must fail # TODO known breakage
+expecting success of 7508.119 'racy timestamps will be fixed for clean worktree': 
+	echo content >racy-dirty &&
+	echo content >racy-racy &&
+	git add racy* &&
+	git commit -m "racy test files" &&
+	# let status rewrite the index, if necessary; after that we expect
+	# no more index writes unless caused by racy timestamps; note that
+	# timestamps may already be racy now (depending on previous tests)
+	git status &&
+	test_set_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
 
-checking known breakage of 7112.64 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
-not ok 64 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+[empty-branch-4 1041e20] racy test files
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ create mode 100644 racy-dirty
+ create mode 100644 racy-racy
+ create mode 100644 to_be_committed_2
+On branch empty-branch-4
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 7112.65 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 65 - git_test_func: modified submodule does not update submodule work tree
+nothing added to commit but untracked files present (use "git add" to track)
+On branch empty-branch-4
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 7112.66 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 66 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+nothing added to commit but untracked files present (use "git add" to track)
+--- .git/test-mtime-expect	2025-01-30 02:17:34.954199472 +0000
++++ .git/test-mtime-actual	2025-01-30 02:17:34.966199544 +0000
+@@ -1 +1 @@
+-1234567890
++1738203454
+ok 119 - racy timestamps will be fixed for clean worktree
 
-expecting success of 7112.67 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 67 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+expecting success of 7508.120 'racy timestamps will be fixed for dirty worktree': 
+	echo content2 >racy-dirty &&
+	git status &&
+	test_set_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
 
-expecting success of 7112.68 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'add_sub1'.
-ok 68 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+On branch empty-branch-4
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   racy-dirty
 
-expecting success of 7112.69 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 69 - git_test_func: added submodule creates empty directory
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 7112.70 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 70 - git_test_func: added submodule leaves existing empty directory alone
+no changes added to commit (use "git add" and/or "git commit -a")
+On branch empty-branch-4
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   racy-dirty
 
-expecting success of 7112.71 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 71 - git_test_func: replace tracked file with submodule creates empty directory
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 7112.72 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 72 - git_test_func: replace directory with submodule
+no changes added to commit (use "git add" and/or "git commit -a")
+--- .git/test-mtime-expect	2025-01-30 02:17:36.594209308 +0000
++++ .git/test-mtime-actual	2025-01-30 02:17:36.606209380 +0000
+@@ -1 +1 @@
+-1234567890
++1738203455
+ok 120 - racy timestamps will be fixed for dirty worktree
 
-expecting success of 7112.73 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 73 - git_test_func: removed submodule leaves submodule directory and its contents in place
+expecting success of 7508.121 'setup slow status advice': 
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main git init slowstatus &&
+	(
+		cd slowstatus &&
+		cat >.gitignore <<-\EOF &&
+		/actual
+		/expected
+		/out
+		EOF
+		git add .gitignore &&
+		git commit -m "Add .gitignore" &&
+		git config advice.statusuoption true
+	)
 
-expecting success of 7112.74 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 74 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7508-status/slowstatus/.git/
+[main (root-commit) 557fde8] Add .gitignore
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 .gitignore
+ok 121 - setup slow status advice
 
-checking known breakage of 7112.75 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at cb28587 Replace sub1 with directory
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
-not ok 75 - git_test_func: replace submodule with a directory must fail # TODO known breakage
+expecting success of 7508.122 'slow status advice when core.untrackedCache and fsmonitor are unset': 
+	(
+		cd slowstatus &&
+		git config core.untrackedCache false &&
+		git config core.fsmonitor false &&
+		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
+		cat >expected <<-\EOF &&
+		On branch main
 
-checking known breakage of 7112.76 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at cb28587 Replace sub1 with directory
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
-not ok 76 - git_test_func: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+		It took 3.25 seconds to enumerate untracked files.
+		See 'git help status' for information on how to improve this.
 
-checking known breakage of 7112.77 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
-not ok 77 - git_test_func: replace submodule with a file must fail # TODO known breakage
+		nothing to commit, working tree clean
+		EOF
+		test_cmp expected actual
+	)
 
-checking known breakage of 7112.78 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
-not ok 78 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+ok 122 - slow status advice when core.untrackedCache and fsmonitor are unset
 
-expecting success of 7112.79 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 79 - git_test_func: modified submodule does not update submodule work tree
+expecting success of 7508.123 'slow status advice when core.untrackedCache true, but not fsmonitor': 
+	(
+		cd slowstatus &&
+		git config core.untrackedCache true &&
+		git config core.fsmonitor false &&
+		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
+		cat >expected <<-\EOF &&
+		On branch main
 
-expecting success of 7112.80 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-HEAD is now at e6169bf Invalid sub1 commit
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 80 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+		It took 3.25 seconds to enumerate untracked files.
+		See 'git help status' for information on how to improve this.
 
-expecting success of 7112.81 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-HEAD is now at 3036e4e Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 81 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+		nothing to commit, working tree clean
+		EOF
+		test_cmp expected actual
+	)
 
-expecting success of 7112.82 'git_test_func: added submodule does remove untracked unignored file with same name when forced': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 82 - git_test_func: added submodule does remove untracked unignored file with same name when forced
+ok 123 - slow status advice when core.untrackedCache true, but not fsmonitor
 
-# still have 12 known breakage(s)
-# passed all remaining 70 test(s)
-1..82
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t7609-mergetool--lib.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7609-mergetool--lib/.git/
-expecting success of 7609.1 'mergetool --tool=vimdiff creates the expected layout': 
-	. "$GIT_BUILD_DIR"/mergetools/vimdiff &&
-	run_unit_tests
+expecting success of 7508.124 'slow status advice when core.untrackedCache true, and fsmonitor': 
+	(
+		cd slowstatus &&
+		git config core.untrackedCache true &&
+		git config core.fsmonitor true &&
+		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
+		cat >expected <<-\EOF &&
+		On branch main
 
-Test Case #01: OK
-Test Case #02: OK
-Test Case #03: OK
-Test Case #04: OK
-Test Case #05: OK
-Test Case #06: OK
-Test Case #07: OK
-Test Case #08: OK
-Test Case #09: OK
-Test Case #10: OK
-Test Case #11: OK
-Test Case #12: OK
-Test Case #13: OK
-Test Case #14: OK
-Test Case #15: OK
-Test Case #16: OK
-ok 1 - mergetool --tool=vimdiff creates the expected layout
+		It took 3.25 seconds to enumerate untracked files,
+		but the results were cached, and subsequent runs may be faster.
+		See 'git help status' for information on how to improve this.
 
-# passed all 1 test(s)
-1..1
+		nothing to commit, working tree clean
+		EOF
+		test_cmp expected actual
+	)
+
+ok 124 - slow status advice when core.untrackedCache true, and fsmonitor
+
+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 125 # skip status does not re-read unchanged 4 or 8 GiB file (missing EXPENSIVE)
+
+# passed all 125 test(s)
+1..125
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t8001-annotate.sh ***
@@ -497890,8 +497868,8 @@
 	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
+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': 
@@ -497968,9 +497946,9 @@
 	check_count A 2 B 2 B1 2
 
 git annotate  file 
-Author B (expected 2, attributed 2) good
-Author B1 (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
+Author B1 (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)': 
@@ -497990,9 +497968,9 @@
 	check_count A 2 B 1 B2 1
 
 git annotate  file 
+Author B2 (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 ok 15 - blame 2 authors + 1 branch2 author
 
 expecting success of 8001.16 'merge branch1 & branch2': 
@@ -498008,28 +497986,28 @@
 	check_count A 2 B 1 B1 2 B2 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 B2 (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 B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author A U Thor (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
 ok 18 - blame --first-parent blames merge for branch1
 
 expecting success of 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
+Author A (expected 2, attributed 2) good
 ok 19 - blame ancestor
 
 expecting success of 8001.20 'blame great-ancestor': 
@@ -498052,8 +498030,8 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
 
 git annotate  file 
-Author A U Thor (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
+Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
@@ -498239,8 +498217,8 @@
 hint:
 hint: Turn this message off by running
 hint: "git config advice.graftFileDeprecated false"
-Author 10 (expected 1, attributed 1) good
 Author 01 (expected 1, attributed 1) good
+Author 10 (expected 1, attributed 1) good
 Switched to branch 'branch2'
 ok 23 - blame huge graft
 
@@ -498258,12 +498236,12 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
 
 git annotate  file 
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A (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 8001.26 'setup edits': 
@@ -498286,12 +498264,12 @@
 
 git annotate  file 
 Author A U Thor (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
+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 C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 27 - blame edits
 
 expecting success of 8001.28 'setup obfuscated email': 
@@ -498310,28 +498288,28 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git annotate  file 
-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 B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author A (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 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 A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B (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 (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 30 - blame -L 1 (all)
 
 expecting success of 8001.31 'blame -L , (all)': 
@@ -498340,21 +498318,21 @@
 git annotate  -L, file 
 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 E (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 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 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)
 
@@ -498362,9 +498340,9 @@
 	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L5, file 
+Author A U Thor (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 D (expected 1, attributed 1) good
 ok 33 - blame -L X, (X to end)
 
@@ -498372,9 +498350,9 @@
 	check_count -L,3 A 1 B2 1 E 1
 
 git annotate  -L,3 file 
+Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 ok 34 - blame -L ,Y (up to Y)
 
 expecting success of 8001.35 'blame -L X,X': 
@@ -498388,20 +498366,20 @@
 	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
 git annotate  -L3,6 file 
+Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author D (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 B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 ok 37 - blame -L Y,X (undocumented)
 
 expecting success of 8001.38 'blame -L -X': 
@@ -498445,10 +498423,10 @@
 	check_count -L3,+4 B 1 B1 1 B2 1 D 1
 
 git annotate  -L3,+4 file 
+Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 44 - blame -L X,+N
 
 expecting success of 8001.45 'blame -L ,-0': 
@@ -498474,8 +498452,8 @@
 	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 D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 ok 48 - blame -L X,-N
@@ -498493,18 +498471,18 @@
 
 git annotate  -L/robot/,/green/ 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
 Author E (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 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 D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 ok 51 - blame -L X,/RE/
 
@@ -498512,8 +498490,8 @@
 	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 B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 ok 52 - blame -L /RE/,Y
 
@@ -498521,8 +498499,8 @@
 	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
 
 git annotate  -L/99/,+3 file 
-Author A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 ok 53 - blame -L /RE/,+N
 
@@ -498531,8 +498509,8 @@
 
 git annotate  -L/99/,-3 file 
 Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 54 - blame -L /RE/,-N
 
 expecting success of 8001.55 'blame -L X (X == nlines)': 
@@ -498561,13 +498539,13 @@
 	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 C (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 B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 ok 58 - blame -L ,Y (Y == nlines)
 
@@ -498576,38 +498554,38 @@
 	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 A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B2 (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 D (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author A (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 U Thor (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 E (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 B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 61 - blame -L multiple (disjoint)
 
 expecting success of 8001.62 'blame -L multiple (disjoint: unordered)': 
@@ -498615,75 +498593,75 @@
 
 git annotate  -L6,7 -L2,3 file 
 Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 62 - blame -L multiple (disjoint: unordered)
 
 expecting success of 8001.63 'blame -L multiple (adjacent)': 
 	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
 
 git annotate  -L2,3 -L4,5 file 
-Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (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 A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 ok 64 - blame -L multiple (adjacent: unordered)
 
 expecting success of 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 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
-Author B (expected 1, attributed 1) good
 ok 65 - blame -L multiple (overlapping)
 
 expecting success of 8001.66 'blame -L multiple (overlapping: unordered)': 
 	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
 
 git annotate  -L3,5 -L2,4 file 
-Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author 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 A U Thor (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 C (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 B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (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 C (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
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 68 - blame -L multiple (superset/subset: unordered)
 
 expecting success of 8001.69 'blame -L /RE/ (relative)': 
@@ -498691,23 +498669,23 @@
 
 git annotate  -L3,3 -L/fox/ file 
 Author C (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 D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 69 - blame -L /RE/ (relative)
 
 expecting success of 8001.70 'blame -L /RE/ (relative: no preceding range)': 
 	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L/dog/ file 
-Author A (expected 1, attributed 1) good
 Author 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 D (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 B (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)': 
@@ -498734,16 +498712,16 @@
 	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
+Author A (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
+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)': 
@@ -498757,9 +498735,9 @@
 	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 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 8001.78 'setup -L :regex': 
@@ -498836,8 +498814,8 @@
 	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
+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)': 
@@ -498864,8 +498842,8 @@
 	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
+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)': 
@@ -498879,9 +498857,9 @@
 	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
 
 git annotate  -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 8001.90 'blame -L :funcname with userdiff driver': 
@@ -499362,467 +499340,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t8003-blame-corner-cases.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8003-blame-corner-cases/.git/
-expecting success of 8003.1 'setup': 
-	echo A A A A A >one &&
-	echo B B B B B >two &&
-	echo C C C C C >tres &&
-	echo ABC >mouse &&
-	test_write_lines 1 2 3 4 5 6 7 8 9 >nine_lines &&
-	test_write_lines 1 2 3 4 5 6 7 8 9 a >ten_lines &&
-	git add one two tres mouse nine_lines ten_lines &&
-	test_tick &&
-	GIT_AUTHOR_NAME=Initial git commit -m Initial &&
-
-	cat one >uno &&
-	mv two dos &&
-	cat one >>tres &&
-	echo DEF >>mouse &&
-	git add uno dos tres mouse &&
-	test_tick &&
-	GIT_AUTHOR_NAME=Second git commit -a -m Second &&
-
-	echo GHIJK >>mouse &&
-	git add mouse &&
-	test_tick &&
-	GIT_AUTHOR_NAME=Third git commit -m Third &&
-
-	cat mouse >cow &&
-	git add cow &&
-	test_tick &&
-	GIT_AUTHOR_NAME=Fourth git commit -m Fourth &&
-
-	cat >cow <<-\EOF &&
-	ABC
-	DEF
-	XXXX
-	GHIJK
-	EOF
-	git add cow &&
-	test_tick &&
-	GIT_AUTHOR_NAME=Fifth git commit -m Fifth
-
-[main (root-commit) a7d6c31] Initial
- Author: Initial <author@example.com>
- 6 files changed, 23 insertions(+)
- create mode 100644 mouse
- create mode 100644 nine_lines
- create mode 100644 one
- create mode 100644 ten_lines
- create mode 100644 tres
- create mode 100644 two
-[main 480ef79] Second
- Author: Second <author@example.com>
- 4 files changed, 3 insertions(+)
- rename two => dos (100%)
- create mode 100644 uno
-[main 74385ca] Third
- Author: Third <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 5b22ca3] Fourth
- Author: Fourth <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 cow
-[main 018e313] Fifth
- Author: Fifth <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 8003.2 'straight copy without -C': 
-
-	git blame uno | grep Second
-
-
-480ef79e (Second 2005-04-07 15:14:13 -0700 1) A A A A A
-ok 2 - straight copy without -C
-
-expecting success of 8003.3 'straight move without -C': 
-
-	git blame dos | grep Initial
-
-
-^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
-ok 3 - straight move without -C
-
-expecting success of 8003.4 'straight copy with -C': 
-
-	git blame -C1 uno | grep Second
-
-
-480ef79e (Second 2005-04-07 15:14:13 -0700 1) A A A A A
-ok 4 - straight copy with -C
-
-expecting success of 8003.5 'straight move with -C': 
-
-	git blame -C1 dos | grep Initial
-
-
-^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
-ok 5 - straight move with -C
-
-expecting success of 8003.6 'straight copy with -C -C': 
-
-	git blame -C -C1 uno | grep Initial
-
-
-^a7d6c31 one (Initial 2005-04-07 15:13:13 -0700 1) A A A A A
-ok 6 - straight copy with -C -C
-
-expecting success of 8003.7 'straight move with -C -C': 
-
-	git blame -C -C1 dos | grep Initial
-
-
-^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
-ok 7 - straight move with -C -C
-
-expecting success of 8003.8 'append without -C': 
-
-	git blame -L2 tres | grep Second
-
-
-480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
-ok 8 - append without -C
-
-expecting success of 8003.9 'append with -C': 
-
-	git blame -L2 -C1 tres | grep Second
-
-
-480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
-ok 9 - append with -C
-
-expecting success of 8003.10 'append with -C -C': 
-
-	git blame -L2 -C -C1 tres | grep Second
-
-
-480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
-ok 10 - append with -C -C
-
-expecting success of 8003.11 'append with -C -C -C': 
-
-	git blame -L2 -C -C -C1 tres | grep Initial
-
-
-^a7d6c31 one (Initial 2005-04-07 15:13:13 -0700 2) A A A A A
-ok 11 - append with -C -C -C
-
-expecting success of 8003.12 'blame wholesale copy': 
-
-	git blame -f -C -C1 HEAD^ -- cow | sed -e "$pick_fc" >current &&
-	cat >expected <<-\EOF &&
-	mouse-Initial
-	mouse-Second
-	mouse-Third
-	EOF
-	test_cmp expected current
-
-
-ok 12 - blame wholesale copy
-
-expecting success of 8003.13 'blame wholesale copy and more': 
-
-	git blame -f -C -C1 HEAD -- cow | sed -e "$pick_fc" >current &&
-	cat >expected <<-\EOF &&
-	mouse-Initial
-	mouse-Second
-	cow-Fifth
-	mouse-Third
-	EOF
-	test_cmp expected current
-
-
-ok 13 - blame wholesale copy and more
-
-expecting success of 8003.14 'blame wholesale copy and more in the index': 
-
-	cat >horse <<-\EOF &&
-	ABC
-	DEF
-	XXXX
-	YYYY
-	GHIJK
-	EOF
-	git add horse &&
-	test_when_finished "git rm -f horse" &&
-	git blame -f -C -C1 -- horse | sed -e "$pick_fc" >current &&
-	cat >expected <<-\EOF &&
-	mouse-Initial
-	mouse-Second
-	cow-Fifth
-	horse-Not
-	mouse-Third
-	EOF
-	test_cmp expected current
-
-
-rm 'horse'
-ok 14 - blame wholesale copy and more in the index
-
-expecting success of 8003.15 'blame during cherry-pick with file rename conflict': 
-
-	test_when_finished "git reset --hard && git checkout main" &&
-	git checkout HEAD~3 &&
-	echo MOUSE >> mouse &&
-	git mv mouse rodent &&
-	git add rodent &&
-	GIT_AUTHOR_NAME=Rodent git commit -m "rodent" &&
-	git checkout --detach main &&
-	(git cherry-pick HEAD@{1} || test $? -eq 1) &&
-	git show HEAD@{1}:rodent > rodent &&
-	git add rodent &&
-	git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
-	cat >expected <<-\EOF &&
-	mouse-Initial
-	mouse-Second
-	rodent-Not
-	EOF
-	test_cmp expected current
-
-Note: switching to 'HEAD~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.
-
-If you want to create a new branch to retain 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 480ef79 Second
-[detached HEAD b1c6d57] rodent
- Author: Rodent <author@example.com>
- 1 file changed, 1 insertion(+)
- rename mouse => rodent (57%)
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b1c6d57 rodent
-
-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> b1c6d57
-
-HEAD is now at 018e313 Fifth
-Auto-merging rodent
-CONFLICT (content): Merge conflict in rodent
-error: could not apply b1c6d57... rodent
-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 advice.mergeConflict false"
-HEAD is now at 018e313 Fifth
-Switched to branch 'main'
-ok 15 - blame during cherry-pick with file rename conflict
-
-expecting success of 8003.16 'blame path that used to be a directory': 
-	mkdir path &&
-	echo A A A A A >path/file &&
-	echo B B B B B >path/elif &&
-	git add path &&
-	test_tick &&
-	git commit -m "path was a directory" &&
-	rm -fr path &&
-	echo A A A A A >path &&
-	git add path &&
-	test_tick &&
-	git commit -m "path is a regular file" &&
-	git blame HEAD^.. -- path
-
-[main 0aef879] path was a directory
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 path/elif
- create mode 100644 path/file
-[main 846e53e] path is a regular file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename path/file => path (100%)
- delete mode 100644 path/elif
-^0aef879 path/file (A U Thor 2005-04-07 15:18:13 -0700 1) A A A A A
-ok 16 - blame path that used to be a directory
-
-expecting success of 8003.17 'blame to a commit with no author name': 
-  TREE=$(git rev-parse HEAD:) &&
-  cat >badcommit <<EOF &&
-tree $TREE
-author <noname> 1234567890 +0000
-committer David Reiss <dreiss@facebook.com> 1234567890 +0000
-
-some message
-EOF
-  COMMIT=$(git hash-object --literally -t commit -w badcommit) &&
-  git --no-pager blame $COMMIT -- uno >/dev/null
-
-ok 17 - blame to a commit with no author name
-
-expecting success of 8003.18 'blame -L with invalid start': 
-	test_must_fail git blame -L5 tres 2>errors &&
-	test_grep "has only 2 lines" errors
-
-fatal: file tres has only 2 lines
-ok 18 - blame -L with invalid start
-
-expecting success of 8003.19 'blame -L with invalid end': 
-	git blame -L1,5 tres >out &&
-	test_line_count = 2 out
-
-ok 19 - blame -L with invalid end
-
-expecting success of 8003.20 'blame parses <end> part of -L': 
-	git blame -L1,1 tres >out &&
-	test_line_count = 1 out
-
-ok 20 - blame parses <end> part of -L
-
-expecting success of 8003.21 'blame -Ln,-(n+1)': 
-	git blame -L3,-4 nine_lines >out &&
-	test_line_count = 3 out
-
-ok 21 - blame -Ln,-(n+1)
-
-expecting success of 8003.22 'indent of line numbers, nine lines': 
-	git blame nine_lines >actual &&
-	test $(grep -c "  " actual) = 0
-
-ok 22 - indent of line numbers, nine lines
-
-expecting success of 8003.23 'indent of line numbers, ten lines': 
-	git blame ten_lines >actual &&
-	test $(grep -c "  " actual) = 9
-
-ok 23 - indent of line numbers, ten lines
-
-expecting success of 8003.24 'setup file with CRLF newlines': 
-	git config core.autocrlf false &&
-	printf "testcase\n" >crlffile &&
-	git add crlffile &&
-	git commit -m testcase &&
-	printf "testcase\r\n" >crlffile
-
-[main 281288b] testcase
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 crlffile
-ok 24 - setup file with CRLF newlines
-
-expecting success of 8003.25 'blame file with CRLF core.autocrlf true': 
-	git config core.autocrlf true &&
-	git blame crlffile >actual &&
-	grep "A U Thor" actual
-
-281288b4 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
-ok 25 - blame file with CRLF core.autocrlf true
-
-expecting success of 8003.26 'blame file with CRLF attributes text': 
-	git config core.autocrlf false &&
-	echo "crlffile text" >.gitattributes &&
-	git blame crlffile >actual &&
-	grep "A U Thor" actual
-
-281288b4 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
-ok 26 - blame file with CRLF attributes text
-
-expecting success of 8003.27 'blame file with CRLF core.autocrlf=true': 
-	git config core.autocrlf false &&
-	printf "testcase\r\n" >crlfinrepo &&
-	>.gitattributes &&
-	git add crlfinrepo &&
-	git commit -m "add crlfinrepo" &&
-	git config core.autocrlf true &&
-	mv crlfinrepo tmp &&
-	git checkout crlfinrepo &&
-	rm tmp &&
-	git blame crlfinrepo >actual &&
-	grep "A U Thor" actual
-
-[main 2b0eeed] add crlfinrepo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 crlfinrepo
-Updated 1 path from the index
-2b0eeed1 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
-ok 27 - blame file with CRLF core.autocrlf=true
-
-expecting success of 8003.28 'setup coalesce tests': 
-	cat >giraffe <<-\EOF &&
-	ABC
-	DEF
-	EOF
-	git add giraffe &&
-	git commit -m "original file" &&
-	orig=$(git rev-parse HEAD) &&
-
-	cat >giraffe <<-\EOF &&
-	ABC
-	SPLIT
-	DEF
-	EOF
-	git add giraffe &&
-	git commit -m "interior SPLIT line" &&
-	split=$(git rev-parse HEAD) &&
-
-	cat >giraffe <<-\EOF &&
-	ABC
-	DEF
-	EOF
-	git add giraffe &&
-	git commit -m "same contents as original" &&
-	final=$(git rev-parse HEAD)
-
-warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
-[main 7531dad] original file
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 giraffe
-warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
-[main e82fb63] interior SPLIT line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
-[main 39e6f40] same contents as original
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-ok 28 - setup coalesce tests
-
-expecting success of 8003.29 'blame coalesce': 
-	cat >expect <<-EOF &&
-	$orig 1 1 2
-	$orig 2 2
-	EOF
-	git blame --porcelain $final giraffe >actual.raw &&
-	grep "^$orig" actual.raw >actual &&
-	test_cmp expect actual
-
-ok 29 - blame coalesce
-
-expecting success of 8003.30 'blame does not coalesce non-adjacent result lines': 
-	cat >expect <<-EOF &&
-	$orig 1) ABC
-	$orig 3) DEF
-	EOF
-	git blame --no-abbrev -s -L1,1 -L3,3 $split giraffe >actual &&
-	test_cmp expect actual
-
-ok 30 - blame does not coalesce non-adjacent result lines
-
-# passed all 30 test(s)
-1..30
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t8002-blame.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8002-blame/.git/
 expecting success of 8002.1 'setup A lines': 
@@ -499932,16 +499449,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)': 
@@ -499961,9 +499478,9 @@
 	check_count A 2 B 2 B1 2
 
 git blame -c  file 
-Author A (expected 2, attributed 2) good
-Author B (expected 2, attributed 2) good
 Author B1 (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
 ok 13 - blame 2 authors + 1 branch1 author
 
 expecting success of 8002.14 'setup B2 lines (branch2)': 
@@ -499983,8 +499500,8 @@
 	check_count A 2 B 1 B2 1
 
 git blame -c  file 
-Author A (expected 2, attributed 2) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
 ok 15 - blame 2 authors + 1 branch2 author
 
@@ -500011,9 +499528,9 @@
 	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
 
 git blame -c  --first-parent file 
+Author A (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
 Author A U Thor (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
 Author B2 (expected 1, attributed 1) good
 ok 18 - blame --first-parent blames merge for branch1
 
@@ -500021,8 +499538,8 @@
 	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 8002.20 'blame great-ancestor': 
@@ -500045,11 +499562,11 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
 
 git blame -c  file 
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
+Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 22 - blame evil merge
 
 expecting success of 8002.23 'blame huge graft': 
@@ -500232,8 +499749,8 @@
 hint:
 hint: Turn this message off by running
 hint: "git config 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
 
@@ -500251,11 +499768,11 @@
 	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 C (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
-Author C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 ok 25 - blame incomplete line
 
@@ -500278,13 +499795,13 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
 
 git blame -c  file 
+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 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
-Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 27 - blame edits
 
 expecting success of 8002.28 'setup obfuscated email': 
@@ -500303,14 +499820,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 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 B (expected 1, attributed 1) good
-Author E (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 A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 ok 29 - blame obfuscated email
 
 expecting success of 8002.30 'blame -L 1 (all)': 
@@ -500318,13 +499835,13 @@
 
 git blame -c  -L1 file 
 Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author 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 B (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 30 - blame -L 1 (all)
 
 expecting success of 8002.31 'blame -L , (all)': 
@@ -500333,22 +499850,22 @@
 git blame -c  -L, file 
 Author C (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author A (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 E (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B1 (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 B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author 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)': 
@@ -500356,18 +499873,18 @@
 
 git blame -c  -L5, file 
 Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author C (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 8002.34 'blame -L ,Y (up to Y)': 
 	check_count -L,3 A 1 B2 1 E 1
 
 git blame -c  -L,3 file 
+Author A (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 ok 34 - blame -L ,Y (up to Y)
 
 expecting success of 8002.35 'blame -L X,X': 
@@ -500381,10 +499898,10 @@
 	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,6 file 
+Author B (expected 1, attributed 1) good
+Author 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
-Author B (expected 1, attributed 1) good
 ok 36 - blame -L X,Y
 
 expecting success of 8002.37 'blame -L Y,X (undocumented)': 
@@ -500392,9 +499909,9 @@
 
 git blame -c  -L6,3 file 
 Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 37 - blame -L Y,X (undocumented)
 
 expecting success of 8002.38 'blame -L -X': 
@@ -500438,10 +499955,10 @@
 	check_count -L3,+4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,+4 file 
-Author B (expected 1, attributed 1) good
+Author 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
 ok 44 - blame -L X,+N
 
 expecting success of 8002.45 'blame -L ,-0': 
@@ -500468,17 +499985,17 @@
 
 git blame -c  -L6,-4 file 
 Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 ok 48 - blame -L X,-N
 
 expecting success of 8002.49 'blame -L /RE/ (RE to end)': 
 	check_count -L/evil/ C 1 "A U Thor" 1
 
 git blame -c  -L/evil/ file 
-Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 49 - blame -L /RE/ (RE to end)
 
 expecting success of 8002.50 'blame -L /RE/,/RE2/': 
@@ -500486,28 +500003,28 @@
 
 git blame -c  -L/robot/,/green/ file 
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 ok 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': 
 	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
 
 git blame -c  -L/99/,7 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 52 - blame -L /RE/,Y
 
 expecting success of 8002.53 'blame -L /RE/,+N': 
@@ -500515,17 +500032,17 @@
 
 git blame -c  -L/99/,+3 file 
 Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 53 - blame -L /RE/,+N
 
 expecting success of 8002.54 'blame -L /RE/,-N': 
 	check_count -L/99/,-3 B 1 B2 1 D 1
 
 git blame -c  -L/99/,-3 file 
+Author 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
 ok 54 - blame -L /RE/,-N
 
 expecting success of 8002.55 'blame -L X (X == nlines)': 
@@ -500554,14 +500071,14 @@
 	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L,8 file 
+Author A (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
+Author B (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 B2 (expected 1, attributed 1) good
 ok 58 - blame -L ,Y (Y == nlines)
 
 expecting success of 8002.59 'blame -L ,Y (Y == nlines + 1)': 
@@ -500569,13 +500086,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 E (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 B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 ok 59 - blame -L ,Y (Y == nlines + 1)
 
@@ -500583,42 +500100,42 @@
 	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 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 ok 60 - blame -L ,Y (Y > nlines)
 
 expecting success of 8002.61 'blame -L multiple (disjoint)': 
 	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
 
 git blame -c  -L2,3 -L6,7 file 
-Author B2 (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 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 B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 ok 63 - blame -L multiple (adjacent)
@@ -500627,20 +500144,20 @@
 	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
 
 git blame -c  -L4,5 -L2,3 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 B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 64 - blame -L multiple (adjacent: unordered)
 
 expecting success of 8002.65 'blame -L multiple (overlapping)': 
 	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
 
 git blame -c  -L2,4 -L3,5 file 
+Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 65 - blame -L multiple (overlapping)
 
 expecting success of 8002.66 'blame -L multiple (overlapping: unordered)': 
@@ -500648,8 +500165,8 @@
 
 git blame -c  -L3,5 -L2,4 file 
 Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 ok 66 - blame -L multiple (overlapping: unordered)
 
@@ -500657,12 +500174,12 @@
 	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L2,8 -L3,5 file 
-Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author A (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 C (expected 1, attributed 1) good
 ok 67 - blame -L multiple (superset/subset)
 
@@ -500670,12 +500187,12 @@
 	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 B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B (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 A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 ok 68 - blame -L multiple (superset/subset: unordered)
 
@@ -500683,23 +500200,23 @@
 	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 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
+Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author A U Thor (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 A (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
-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 B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 ok 70 - blame -L /RE/ (relative: no preceding range)
 
@@ -500727,16 +500244,16 @@
 	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)': 
 	check_count -L^/dog/,+2 A 1 B2 1
 
 git blame -c  -L^/dog/,+2 file 
-Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 75 - blame -L ^/RE/ (absolute: no preceding range)
 
 expecting success of 8002.76 'blame -L ^/RE/ (absolute: not found)': 
@@ -500829,8 +500346,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 8002.84 'blame -L :RE (relative: not found)': 
@@ -500873,8 +500390,8 @@
 
 git blame -c  -L10 -L^:ma.. hello.c 
 Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
 Author H (expected 1, attributed 1) good
+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': 
@@ -501192,14 +500709,14 @@
 		"<E at test dot git>" 1
 
 git blame -c -e  file 
-Author <C@test.git> (expected 1, attributed 1) good
-Author <E at test dot git> (expected 1, attributed 1) good
-Author <A@test.git> (expected 1, attributed 1) good
+Author <B1@test.git> (expected 1, attributed 1) good
 Author <B2@test.git> (expected 1, attributed 1) good
-Author <B@test.git> (expected 1, attributed 1) good
 Author <author@example.com> (expected 1, attributed 1) good
 Author <D@test.git> (expected 1, attributed 1) good
-Author <B1@test.git> (expected 1, attributed 1) good
+Author <B@test.git> (expected 1, attributed 1) good
+Author <E at test dot git> (expected 1, attributed 1) good
+Author <C@test.git> (expected 1, attributed 1) good
+Author <A@test.git> (expected 1, attributed 1) good
 ok 119 - blame --show-email
 
 expecting success of 8002.120 'setup showEmail tests': 
@@ -501371,78 +500888,472 @@
 Cloning into 'client'...
 warning: filtering not recognized by server, ignoring
 ^a09dc96 (A U Thor          2005-04-07 15:45:13 -0700 1) foo
-00000000 (Not Committed Yet 2026-03-04 08:03:19 +0000 2) bar
+00000000 (Not Committed Yet 2025-01-30 02:17:40 +0000 2) bar
 ok 131 - blame with uncommitted edits in partial clone does not crash
 
 # passed all 131 test(s)
 1..131
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t8008-blame-formats.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8008-blame-formats/.git/
-expecting success of 8008.1 'setup': 
-	echo a >file &&
-	git add file &&
+*** t8003-blame-corner-cases.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8003-blame-corner-cases/.git/
+expecting success of 8003.1 'setup': 
+	echo A A A A A >one &&
+	echo B B B B B >two &&
+	echo C C C C C >tres &&
+	echo ABC >mouse &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 >nine_lines &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 a >ten_lines &&
+	git add one two tres mouse nine_lines ten_lines &&
 	test_tick &&
-	git commit -m one &&
-	echo b >>file &&
-	echo c >>file &&
-	echo d >>file &&
+	GIT_AUTHOR_NAME=Initial git commit -m Initial &&
+
+	cat one >uno &&
+	mv two dos &&
+	cat one >>tres &&
+	echo DEF >>mouse &&
+	git add uno dos tres mouse &&
 	test_tick &&
-	git commit -a -m two &&
-	ID1=$(git rev-parse HEAD^) &&
-	shortID1="^$(git rev-parse HEAD^ |cut -c 1-17)" &&
-	ID2=$(git rev-parse HEAD) &&
-	shortID2="$(git rev-parse HEAD |cut -c 1-18)"
+	GIT_AUTHOR_NAME=Second git commit -a -m Second &&
 
-[master (root-commit) baf5e0b] one
- Author: A U Thor <author@example.com>
+	echo GHIJK >>mouse &&
+	git add mouse &&
+	test_tick &&
+	GIT_AUTHOR_NAME=Third git commit -m Third &&
+
+	cat mouse >cow &&
+	git add cow &&
+	test_tick &&
+	GIT_AUTHOR_NAME=Fourth git commit -m Fourth &&
+
+	cat >cow <<-\EOF &&
+	ABC
+	DEF
+	XXXX
+	GHIJK
+	EOF
+	git add cow &&
+	test_tick &&
+	GIT_AUTHOR_NAME=Fifth git commit -m Fifth
+
+[main (root-commit) a7d6c31] Initial
+ Author: Initial <author@example.com>
+ 6 files changed, 23 insertions(+)
+ create mode 100644 mouse
+ create mode 100644 nine_lines
+ create mode 100644 one
+ create mode 100644 ten_lines
+ create mode 100644 tres
+ create mode 100644 two
+[main 480ef79] Second
+ Author: Second <author@example.com>
+ 4 files changed, 3 insertions(+)
+ rename two => dos (100%)
+ create mode 100644 uno
+[main 74385ca] Third
+ Author: Third <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 8825379] two
- Author: A U Thor <author@example.com>
+[main 5b22ca3] Fourth
+ Author: Fourth <author@example.com>
  1 file changed, 3 insertions(+)
+ create mode 100644 cow
+[main 018e313] Fifth
+ Author: Fifth <author@example.com>
+ 1 file changed, 1 insertion(+)
 ok 1 - setup
 
-expecting success of 8008.2 'normal blame output': 
-	git blame --abbrev=17 file >actual &&
-	test_cmp expect actual
+expecting success of 8003.2 'straight copy without -C': 
 
-ok 2 - normal blame output
+	git blame uno | grep Second
 
-expecting success of 8008.3 'blame --porcelain output': 
-	git blame --porcelain file >actual &&
-	test_cmp expect actual
 
-ok 3 - blame --porcelain output
+480ef79e (Second 2005-04-07 15:14:13 -0700 1) A A A A A
+ok 2 - straight copy without -C
 
-expecting success of 8008.4 'blame --line-porcelain output': 
-	git blame --line-porcelain file >actual &&
+expecting success of 8003.3 'straight move without -C': 
+
+	git blame dos | grep Initial
+
+
+^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
+ok 3 - straight move without -C
+
+expecting success of 8003.4 'straight copy with -C': 
+
+	git blame -C1 uno | grep Second
+
+
+480ef79e (Second 2005-04-07 15:14:13 -0700 1) A A A A A
+ok 4 - straight copy with -C
+
+expecting success of 8003.5 'straight move with -C': 
+
+	git blame -C1 dos | grep Initial
+
+
+^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
+ok 5 - straight move with -C
+
+expecting success of 8003.6 'straight copy with -C -C': 
+
+	git blame -C -C1 uno | grep Initial
+
+
+^a7d6c31 one (Initial 2005-04-07 15:13:13 -0700 1) A A A A A
+ok 6 - straight copy with -C -C
+
+expecting success of 8003.7 'straight move with -C -C': 
+
+	git blame -C -C1 dos | grep Initial
+
+
+^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
+ok 7 - straight move with -C -C
+
+expecting success of 8003.8 'append without -C': 
+
+	git blame -L2 tres | grep Second
+
+
+480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
+ok 8 - append without -C
+
+expecting success of 8003.9 'append with -C': 
+
+	git blame -L2 -C1 tres | grep Second
+
+
+480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
+ok 9 - append with -C
+
+expecting success of 8003.10 'append with -C -C': 
+
+	git blame -L2 -C -C1 tres | grep Second
+
+
+480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
+ok 10 - append with -C -C
+
+expecting success of 8003.11 'append with -C -C -C': 
+
+	git blame -L2 -C -C -C1 tres | grep Initial
+
+
+^a7d6c31 one (Initial 2005-04-07 15:13:13 -0700 2) A A A A A
+ok 11 - append with -C -C -C
+
+expecting success of 8003.12 'blame wholesale copy': 
+
+	git blame -f -C -C1 HEAD^ -- cow | sed -e "$pick_fc" >current &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	mouse-Third
+	EOF
+	test_cmp expected current
+
+
+ok 12 - blame wholesale copy
+
+expecting success of 8003.13 'blame wholesale copy and more': 
+
+	git blame -f -C -C1 HEAD -- cow | sed -e "$pick_fc" >current &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	cow-Fifth
+	mouse-Third
+	EOF
+	test_cmp expected current
+
+
+ok 13 - blame wholesale copy and more
+
+expecting success of 8003.14 'blame wholesale copy and more in the index': 
+
+	cat >horse <<-\EOF &&
+	ABC
+	DEF
+	XXXX
+	YYYY
+	GHIJK
+	EOF
+	git add horse &&
+	test_when_finished "git rm -f horse" &&
+	git blame -f -C -C1 -- horse | sed -e "$pick_fc" >current &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	cow-Fifth
+	horse-Not
+	mouse-Third
+	EOF
+	test_cmp expected current
+
+
+rm 'horse'
+ok 14 - blame wholesale copy and more in the index
+
+expecting success of 8003.15 'blame during cherry-pick with file rename conflict': 
+
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout HEAD~3 &&
+	echo MOUSE >> mouse &&
+	git mv mouse rodent &&
+	git add rodent &&
+	GIT_AUTHOR_NAME=Rodent git commit -m "rodent" &&
+	git checkout --detach main &&
+	(git cherry-pick HEAD@{1} || test $? -eq 1) &&
+	git show HEAD@{1}:rodent > rodent &&
+	git add rodent &&
+	git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	rodent-Not
+	EOF
+	test_cmp expected current
+
+Note: switching to 'HEAD~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.
+
+If you want to create a new branch to retain 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 480ef79 Second
+[detached HEAD b1c6d57] rodent
+ Author: Rodent <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename mouse => rodent (57%)
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  b1c6d57 rodent
+
+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> b1c6d57
+
+HEAD is now at 018e313 Fifth
+Auto-merging rodent
+CONFLICT (content): Merge conflict in rodent
+error: could not apply b1c6d57... rodent
+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 advice.mergeConflict false"
+HEAD is now at 018e313 Fifth
+Switched to branch 'main'
+ok 15 - blame during cherry-pick with file rename conflict
+
+expecting success of 8003.16 'blame path that used to be a directory': 
+	mkdir path &&
+	echo A A A A A >path/file &&
+	echo B B B B B >path/elif &&
+	git add path &&
+	test_tick &&
+	git commit -m "path was a directory" &&
+	rm -fr path &&
+	echo A A A A A >path &&
+	git add path &&
+	test_tick &&
+	git commit -m "path is a regular file" &&
+	git blame HEAD^.. -- path
+
+[main 0aef879] path was a directory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 path/elif
+ create mode 100644 path/file
+[main 846e53e] path is a regular file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ rename path/file => path (100%)
+ delete mode 100644 path/elif
+^0aef879 path/file (A U Thor 2005-04-07 15:18:13 -0700 1) A A A A A
+ok 16 - blame path that used to be a directory
+
+expecting success of 8003.17 'blame to a commit with no author name': 
+  TREE=$(git rev-parse HEAD:) &&
+  cat >badcommit <<EOF &&
+tree $TREE
+author <noname> 1234567890 +0000
+committer David Reiss <dreiss@facebook.com> 1234567890 +0000
+
+some message
+EOF
+  COMMIT=$(git hash-object --literally -t commit -w badcommit) &&
+  git --no-pager blame $COMMIT -- uno >/dev/null
+
+ok 17 - blame to a commit with no author name
+
+expecting success of 8003.18 'blame -L with invalid start': 
+	test_must_fail git blame -L5 tres 2>errors &&
+	test_grep "has only 2 lines" errors
+
+fatal: file tres has only 2 lines
+ok 18 - blame -L with invalid start
+
+expecting success of 8003.19 'blame -L with invalid end': 
+	git blame -L1,5 tres >out &&
+	test_line_count = 2 out
+
+ok 19 - blame -L with invalid end
+
+expecting success of 8003.20 'blame parses <end> part of -L': 
+	git blame -L1,1 tres >out &&
+	test_line_count = 1 out
+
+ok 20 - blame parses <end> part of -L
+
+expecting success of 8003.21 'blame -Ln,-(n+1)': 
+	git blame -L3,-4 nine_lines >out &&
+	test_line_count = 3 out
+
+ok 21 - blame -Ln,-(n+1)
+
+expecting success of 8003.22 'indent of line numbers, nine lines': 
+	git blame nine_lines >actual &&
+	test $(grep -c "  " actual) = 0
+
+ok 22 - indent of line numbers, nine lines
+
+expecting success of 8003.23 'indent of line numbers, ten lines': 
+	git blame ten_lines >actual &&
+	test $(grep -c "  " actual) = 9
+
+ok 23 - indent of line numbers, ten lines
+
+expecting success of 8003.24 'setup file with CRLF newlines': 
+	git config core.autocrlf false &&
+	printf "testcase\n" >crlffile &&
+	git add crlffile &&
+	git commit -m testcase &&
+	printf "testcase\r\n" >crlffile
+
+[main 281288b] testcase
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 crlffile
+ok 24 - setup file with CRLF newlines
+
+expecting success of 8003.25 'blame file with CRLF core.autocrlf true': 
+	git config core.autocrlf true &&
+	git blame crlffile >actual &&
+	grep "A U Thor" actual
+
+281288b4 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
+ok 25 - blame file with CRLF core.autocrlf true
+
+expecting success of 8003.26 'blame file with CRLF attributes text': 
+	git config core.autocrlf false &&
+	echo "crlffile text" >.gitattributes &&
+	git blame crlffile >actual &&
+	grep "A U Thor" actual
+
+281288b4 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
+ok 26 - blame file with CRLF attributes text
+
+expecting success of 8003.27 'blame file with CRLF core.autocrlf=true': 
+	git config core.autocrlf false &&
+	printf "testcase\r\n" >crlfinrepo &&
+	>.gitattributes &&
+	git add crlfinrepo &&
+	git commit -m "add crlfinrepo" &&
+	git config core.autocrlf true &&
+	mv crlfinrepo tmp &&
+	git checkout crlfinrepo &&
+	rm tmp &&
+	git blame crlfinrepo >actual &&
+	grep "A U Thor" actual
+
+[main 2b0eeed] add crlfinrepo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 crlfinrepo
+Updated 1 path from the index
+2b0eeed1 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
+ok 27 - blame file with CRLF core.autocrlf=true
+
+expecting success of 8003.28 'setup coalesce tests': 
+	cat >giraffe <<-\EOF &&
+	ABC
+	DEF
+	EOF
+	git add giraffe &&
+	git commit -m "original file" &&
+	orig=$(git rev-parse HEAD) &&
+
+	cat >giraffe <<-\EOF &&
+	ABC
+	SPLIT
+	DEF
+	EOF
+	git add giraffe &&
+	git commit -m "interior SPLIT line" &&
+	split=$(git rev-parse HEAD) &&
+
+	cat >giraffe <<-\EOF &&
+	ABC
+	DEF
+	EOF
+	git add giraffe &&
+	git commit -m "same contents as original" &&
+	final=$(git rev-parse HEAD)
+
+warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
+[main 7531dad] original file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 giraffe
+warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
+[main e82fb63] interior SPLIT line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
+[main 39e6f40] same contents as original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ok 28 - setup coalesce tests
+
+expecting success of 8003.29 'blame coalesce': 
+	cat >expect <<-EOF &&
+	$orig 1 1 2
+	$orig 2 2
+	EOF
+	git blame --porcelain $final giraffe >actual.raw &&
+	grep "^$orig" actual.raw >actual &&
 	test_cmp expect actual
 
-ok 4 - blame --line-porcelain output
+ok 29 - blame coalesce
 
-expecting success of 8008.5 '--porcelain detects first non-blank line as subject': 
-	(
-		GIT_INDEX_FILE=.git/tmp-index &&
-		export GIT_INDEX_FILE &&
-		echo "This is it" >single-file &&
-		git add single-file &&
-		tree=$(git write-tree) &&
-		commit=$(printf "%s\n%s\n%s\n\n\n  \noneline\n\nbody\n" \
-			"tree $tree" \
-			"author A <a@b.c> 123456789 +0000" \
-			"committer C <c@d.e> 123456789 +0000" |
-		git hash-object -w -t commit --stdin) &&
-		git blame --porcelain $commit -- single-file >output &&
-		grep "^summary oneline$" output
-	)
+expecting success of 8003.30 'blame does not coalesce non-adjacent result lines': 
+	cat >expect <<-EOF &&
+	$orig 1) ABC
+	$orig 3) DEF
+	EOF
+	git blame --no-abbrev -s -L1,1 -L3,3 $split giraffe >actual &&
+	test_cmp expect actual
 
-summary oneline
-ok 5 - --porcelain detects first non-blank line as subject
+ok 30 - blame does not coalesce non-adjacent result lines
 
-# passed all 5 test(s)
-1..5
+# passed all 30 test(s)
+1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t8007-cat-file-textconv.sh ***
@@ -501583,6 +501494,73 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t8008-blame-formats.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8008-blame-formats/.git/
+expecting success of 8008.1 'setup': 
+	echo a >file &&
+	git add file &&
+	test_tick &&
+	git commit -m one &&
+	echo b >>file &&
+	echo c >>file &&
+	echo d >>file &&
+	test_tick &&
+	git commit -a -m two &&
+	ID1=$(git rev-parse HEAD^) &&
+	shortID1="^$(git rev-parse HEAD^ |cut -c 1-17)" &&
+	ID2=$(git rev-parse HEAD) &&
+	shortID2="$(git rev-parse HEAD |cut -c 1-18)"
+
+[master (root-commit) baf5e0b] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 8825379] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ok 1 - setup
+
+expecting success of 8008.2 'normal blame output': 
+	git blame --abbrev=17 file >actual &&
+	test_cmp expect actual
+
+ok 2 - normal blame output
+
+expecting success of 8008.3 'blame --porcelain output': 
+	git blame --porcelain file >actual &&
+	test_cmp expect actual
+
+ok 3 - blame --porcelain output
+
+expecting success of 8008.4 'blame --line-porcelain output': 
+	git blame --line-porcelain file >actual &&
+	test_cmp expect actual
+
+ok 4 - blame --line-porcelain output
+
+expecting success of 8008.5 '--porcelain detects first non-blank line as subject': 
+	(
+		GIT_INDEX_FILE=.git/tmp-index &&
+		export GIT_INDEX_FILE &&
+		echo "This is it" >single-file &&
+		git add single-file &&
+		tree=$(git write-tree) &&
+		commit=$(printf "%s\n%s\n%s\n\n\n  \noneline\n\nbody\n" \
+			"tree $tree" \
+			"author A <a@b.c> 123456789 +0000" \
+			"committer C <c@d.e> 123456789 +0000" |
+		git hash-object -w -t commit --stdin) &&
+		git blame --porcelain $commit -- single-file >output &&
+		grep "^summary oneline$" output
+	)
+
+summary oneline
+ok 5 - --porcelain detects first non-blank line as subject
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t8006-blame-textconv.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8006-blame-textconv/.git/
 expecting success of 8006.1 'setup ': 
@@ -501756,67 +501734,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t8009-blame-vs-topicbranches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8009-blame-vs-topicbranches/.git/
-expecting success of 8009.1 'setup': 
-	test_commit A0 file.t line0 &&
-	test_commit A1 &&
-	git reset --hard A0 &&
-	test_commit B1 &&
-	test_commit B2 file.t line0changed &&
-	git reset --hard A1 &&
-	test_merge A2 B2 &&
-	git reset --hard A1 &&
-	test_commit C1 &&
-	git reset --hard A2 &&
-	test_merge A3 C1
-	
-[master (root-commit) 2152206] A0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-[master 5392e14] A1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A1.t
-HEAD is now at 2152206 A0
-[master 15a8c72] B1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B1.t
-[master e1433f5] B2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392e14 A1
-Merge made by the 'ort' strategy.
- B1.t   | 1 +
- file.t | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 B1.t
-HEAD is now at 5392e14 A1
-[master fa266ba] C1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C1.t
-HEAD is now at 6e3b304 A2
-Merge made by the 'ort' strategy.
- C1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C1.t
-ok 1 - setup
-
-expecting success of 8009.2 'blame --reverse --first-parent finds A1': 
-	git blame --porcelain --reverse --first-parent A0..A3 -- file.t >actual_full &&
-	head -n 1 <actual_full | sed -e "s/ .*//" >actual &&
-	git rev-parse A1 >expect &&
-	test_cmp expect actual
-	
-ok 2 - blame --reverse --first-parent finds A1
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7810-grep.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7810-grep/.git/
 expecting success of 7810.1 'setup': 
@@ -504450,244 +504367,6 @@
 1..261
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t8010-cat-file-filters.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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"
-
-[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 8010.2 'no filters with `git show`': 
-	git show HEAD:world.txt >actual &&
-	! has_cr actual
-
-
-ok 2 - no filters with `git show`
-
-expecting success of 8010.3 'no filters with cat-file': 
-	git cat-file blob HEAD:world.txt >actual &&
-	! has_cr actual
-
-ok 3 - no filters with cat-file
-
-expecting success of 8010.4 'cat-file --filters converts to worktree version': 
-	git cat-file --filters HEAD:world.txt >actual &&
-	has_cr actual
-
-ok 4 - cat-file --filters converts to worktree version
-
-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
-
-ok 5 - cat-file --filters --path=<path> works
-
-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)"
-
-ok 6 - cat-file --textconv --path=<path> works
-
-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
-
-fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
-ok 7 - --path=<path> complains without --textconv/--filters
-
-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
-
-fatal: <object>:<path> required, only <object> 'HEAD' given
-fatal: <object>:<path> required, only <object> 'HEAD' given
-ok 8 - --textconv/--filters complain without path
-
-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
-
-ok 9 - cat-file --textconv --batch works
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t8011-blame-split-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
-
-	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 &&
-
-	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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7814-grep-recurse-submodules.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7814-grep-recurse-submodules/.git/
 expecting success of 7814.1 'setup directory structure and submodule': 
@@ -505278,8 +504957,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2026-03-04 08:03:14.611352315 +0000
-+++ actual	2026-03-04 08:03:14.727352315 +0000
+--- expect	2025-01-30 02:17:31.482178649 +0000
++++ actual	2025-01-30 02:17:31.582179249 +0000
 @@ -1 +1,3 @@
  a:(1|2)x(3|4)
 +submodule/a:(1|2)x(3|4)
@@ -505310,8 +504989,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2026-03-04 08:03:15.491352315 +0000
-+++ actual	2026-03-04 08:03:15.595352315 +0000
+--- expect	2025-01-30 02:17:32.718186062 +0000
++++ actual	2025-01-30 02:17:32.794186518 +0000
 @@ -1 +1,3 @@
  a:(1|2)x(3|4)
 +submodule/a:(1|2)x(3|4)
@@ -505343,8 +505022,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2026-03-04 08:03:16.331352315 +0000
-+++ actual	2026-03-04 08:03:16.427352315 +0000
+--- expect	2025-01-30 02:17:33.798192539 +0000
++++ actual	2025-01-30 02:17:33.878193019 +0000
 @@ -1 +1,3 @@
  a:(1|2)x(3|4)
 +submodule/a:(1|2)x(3|4)
@@ -505372,8 +505051,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2026-03-04 08:03:17.247352315 +0000
-+++ actual	2026-03-04 08:03:17.315352315 +0000
+--- expect	2025-01-30 02:17:34.958199496 +0000
++++ actual	2025-01-30 02:17:35.026199904 +0000
 @@ -1 +1,2 @@
  submodule/a:(1|2)x(3|4)
 +submodule/sub/a:(1|2)x(3|4)
@@ -505461,7 +505140,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 Mar  4 08:03 .git/refs/notes/textconv/d2x_cached
+-rw-r--r-- 1 pbuilder2 pbuilder2 41 Jan 30 02:17 .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': 
@@ -505531,7 +505210,7 @@
 Submodule 'sub' (file:///build/reproducible-path/git-2.47.2/t/trash directory.t7814-grep-recurse-submodules/super/sub) registered for path 'sub'
 Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t7814-grep-recurse-submodules/partial/sub'...
 Submodule path 'sub': checked out '289fae02a658deff257301016761eff04f091022'
-{"event":"data","sid":"20260304T080321.002631Z-H8d819085-P000d60fc","thread":"th01:unknown","time":"2026-03-04T08:03:21.018215Z","file":"promisor-remote.c","line":53,"repo":2,"t_abs":0.015814,"t_rel":0.008484,"nesting":1,"category":"promisor","key":"fetch_count","value":"1"}
+{"event":"data","sid":"20250130T021740.133515Z-H5c947e1c-P0020311d","thread":"th01:unknown","time":"2025-01-30T02:17:40.146857Z","file":"promisor-remote.c","line":53,"repo":2,"t_abs":0.013575,"t_rel":0.004685,"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': 
@@ -506198,8 +505877,8 @@
 Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at 8f98e77 initial commit
---- actual	2026-03-04 08:02:26.695352315 +0000
-+++ actual2	2026-03-04 08:02:27.483352315 +0000
+--- actual	2025-01-30 02:16:25.497782909 +0000
++++ actual2	2025-01-30 02:16:26.525789075 +0000
 @@ -4,7 +4,7 @@
  23ad8e191a506339bc2aa0ae92a950f35303f38b
  23ad8e191a506339bc2aa0ae92a950f35303f38b
@@ -507753,6 +507432,305 @@
 1..121
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t8010-cat-file-filters.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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"
+
+[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 8010.2 'no filters with `git show`': 
+	git show HEAD:world.txt >actual &&
+	! has_cr actual
+
+
+ok 2 - no filters with `git show`
+
+expecting success of 8010.3 'no filters with cat-file': 
+	git cat-file blob HEAD:world.txt >actual &&
+	! has_cr actual
+
+ok 3 - no filters with cat-file
+
+expecting success of 8010.4 'cat-file --filters converts to worktree version': 
+	git cat-file --filters HEAD:world.txt >actual &&
+	has_cr actual
+
+ok 4 - cat-file --filters converts to worktree version
+
+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
+
+ok 5 - cat-file --filters --path=<path> works
+
+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)"
+
+ok 6 - cat-file --textconv --path=<path> works
+
+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
+
+fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
+ok 7 - --path=<path> complains without --textconv/--filters
+
+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
+
+fatal: <object>:<path> required, only <object> 'HEAD' given
+fatal: <object>:<path> required, only <object> 'HEAD' given
+ok 8 - --textconv/--filters complain without path
+
+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
+
+ok 9 - cat-file --textconv --batch works
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t8009-blame-vs-topicbranches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8009-blame-vs-topicbranches/.git/
+expecting success of 8009.1 'setup': 
+	test_commit A0 file.t line0 &&
+	test_commit A1 &&
+	git reset --hard A0 &&
+	test_commit B1 &&
+	test_commit B2 file.t line0changed &&
+	git reset --hard A1 &&
+	test_merge A2 B2 &&
+	git reset --hard A1 &&
+	test_commit C1 &&
+	git reset --hard A2 &&
+	test_merge A3 C1
+	
+[master (root-commit) 2152206] A0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+[master 5392e14] A1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A1.t
+HEAD is now at 2152206 A0
+[master 15a8c72] B1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B1.t
+[master e1433f5] B2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 5392e14 A1
+Merge made by the 'ort' strategy.
+ B1.t   | 1 +
+ file.t | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 B1.t
+HEAD is now at 5392e14 A1
+[master fa266ba] C1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C1.t
+HEAD is now at 6e3b304 A2
+Merge made by the 'ort' strategy.
+ C1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C1.t
+ok 1 - setup
+
+expecting success of 8009.2 'blame --reverse --first-parent finds A1': 
+	git blame --porcelain --reverse --first-parent A0..A3 -- file.t >actual_full &&
+	head -n 1 <actual_full | sed -e "s/ .*//" >actual &&
+	git rev-parse A1 >expect &&
+	test_cmp expect actual
+	
+ok 2 - blame --reverse --first-parent finds A1
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t8011-blame-split-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+
+	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 &&
+
+	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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7816-grep-binary-pattern.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7816-grep-binary-pattern/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -508711,938 +508689,307 @@
 			test_must_fail env LC_ALL="C" git grep -f f -Fi a 2>stderr &&
 			test_grep 'This is only supported with -P under PCRE v2' stderr
 		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 111 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a
-
-expecting success of 7816.112 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>[F]' a': 
-			>stderr &&
-			printf 'YQ[F]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -f f -Fi a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 112 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>[F]' a
-
-expecting success of 7816.113 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'yQNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 113 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NOMATCH' a
-
-expecting success of 7816.114 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'yQNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 114 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NOMATCH' a
-
-expecting success of 7816.115 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'yQNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 115 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NOMATCH' a
-
-expecting success of 7816.116 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 116 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NOMATCH' a
-
-expecting success of 7816.117 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 117 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NOMATCH' a
-
-expecting success of 7816.118 'LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 118 - LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NOMATCH' a
-
-expecting success of 7816.119 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'YQNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 119 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NOMATCH' a
-
-expecting success of 7816.120 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'YQNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 120 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NOMATCH' a
-
-expecting success of 7816.121 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'YQNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 121 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NOMATCH' a
-
-expecting success of 7816.122 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 122 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a
-
-expecting success of 7816.123 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 123 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a
-
-expecting success of 7816.124 'LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 124 - LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NOMATCH' a
-
-expecting success of 7816.125 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a': 
-			>stderr &&
-			printf 'æQ[ð]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -F a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 125 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
-
-expecting success of 7816.126 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a': 
-			>stderr &&
-			printf 'æQ[ð]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -F a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 126 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
-
-expecting success of 7816.127 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'æ<NUL>[ð]' a': 
-			>stderr &&
-			printf 'æQ[ð]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -f f -F a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 127 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'æ<NUL>[ð]' a
-
-expecting success of 7816.128 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -Fi a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 128 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
-
-expecting success of 7816.129 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -Fi a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 129 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
-
-expecting success of 7816.130 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -f f -Fi a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 130 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Æ<NUL>[�]' a
-
-expecting success of 7816.131 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 131 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
-
-expecting success of 7816.132 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 132 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
-
-expecting success of 7816.133 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a': 
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f -i a
-		
-Binary file a matches
-ok 133 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a
-
-expecting success of 7816.134 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'yQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 134 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a
-
-expecting success of 7816.135 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'yQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 135 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a
-
-expecting success of 7816.136 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'yQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 136 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NÓMATCH' a
-
-expecting success of 7816.137 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 137 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a
-
-expecting success of 7816.138 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 138 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a
-
-expecting success of 7816.139 'LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 139 - LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NÓMATCH' a
-
-expecting success of 7816.140 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'YQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 140 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a
-
-expecting success of 7816.141 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'YQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 141 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a
-
-expecting success of 7816.142 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'YQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 142 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NÓMATCH' a
-
-expecting success of 7816.143 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 143 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a
-
-expecting success of 7816.144 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 144 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a
-
-expecting success of 7816.145 'LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 145 - LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NÓMATCH' a
-
-# passed all 145 test(s)
-1..145
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9002-column.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9002-column/.git/
-expecting success of 9002.1 'setup': 
-	cat >lista <<\EOF
-one
-two
-three
-four
-five
-six
-seven
-eight
-nine
-ten
-eleven
-EOF
-
-ok 1 - setup
-
-expecting success of 9002.2 'never': 
-	git column --indent=Z --mode=never <lista >actual &&
-	test_cmp lista actual
-
-ok 2 - never
-
-expecting success of 9002.3 'always': 
-	cat >expected <<\EOF &&
-Zone
-Ztwo
-Zthree
-Zfour
-Zfive
-Zsix
-Zseven
-Zeight
-Znine
-Zten
-Zeleven
-EOF
-	git column --indent=Z --mode=plain <lista >actual &&
-	test_cmp expected actual
-
-ok 3 - always
-
-expecting success of 9002.4 '--nl': 
-	cat >expected <<\EOF &&
-oneZ
-twoZ
-threeZ
-fourZ
-fiveZ
-sixZ
-sevenZ
-eightZ
-nineZ
-tenZ
-elevenZ
-EOF
-	git column --nl="Z$LF" --mode=plain <lista >actual &&
-	test_cmp expected actual
-
-ok 4 - --nl
-
-expecting success of 9002.5 '80 columns': 
-	cat >expected <<\EOF &&
-one    two    three  four   five   six    seven  eight  nine   ten    eleven
-EOF
-	COLUMNS=80 git column --mode=column <lista >actual &&
-	test_cmp expected actual
-
-ok 5 - 80 columns
-
-expecting success of 9002.6 'COLUMNS = 1': 
-	COLUMNS=1 git column --mode=column <lista >actual &&
-	test_cmp expected actual
-
-ok 6 - COLUMNS = 1
-
-expecting success of 9002.7 'width = 1': 
-	git column --mode=column --width=1 <lista >actual &&
-	test_cmp expected actual
-
-ok 7 - width = 1
-
-expecting success of 9002.8 '20 columns': 
-	cat >expected <<\EOF &&
-one    seven
-two    eight
-three  nine
-four   ten
-five   eleven
-six
-EOF
-	git column --mode=column <lista >actual &&
-	test_cmp expected actual
-
-ok 8 - 20 columns
-
-expecting success of 9002.9 '20 columns, nodense': 
-	cat >expected <<\EOF &&
-one    seven
-two    eight
-three  nine
-four   ten
-five   eleven
-six
-EOF
-	git column --mode=column,nodense < lista > actual &&
-	test_cmp expected actual
-
-ok 9 - 20 columns, nodense
-
-expecting success of 9002.10 '20 columns, dense': 
-	cat >expected <<\EOF &&
-one   five  nine
-two   six   ten
-three seven eleven
-four  eight
-EOF
-	git column --mode=column,dense < lista > actual &&
-	test_cmp expected actual
-
-ok 10 - 20 columns, dense
-
-expecting success of 9002.11 '20 columns, padding 2': 
-	cat >expected <<\EOF &&
-one     seven
-two     eight
-three   nine
-four    ten
-five    eleven
-six
-EOF
-	git column --mode=column --padding 2 <lista >actual &&
-	test_cmp expected actual
-
-ok 11 - 20 columns, padding 2
-
-expecting success of 9002.12 '20 columns, indented': 
-	cat >expected <<\EOF &&
-  one    seven
-  two    eight
-  three  nine
-  four   ten
-  five   eleven
-  six
-EOF
-	git column --mode=column --indent="  " <lista >actual &&
-	test_cmp expected actual
-
-ok 12 - 20 columns, indented
-
-expecting success of 9002.13 '20 columns, row first': 
-	cat >expected <<\EOF &&
-one    two
-three  four
-five   six
-seven  eight
-nine   ten
-eleven
-EOF
-	git column --mode=row <lista >actual &&
-	test_cmp expected actual
-
-ok 13 - 20 columns, row first
-
-expecting success of 9002.14 '20 columns, row first, nodense': 
-	cat >expected <<\EOF &&
-one    two
-three  four
-five   six
-seven  eight
-nine   ten
-eleven
-EOF
-	git column --mode=row,nodense <lista >actual &&
-	test_cmp expected actual
-
-ok 14 - 20 columns, row first, nodense
-
-expecting success of 9002.15 '20 columns, row first, dense': 
-	cat >expected <<\EOF &&
-one   two    three
-four  five   six
-seven eight  nine
-ten   eleven
-EOF
-	git column --mode=row,dense <lista >actual &&
-	test_cmp expected actual
-
-ok 15 - 20 columns, row first, dense
-
-expecting success of 9002.16 'padding must be non-negative': 
-	cat >input <<\EOF &&
-1 2 3 4 5 6
-EOF
-	cat >expected <<\EOF &&
-fatal: --padding must be non-negative
-EOF
-	test_must_fail git column --mode=column --padding=-1 <input >actual 2>&1 &&
-	test_cmp expected actual
-
-ok 16 - padding must be non-negative
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9003-help-autocorrect.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9003-help-autocorrect/.git/
-expecting success of 9003.1 'setup': 
-	# An alias
-	git config alias.lgf "log --format=%s --first-parent" &&
-
-	# A random user-defined command
-	write_script git-distimdistim <<-EOF &&
-		echo distimdistim was called
-	EOF
-
-	PATH="$PATH:." &&
-	export PATH &&
-
-	git commit --allow-empty -m "a single log entry" &&
-
-	# Sanity check
-	git lgf >actual &&
-	echo "a single log entry" >expect &&
-	test_cmp expect actual &&
-
-	git distimdistim >actual &&
-	echo "distimdistim was called" >expect &&
-	test_cmp expect actual
-
-[master (root-commit) b57823c] a single log entry
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 9003.2 'autocorrect showing candidates': 
-	git config help.autocorrect 0 &&
-
-	test_must_fail git lfg 2>actual &&
-	grep "^	lgf" actual &&
-
-	test_must_fail git distimdist 2>actual &&
-	grep "^	distimdistim" actual
-
-	lgf
-	distimdistim
-ok 2 - autocorrect showing candidates
-
-expecting success of 9003.3 'autocorrect running commands': 
-		git config help.autocorrect $immediate &&
-
-		git lfg >actual &&
-		echo "a single log entry" >expect &&
-		test_cmp expect actual &&
-
-		git distimdist >actual &&
-		echo "distimdistim was called" >expect &&
-		test_cmp expect actual
-	
-WARNING: You called a Git command named 'lfg', which does not exist.
-Continuing under the assumption that you meant 'lgf'.
-WARNING: You called a Git command named 'distimdist', which does not exist.
-Continuing under the assumption that you meant 'distimdistim'.
-ok 3 - autocorrect running commands
-
-expecting success of 9003.4 'autocorrect running commands': 
-		git config help.autocorrect $immediate &&
-
-		git lfg >actual &&
-		echo "a single log entry" >expect &&
-		test_cmp expect actual &&
-
-		git distimdist >actual &&
-		echo "distimdistim was called" >expect &&
-		test_cmp expect actual
-	
-WARNING: You called a Git command named 'lfg', which does not exist.
-Continuing under the assumption that you meant 'lgf'.
-WARNING: You called a Git command named 'distimdist', which does not exist.
-Continuing under the assumption that you meant 'distimdistim'.
-ok 4 - autocorrect running commands
-
-expecting success of 9003.5 'autocorrect can be declined altogether': 
-	git config help.autocorrect never &&
-
-	test_must_fail git lfg 2>actual &&
-	grep "is not a git command" actual &&
-	test_line_count = 1 actual
-
-git: 'lfg' is not a git command. See 'git --help'.
-ok 5 - autocorrect can be declined altogether
-
-expecting success of 9003.6 'autocorrect works in work tree created from bare repo': 
-	git clone --bare . bare.git &&
-	git -C bare.git worktree add ../worktree &&
-	git -C worktree -c help.autocorrect=immediate stauts
-
-Cloning into bare repository 'bare.git'...
-done.
-Preparing worktree (new branch 'worktree')
-HEAD is now at b57823c a single log entry
-WARNING: You called a Git command named 'stauts', which does not exist.
-Continuing under the assumption that you meant 'status'.
-On branch worktree
-nothing to commit, working tree clean
-ok 6 - autocorrect works in work tree created from bare repo
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t8013-blame-ignore-revs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 111 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a
 
-	echo NOREV >ignore_norev &&
-	test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
-	test_grep "invalid object name: NOREV" err
+expecting success of 7816.112 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>[F]' a': 
+			>stderr &&
+			printf 'YQ[F]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -f f -Fi a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 112 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>[F]' a
 
-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 7816.113 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'yQNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 113 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NOMATCH' a
 
-expecting success of 8013.11 'mark_unblamable_lines': 
-	git config --add blame.markUnblamableLines true &&
+expecting success of 7816.114 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'yQNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 114 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NOMATCH' a
 
-	git blame --ignore-rev Y file >blame_raw &&
-	echo "*" >expect &&
+expecting success of 7816.115 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'yQNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 115 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NOMATCH' a
 
-	sed -n "3p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
+expecting success of 7816.116 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 116 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NOMATCH' a
 
-	sed -n "4p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual
+expecting success of 7816.117 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 117 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NOMATCH' a
 
-ok 11 - mark_unblamable_lines
+expecting success of 7816.118 'LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 118 - LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NOMATCH' a
 
-expecting success of 8013.12 'mark_ignored_lines': 
-	git config --add blame.markIgnoredLines true &&
+expecting success of 7816.119 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'YQNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 119 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NOMATCH' a
 
-	test_write_lines line-one-Z line-two-Z y3 y4 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m Z &&
-	git tag Z &&
+expecting success of 7816.120 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'YQNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 120 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NOMATCH' a
 
-	git blame --ignore-rev Z file >blame_raw &&
-	echo "?" >expect &&
+expecting success of 7816.121 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'YQNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 121 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NOMATCH' a
 
-	sed -n "1p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
+expecting success of 7816.122 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 122 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a
 
-	sed -n "2p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
+expecting success of 7816.123 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 123 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a
 
-	sed -n "3p" blame_raw | cut -c1 >actual &&
-	! test_cmp expect actual &&
+expecting success of 7816.124 'LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 124 - LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NOMATCH' a
 
-	sed -n "4p" blame_raw | cut -c1 >actual &&
-	! test_cmp expect actual
+expecting success of 7816.125 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a': 
+			>stderr &&
+			printf 'æQ[ð]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -F a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 125 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
 
-[master d1e4550] Z
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
---- expect	2026-03-04 08:03:22.211352315 +0000
-+++ actual	2026-03-04 08:03:22.283352315 +0000
-@@ -1 +1 @@
--?
-+e
---- expect	2026-03-04 08:03:22.211352315 +0000
-+++ actual	2026-03-04 08:03:22.303352315 +0000
-@@ -1 +1 @@
--?
-+e
-ok 12 - mark_ignored_lines
+expecting success of 7816.126 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a': 
+			>stderr &&
+			printf 'æQ[ð]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -F a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 126 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
 
-expecting success of 8013.13 'mark_unblamable_lines_intermediate': 
-	git config --add blame.markUnblamableLines true &&
+expecting success of 7816.127 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'æ<NUL>[ð]' a': 
+			>stderr &&
+			printf 'æQ[ð]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -f f -F a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 127 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'æ<NUL>[ð]' a
 
-	git blame --ignore-rev Y file >blame_raw 2>stderr &&
-	echo "*" >expect &&
+expecting success of 7816.128 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -Fi a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 128 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
 
-	sed -n "3p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
+expecting success of 7816.129 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -Fi a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 129 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
 
-	sed -n "4p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual
+expecting success of 7816.130 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -f f -Fi a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 130 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Æ<NUL>[�]' a
 
-ok 13 - mark_unblamable_lines_intermediate
+expecting success of 7816.131 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 131 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
 
-expecting success of 8013.14 'ignored_chunk_negative_parent_size': 
-	rm -rf .git/ &&
-	git init &&
+expecting success of 7816.132 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 132 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
 
-	test_write_lines L1 L2 L7 L8 L9 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m A &&
-	git tag A &&
+expecting success of 7816.133 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a': 
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f -i a
+		
+Binary file a matches
+ok 133 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a
 
-	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m B &&
-	git tag B &&
+expecting success of 7816.134 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'yQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 134 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a
 
-	test_write_lines L1 L2 L3 L4 xxx L6 L7 L8 L9 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m C &&
-	git tag C &&
+expecting success of 7816.135 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'yQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 135 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a
 
-	git blame file --ignore-rev B >blame_raw
+expecting success of 7816.136 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'yQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 136 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NÓMATCH' a
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8013-blame-ignore-revs/.git/
-[master (root-commit) 0157998] A
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 file
-[master a8e635b] B
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
-[master 3b3594b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 14 - ignored_chunk_negative_parent_size
+expecting success of 7816.137 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 137 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a
 
-expecting success of 8013.15 'ignore_merge': 
-	rm -rf .git/ &&
-	git init &&
+expecting success of 7816.138 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 138 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a
 
-	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m A &&
-	git tag A &&
+expecting success of 7816.139 'LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 139 - LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NÓMATCH' a
 
-	test_write_lines BB L2 L3 L4 L5 L6 L7 L8 L9 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m B &&
-	git tag B &&
+expecting success of 7816.140 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'YQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 140 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a
 
-	git reset --hard A &&
-	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 CC >file &&
-	git add file &&
-	test_tick &&
-	git commit -m C &&
-	git tag C &&
+expecting success of 7816.141 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'YQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 141 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a
 
-	test_merge M B &&
-	git blame --line-porcelain file --ignore-rev M >blame_raw &&
+expecting success of 7816.142 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'YQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 142 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NÓMATCH' a
 
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
-	git rev-parse B >expect &&
-	test_cmp expect actual &&
+expecting success of 7816.143 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 143 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a
 
-	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
+expecting success of 7816.144 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 144 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8013-blame-ignore-revs/.git/
-[master (root-commit) aebca2b] A
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file
-[master 38a4cbf] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at aebca2b A
-[master 1f9babe] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 15 - ignore_merge
+expecting success of 7816.145 'LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 145 - LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NÓMATCH' a
 
-# passed all 15 test(s)
-1..15
+# passed all 145 test(s)
+1..145
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7900-maintenance.sh ***
@@ -509676,8 +509023,8 @@
 	test_subcommand git gc --no-quiet --no-detach <run-no-quiet.txt
 
 Nothing new to pack.
-{"event":"child_start","sid":"20260304T080309.294546Z-H8d819085-P000d224f","thread":"main","time":"2026-03-04T08:03:09.295119Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
-{"event":"child_start","sid":"20260304T080309.473983Z-H8d819085-P000d234c","thread":"main","time":"2026-03-04T08:03:09.474558Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--no-quiet","--no-detach"]}
+{"event":"child_start","sid":"20250130T021724.650117Z-H5c947e1c-P001ff5bd","thread":"main","time":"2025-01-30T02:17:24.650723Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20250130T021724.834032Z-H5c947e1c-P001ff69a","thread":"main","time":"2025-01-30T02:17:24.834597Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--no-quiet","--no-detach"]}
 ok 2 - run [--auto|--quiet]
 
 expecting success of 7900.3 'maintenance.auto config option': 
@@ -509692,8 +509039,8 @@
 		commit --quiet --allow-empty -m 3 &&
 	test_subcommand ! git maintenance run --auto --quiet --detach <false
 
-{"event":"child_start","sid":"20260304T080309.685956Z-H8d819085-P000d2477","thread":"main","time":"2026-03-04T08:03:09.687899Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
-{"event":"child_start","sid":"20260304T080309.749621Z-H8d819085-P000d24ec","thread":"main","time":"2026-03-04T08:03:09.751723Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20250130T021725.086092Z-H5c947e1c-P001ff7d2","thread":"main","time":"2025-01-30T02:17:25.092458Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20250130T021725.170041Z-H5c947e1c-P001ff821","thread":"main","time":"2025-01-30T02:17:25.180376Z","file":"run-command.c","line":733,"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': 
@@ -509702,7 +509049,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":"20260304T080309.890585Z-H8d819085-P000d25c2","thread":"main","time":"2026-03-04T08:03:09.892849Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20250130T021725.354255Z-H5c947e1c-P001ff8e8","thread":"main","time":"2025-01-30T02:17:25.364842Z","file":"run-command.c","line":733,"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': 
@@ -509711,7 +509058,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":"20260304T080310.021966Z-H8d819085-P000d267f","thread":"main","time":"2026-03-04T08:03:10.024174Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20250130T021725.542013Z-H5c947e1c-P001ff9bc","thread":"main","time":"2025-01-30T02:17:25.552454Z","file":"run-command.c","line":733,"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': 
@@ -509720,7 +509067,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":"20260304T080310.126828Z-H8d819085-P000d2720","thread":"main","time":"2026-03-04T08:03:10.133019Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20250130T021725.733857Z-H5c947e1c-P001ffa8c","thread":"main","time":"2025-01-30T02:17:25.745549Z","file":"run-command.c","line":733,"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': 
@@ -509729,7 +509076,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":"20260304T080310.250826Z-H8d819085-P000d27c7","thread":"main","time":"2026-03-04T08:03:10.259173Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20250130T021725.922869Z-H5c947e1c-P001ffb4e","thread":"main","time":"2025-01-30T02:17:25.929153Z","file":"run-command.c","line":733,"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': 
@@ -509739,7 +509086,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":"20260304T080310.406622Z-H8d819085-P000d2899","thread":"main","time":"2026-03-04T08:03:10.408860Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20250130T021726.106035Z-H5c947e1c-P001ffc05","thread":"main","time":"2025-01-30T02:17:26.124370Z","file":"run-command.c","line":733,"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': 
@@ -509798,7 +509145,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":"20260304T080310.881350Z-H8d819085-P000d2b39","thread":"main","time":"2026-03-04T08:03:10.881919Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021726.722461Z-H5c947e1c-P001ffea5","thread":"main","time":"2025-01-30T02:17:26.723053Z","file":"run-command.c","line":733,"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>': 
@@ -509817,11 +509164,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":"20260304T080311.006253Z-H8d819085-P000d2bf4","thread":"main","time":"2026-03-04T08:03:11.006887Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
-{"event":"child_start","sid":"20260304T080311.202704Z-H8d819085-P000d2cf8","thread":"main","time":"2026-03-04T08:03:11.203302Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
-{"event":"child_start","sid":"20260304T080310.966003Z-H8d819085-P000d2bbf","thread":"main","time":"2026-03-04T08:03:10.966565Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260304T080311.174680Z-H8d819085-P000d2cd2","thread":"main","time":"2026-03-04T08:03:11.175302Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260304T080311.202704Z-H8d819085-P000d2cf8","thread":"main","time":"2026-03-04T08:03:11.329282Z","file":"run-command.c","line":733,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021726.870296Z-H5c947e1c-P001fff40","thread":"main","time":"2025-01-30T02:17:26.870839Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20250130T021727.076471Z-H5c947e1c-P00200028","thread":"main","time":"2025-01-30T02:17:27.077034Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20250130T021726.822108Z-H5c947e1c-P001fff0b","thread":"main","time":"2025-01-30T02:17:26.822651Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021727.047690Z-H5c947e1c-P001ffffe","thread":"main","time":"2025-01-30T02:17:27.048248Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021727.076471Z-H5c947e1c-P00200028","thread":"main","time":"2025-01-30T02:17:27.189432Z","file":"run-command.c","line":733,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
 ok 14 - run --task=<task>
 
 expecting success of 7900.15 'core.commitGraph=false prevents write process': 
@@ -509869,9 +509216,9 @@
  Author: A U Thor <author@example.com>
 [master 826111a] third
  Author: A U Thor <author@example.com>
-{"event":"child_start","sid":"20260304T080311.574633Z-H8d819085-P000d2ead","thread":"main","time":"2026-03-04T08:03:11.575207Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260304T080311.686802Z-H8d819085-P000d2f2b","thread":"main","time":"2026-03-04T08:03:11.687973Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260304T080311.750702Z-H8d819085-P000d2f82","thread":"main","time":"2026-03-04T08:03:11.751853Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021727.500798Z-H5c947e1c-P002001df","thread":"main","time":"2025-01-30T02:17:27.501363Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021727.718193Z-H5c947e1c-P002002d3","thread":"main","time":"2025-01-30T02:17:27.719312Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021727.804626Z-H5c947e1c-P00200342","thread":"main","time":"2025-01-30T02:17:27.805853Z","file":"run-command.c","line":733,"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': 
@@ -509938,8 +509285,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-{"event":"child_start","sid":"20260304T080312.314285Z-H8d819085-P000d32c5","thread":"main","time":"2026-03-04T08:03:12.314953Z","file":"run-command.c","line":733,"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":"20260304T080312.314285Z-H8d819085-P000d32c5","thread":"main","time":"2026-03-04T08:03:12.433072Z","file":"run-command.c","line":733,"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":"20250130T021728.537681Z-H5c947e1c-P00200654","thread":"main","time":"2025-01-30T02:17:28.538272Z","file":"run-command.c","line":733,"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":"20250130T021728.537681Z-H5c947e1c-P00200654","thread":"main","time":"2025-01-30T02:17:28.642318Z","file":"run-command.c","line":733,"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
@@ -510092,7 +509439,7 @@
  * [new branch]      master     -> remote2/master
  * [new branch]      two        -> remote2/two
  * [new tag]         two        -> two
-{"event":"child_start","sid":"20260304T080312.853969Z-H8d819085-P000d35c6","thread":"main","time":"2026-03-04T08:03:12.854565Z","file":"run-command.c","line":733,"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":"20250130T021729.168103Z-H5c947e1c-P002008ab","thread":"main","time":"2025-01-30T02:17:29.168731Z","file":"run-command.c","line":733,"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': 
@@ -510162,8 +509509,8 @@
 
 07163daad06a0119b0a241cf1882adae4f88fd56
 4e26d6d394bf76d04cf3ab6f994c0bcaaf1a0a2f
-{"event":"child_start","sid":"20260304T080313.478468Z-H8d819085-P000d393a","thread":"main","time":"2026-03-04T08:03:13.479248Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260304T080313.550837Z-H8d819085-P000d39a4","thread":"main","time":"2026-03-04T08:03:13.551623Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250130T021730.134179Z-H5c947e1c-P00200c70","thread":"main","time":"2025-01-30T02:17:30.134956Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250130T021730.245270Z-H5c947e1c-P00200cca","thread":"main","time":"2025-01-30T02:17:30.246060Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
 ok 22 - maintenance.loose-objects.auto
 
 expecting success of 7900.23 'incremental-repack task': 
@@ -510275,7 +509622,7 @@
  1 file changed, 1 insertion(+)
  create mode 100644 C.t
 2f10694fe702316bcde937d57f956fe5ae42f7fe
-{"event":"child_start","sid":"20260304T080314.665986Z-H8d819085-P000d3f8a","thread":"main","time":"2026-03-04T08:03:14.666700Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20250130T021731.983135Z-H5c947e1c-P0020137c","thread":"main","time":"2025-01-30T02:17:31.984970Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
 ok 25 - maintenance.incremental-repack.auto
 
 expecting success of 7900.26 'maintenance.incremental-repack.auto (when config is unset)': 
@@ -510302,7 +509649,7 @@
  1 file changed, 1 insertion(+)
  create mode 100644 C.t
 2f10694fe702316bcde937d57f956fe5ae42f7fe
-{"event":"child_start","sid":"20260304T080315.238756Z-H8d819085-P000d42c9","thread":"main","time":"2026-03-04T08:03:15.239455Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20250130T021732.722223Z-H5c947e1c-P0020161a","thread":"main","time":"2025-01-30T02:17:32.722951Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
 ok 26 - maintenance.incremental-repack.auto (when config is unset)
 
 expecting success of 7900.27 'pack-refs task': 
@@ -510314,7 +509661,7 @@
 		git maintenance run --task=pack-refs &&
 	test_subcommand git pack-refs --all --prune <pack-refs.txt
 
-{"event":"child_start","sid":"20260304T080315.480402Z-H8d819085-P000d43fd","thread":"main","time":"2026-03-04T08:03:15.481016Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
+{"event":"child_start","sid":"20250130T021733.026206Z-H5c947e1c-P0020175d","thread":"main","time":"2025-01-30T02:17:33.026785Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
 ok 27 - pack-refs task
 
 expecting success of 7900.28 '--auto and --schedule incompatible': 
@@ -510360,12 +509707,12 @@
 		--no-progress <weekly.txt &&
 	test_subcommand git multi-pack-index write --no-progress <weekly.txt
 
-{"event":"child_start","sid":"20260304T080315.681776Z-H8d819085-P000d4510","thread":"main","time":"2026-03-04T08:03:15.841160Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260304T080315.960238Z-H8d819085-P000d46ee","thread":"main","time":"2026-03-04T08:03:16.047275Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260304T080315.960238Z-H8d819085-P000d46ee","thread":"main","time":"2026-03-04T08:03:16.069604Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260304T080316.166554Z-H8d819085-P000d4813","thread":"main","time":"2026-03-04T08:03:16.281665Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260304T080316.166554Z-H8d819085-P000d4813","thread":"main","time":"2026-03-04T08:03:16.361845Z","file":"run-command.c","line":733,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260304T080316.166554Z-H8d819085-P000d4813","thread":"main","time":"2026-03-04T08:03:16.291960Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20250130T021733.291779Z-H5c947e1c-P0020184e","thread":"main","time":"2025-01-30T02:17:33.535793Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250130T021733.690814Z-H5c947e1c-P002019d1","thread":"main","time":"2025-01-30T02:17:33.789762Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250130T021733.690814Z-H5c947e1c-P002019d1","thread":"main","time":"2025-01-30T02:17:33.807618Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021733.930498Z-H5c947e1c-P00201ac6","thread":"main","time":"2025-01-30T02:17:34.069982Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250130T021733.930498Z-H5c947e1c-P00201ac6","thread":"main","time":"2025-01-30T02:17:34.152317Z","file":"run-command.c","line":733,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021733.930498Z-H5c947e1c-P00201ac6","thread":"main","time":"2025-01-30T02:17:34.083138Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
 ok 30 - --schedule inheritance weekly -> daily -> hourly
 
 expecting success of 7900.31 'maintenance.strategy inheritance': 
@@ -510430,17 +509777,17 @@
 	test_subcommand ! git multi-pack-index write --no-progress \
 		<modified-daily.txt
 
-{"event":"child_start","sid":"20260304T080316.525082Z-H8d819085-P000d4a11","thread":"main","time":"2026-03-04T08:03:16.641094Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260304T080316.670995Z-H8d819085-P000d4ac7","thread":"main","time":"2026-03-04T08:03:16.833237Z","file":"run-command.c","line":733,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260304T080316.670995Z-H8d819085-P000d4ac7","thread":"main","time":"2026-03-04T08:03:16.785836Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260304T080316.670995Z-H8d819085-P000d4ac7","thread":"main","time":"2026-03-04T08:03:16.800071Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-{"event":"child_start","sid":"20260304T080316.866044Z-H8d819085-P000d4bd9","thread":"main","time":"2026-03-04T08:03:17.045089Z","file":"run-command.c","line":733,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260304T080316.866044Z-H8d819085-P000d4bd9","thread":"main","time":"2026-03-04T08:03:16.989801Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260304T080316.866044Z-H8d819085-P000d4bd9","thread":"main","time":"2026-03-04T08:03:17.009577Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-{"event":"child_start","sid":"20260304T080316.866044Z-H8d819085-P000d4bd9","thread":"main","time":"2026-03-04T08:03:17.064561Z","file":"run-command.c","line":733,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
-{"event":"child_start","sid":"20260304T080317.410766Z-H8d819085-P000d4ead","thread":"main","time":"2026-03-04T08:03:17.565691Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260304T080317.606019Z-H8d819085-P000d4f98","thread":"main","time":"2026-03-04T08:03:17.753629Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260304T080317.606019Z-H8d819085-P000d4f98","thread":"main","time":"2026-03-04T08:03:17.745128Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250130T021734.357672Z-H5c947e1c-P00201c5b","thread":"main","time":"2025-01-30T02:17:34.524716Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021734.574093Z-H5c947e1c-P00201d05","thread":"main","time":"2025-01-30T02:17:34.771470Z","file":"run-command.c","line":733,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021734.574093Z-H5c947e1c-P00201d05","thread":"main","time":"2025-01-30T02:17:34.723570Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250130T021734.574093Z-H5c947e1c-P00201d05","thread":"main","time":"2025-01-30T02:17:34.738394Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20250130T021734.816660Z-H5c947e1c-P00201de6","thread":"main","time":"2025-01-30T02:17:35.005647Z","file":"run-command.c","line":733,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021734.816660Z-H5c947e1c-P00201de6","thread":"main","time":"2025-01-30T02:17:34.944216Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250130T021734.816660Z-H5c947e1c-P00201de6","thread":"main","time":"2025-01-30T02:17:34.954499Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20250130T021734.816660Z-H5c947e1c-P00201de6","thread":"main","time":"2025-01-30T02:17:35.014395Z","file":"run-command.c","line":733,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
+{"event":"child_start","sid":"20250130T021735.442572Z-H5c947e1c-P0020202d","thread":"main","time":"2025-01-30T02:17:35.591898Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250130T021735.624429Z-H5c947e1c-P002020d5","thread":"main","time":"2025-01-30T02:17:35.784083Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250130T021735.624429Z-H5c947e1c-P002020d5","thread":"main","time":"2025-01-30T02:17:35.772250Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
 ok 31 - maintenance.strategy inheritance
 
 expecting success of 7900.32 'register and unregister': 
@@ -510767,9 +510114,9 @@
 	test_cmp expect args
 
 /build/reproducible-path/git-2.47.2/t/trash directory.t7900-maintenance
-/create /tn Git Maintenance (hourly) /f /xml /build/reproducible-path/git-2.47.2/t/trash directory.t7900-maintenance/.git/schedule_hourly_quHsAa
-/create /tn Git Maintenance (daily) /f /xml /build/reproducible-path/git-2.47.2/t/trash directory.t7900-maintenance/.git/schedule_daily_6WKrsP
-/create /tn Git Maintenance (weekly) /f /xml /build/reproducible-path/git-2.47.2/t/trash directory.t7900-maintenance/.git/schedule_weekly_xHQHGM
+/create /tn Git Maintenance (hourly) /f /xml /build/reproducible-path/git-2.47.2/t/trash directory.t7900-maintenance/.git/schedule_hourly_npZ6i0
+/create /tn Git Maintenance (daily) /f /xml /build/reproducible-path/git-2.47.2/t/trash directory.t7900-maintenance/.git/schedule_daily_3wkKgg
+/create /tn Git Maintenance (weekly) /f /xml /build/reproducible-path/git-2.47.2/t/trash directory.t7900-maintenance/.git/schedule_weekly_fWq35j
 /build/reproducible-path/git-2.47.2/t/trash directory.t7900-maintenance
 ok 45 - start and stop Windows maintenance
 
@@ -510826,7 +510173,7 @@
 	systemd-analyze verify /lib/systemd/system/basic.target
 
 )
-t7900-maintenance.sh: 7: eval: systemd-analyze: not found
+./test-lib.sh: line 1056: systemd-analyze: command not found
 prerequisite SYSTEMD_ANALYZE not satisfied
 ExecStart="/build/reproducible-path/git-2.47.2/git" --exec-path="/build/reproducible-path/git-2.47.2" -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.47.2/git" --exec-path="/build/reproducible-path/git-2.47.2" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%i
@@ -510993,8 +510340,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 something.t
-{"event":"region_enter","sid":"20260304T080322.910838Z-H8d819085-P000d6a32","thread":"main","time":"2026-03-04T08:03:22.911414Z","file":"builtin/gc.c","line":1441,"repo":1,"nesting":1,"category":"maintenance","label":"detach"}
-{"event":"region_leave","sid":"20260304T080322.910838Z-H8d819085-P000d6a32","thread":"main","time":"2026-03-04T08:03:22.925071Z","file":"builtin/gc.c","line":1443,"repo":1,"t_rel":0.013620,"nesting":1,"category":"maintenance","label":"detach"}
+{"event":"region_enter","sid":"20250130T021742.998293Z-H5c947e1c-P00203bdc","thread":"main","time":"2025-01-30T02:17:42.998882Z","file":"builtin/gc.c","line":1441,"repo":1,"nesting":1,"category":"maintenance","label":"detach"}
+{"event":"region_leave","sid":"20250130T021742.998293Z-H5c947e1c-P00203bdc","thread":"main","time":"2025-01-30T02:17:43.013386Z","file":"builtin/gc.c","line":1443,"repo":1,"t_rel":0.014463,"nesting":1,"category":"maintenance","label":"detach"}
 ok 53 - --detach causes maintenance to run in background
 
 expecting success of 7900.54 'repacking loose objects is quiet': 
@@ -511023,6 +510370,637 @@
 1..54
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9002-column.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9002-column/.git/
+expecting success of 9002.1 'setup': 
+	cat >lista <<\EOF
+one
+two
+three
+four
+five
+six
+seven
+eight
+nine
+ten
+eleven
+EOF
+
+ok 1 - setup
+
+expecting success of 9002.2 'never': 
+	git column --indent=Z --mode=never <lista >actual &&
+	test_cmp lista actual
+
+ok 2 - never
+
+expecting success of 9002.3 'always': 
+	cat >expected <<\EOF &&
+Zone
+Ztwo
+Zthree
+Zfour
+Zfive
+Zsix
+Zseven
+Zeight
+Znine
+Zten
+Zeleven
+EOF
+	git column --indent=Z --mode=plain <lista >actual &&
+	test_cmp expected actual
+
+ok 3 - always
+
+expecting success of 9002.4 '--nl': 
+	cat >expected <<\EOF &&
+oneZ
+twoZ
+threeZ
+fourZ
+fiveZ
+sixZ
+sevenZ
+eightZ
+nineZ
+tenZ
+elevenZ
+EOF
+	git column --nl="Z$LF" --mode=plain <lista >actual &&
+	test_cmp expected actual
+
+ok 4 - --nl
+
+expecting success of 9002.5 '80 columns': 
+	cat >expected <<\EOF &&
+one    two    three  four   five   six    seven  eight  nine   ten    eleven
+EOF
+	COLUMNS=80 git column --mode=column <lista >actual &&
+	test_cmp expected actual
+
+ok 5 - 80 columns
+
+expecting success of 9002.6 'COLUMNS = 1': 
+	COLUMNS=1 git column --mode=column <lista >actual &&
+	test_cmp expected actual
+
+ok 6 - COLUMNS = 1
+
+expecting success of 9002.7 'width = 1': 
+	git column --mode=column --width=1 <lista >actual &&
+	test_cmp expected actual
+
+ok 7 - width = 1
+
+expecting success of 9002.8 '20 columns': 
+	cat >expected <<\EOF &&
+one    seven
+two    eight
+three  nine
+four   ten
+five   eleven
+six
+EOF
+	git column --mode=column <lista >actual &&
+	test_cmp expected actual
+
+ok 8 - 20 columns
+
+expecting success of 9002.9 '20 columns, nodense': 
+	cat >expected <<\EOF &&
+one    seven
+two    eight
+three  nine
+four   ten
+five   eleven
+six
+EOF
+	git column --mode=column,nodense < lista > actual &&
+	test_cmp expected actual
+
+ok 9 - 20 columns, nodense
+
+expecting success of 9002.10 '20 columns, dense': 
+	cat >expected <<\EOF &&
+one   five  nine
+two   six   ten
+three seven eleven
+four  eight
+EOF
+	git column --mode=column,dense < lista > actual &&
+	test_cmp expected actual
+
+ok 10 - 20 columns, dense
+
+expecting success of 9002.11 '20 columns, padding 2': 
+	cat >expected <<\EOF &&
+one     seven
+two     eight
+three   nine
+four    ten
+five    eleven
+six
+EOF
+	git column --mode=column --padding 2 <lista >actual &&
+	test_cmp expected actual
+
+ok 11 - 20 columns, padding 2
+
+expecting success of 9002.12 '20 columns, indented': 
+	cat >expected <<\EOF &&
+  one    seven
+  two    eight
+  three  nine
+  four   ten
+  five   eleven
+  six
+EOF
+	git column --mode=column --indent="  " <lista >actual &&
+	test_cmp expected actual
+
+ok 12 - 20 columns, indented
+
+expecting success of 9002.13 '20 columns, row first': 
+	cat >expected <<\EOF &&
+one    two
+three  four
+five   six
+seven  eight
+nine   ten
+eleven
+EOF
+	git column --mode=row <lista >actual &&
+	test_cmp expected actual
+
+ok 13 - 20 columns, row first
+
+expecting success of 9002.14 '20 columns, row first, nodense': 
+	cat >expected <<\EOF &&
+one    two
+three  four
+five   six
+seven  eight
+nine   ten
+eleven
+EOF
+	git column --mode=row,nodense <lista >actual &&
+	test_cmp expected actual
+
+ok 14 - 20 columns, row first, nodense
+
+expecting success of 9002.15 '20 columns, row first, dense': 
+	cat >expected <<\EOF &&
+one   two    three
+four  five   six
+seven eight  nine
+ten   eleven
+EOF
+	git column --mode=row,dense <lista >actual &&
+	test_cmp expected actual
+
+ok 15 - 20 columns, row first, dense
+
+expecting success of 9002.16 'padding must be non-negative': 
+	cat >input <<\EOF &&
+1 2 3 4 5 6
+EOF
+	cat >expected <<\EOF &&
+fatal: --padding must be non-negative
+EOF
+	test_must_fail git column --mode=column --padding=-1 <input >actual 2>&1 &&
+	test_cmp expected actual
+
+ok 16 - padding must be non-negative
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9003-help-autocorrect.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9003-help-autocorrect/.git/
+expecting success of 9003.1 'setup': 
+	# An alias
+	git config alias.lgf "log --format=%s --first-parent" &&
+
+	# A random user-defined command
+	write_script git-distimdistim <<-EOF &&
+		echo distimdistim was called
+	EOF
+
+	PATH="$PATH:." &&
+	export PATH &&
+
+	git commit --allow-empty -m "a single log entry" &&
+
+	# Sanity check
+	git lgf >actual &&
+	echo "a single log entry" >expect &&
+	test_cmp expect actual &&
+
+	git distimdistim >actual &&
+	echo "distimdistim was called" >expect &&
+	test_cmp expect actual
+
+[master (root-commit) b57823c] a single log entry
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 9003.2 'autocorrect showing candidates': 
+	git config help.autocorrect 0 &&
+
+	test_must_fail git lfg 2>actual &&
+	grep "^	lgf" actual &&
+
+	test_must_fail git distimdist 2>actual &&
+	grep "^	distimdistim" actual
+
+	lgf
+	distimdistim
+ok 2 - autocorrect showing candidates
+
+expecting success of 9003.3 'autocorrect running commands': 
+		git config help.autocorrect $immediate &&
+
+		git lfg >actual &&
+		echo "a single log entry" >expect &&
+		test_cmp expect actual &&
+
+		git distimdist >actual &&
+		echo "distimdistim was called" >expect &&
+		test_cmp expect actual
+	
+WARNING: You called a Git command named 'lfg', which does not exist.
+Continuing under the assumption that you meant 'lgf'.
+WARNING: You called a Git command named 'distimdist', which does not exist.
+Continuing under the assumption that you meant 'distimdistim'.
+ok 3 - autocorrect running commands
+
+expecting success of 9003.4 'autocorrect running commands': 
+		git config help.autocorrect $immediate &&
+
+		git lfg >actual &&
+		echo "a single log entry" >expect &&
+		test_cmp expect actual &&
+
+		git distimdist >actual &&
+		echo "distimdistim was called" >expect &&
+		test_cmp expect actual
+	
+WARNING: You called a Git command named 'lfg', which does not exist.
+Continuing under the assumption that you meant 'lgf'.
+WARNING: You called a Git command named 'distimdist', which does not exist.
+Continuing under the assumption that you meant 'distimdistim'.
+ok 4 - autocorrect running commands
+
+expecting success of 9003.5 'autocorrect can be declined altogether': 
+	git config help.autocorrect never &&
+
+	test_must_fail git lfg 2>actual &&
+	grep "is not a git command" actual &&
+	test_line_count = 1 actual
+
+git: 'lfg' is not a git command. See 'git --help'.
+ok 5 - autocorrect can be declined altogether
+
+expecting success of 9003.6 'autocorrect works in work tree created from bare repo': 
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add ../worktree &&
+	git -C worktree -c help.autocorrect=immediate stauts
+
+Cloning into bare repository 'bare.git'...
+done.
+Preparing worktree (new branch 'worktree')
+HEAD is now at b57823c a single log entry
+WARNING: You called a Git command named 'stauts', which does not exist.
+Continuing under the assumption that you meant 'status'.
+On branch worktree
+nothing to commit, working tree clean
+ok 6 - autocorrect works in work tree created from bare repo
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t8013-blame-ignore-revs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8013-blame-ignore-revs/.git/
+expecting success of 8013.1 'setup': 
+	test_commit A file line1 &&
+
+	echo line2 >>file &&
+	git add file &&
+	test_tick &&
+	git commit -m B &&
+	git tag B &&
+
+	test_write_lines line-one line-two >file &&
+	git add file &&
+	test_tick &&
+	git commit -m X &&
+	git tag X &&
+	git tag -a -m "X (annotated)" XT &&
+
+	git blame --line-porcelain file >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse X >expect &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	git rev-parse X >expect &&
+	test_cmp expect actual
+
+[master (root-commit) 6d1c9f2] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 5552443] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master abb9c4e] X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
+
+expecting success of 8013.2 'validate --ignore-rev': 
+	test_must_fail git blame --ignore-rev X^{tree} file
+
+fatal: cannot find revision X^{tree} to ignore
+ok 2 - validate --ignore-rev
+
+expecting success of 8013.3 'validate --ignore-revs-file': 
+	git rev-parse X^{tree} >ignore_x &&
+	git blame --ignore-revs-file ignore_x file
+
+abb9c4e3 (A U Thor 2005-04-07 15:15:13 -0700 1) line-one
+abb9c4e3 (A U Thor 2005-04-07 15:15:13 -0700 2) line-two
+ok 3 - validate --ignore-revs-file
+
+expecting success of 8013.4 'ignore_rev_changing_lines (X)': 
+		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+		git rev-parse A >expect &&
+		test_cmp expect actual &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+		git rev-parse B >expect &&
+		test_cmp expect actual
+	
+ok 4 - ignore_rev_changing_lines (X)
+
+expecting success of 8013.5 'ignore_rev_changing_lines (XT)': 
+		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+		git rev-parse A >expect &&
+		test_cmp expect actual &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+		git rev-parse B >expect &&
+		test_cmp expect actual
+	
+ok 5 - ignore_rev_changing_lines (XT)
+
+expecting success of 8013.6 'ignore_rev_adding_unblamable_lines': 
+	test_write_lines line-one-change line-two-changed y3 y4 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m Y &&
+	git tag Y &&
+
+	git rev-parse Y >expect &&
+	git blame --line-porcelain file --ignore-rev Y >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 3/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 4/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual
+
+[master e0d35d6] Y
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+ok 6 - ignore_rev_adding_unblamable_lines
+
+expecting success of 8013.7 'ignore_revs_from_files': 
+	git rev-parse X >ignore_x &&
+	git rev-parse Y >ignore_y &&
+	git blame --line-porcelain file --ignore-revs-file ignore_x --ignore-revs-file ignore_y >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse A >expect &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	git rev-parse B >expect &&
+	test_cmp expect actual
+
+ok 7 - ignore_revs_from_files
+
+expecting success of 8013.8 'ignore_revs_from_configs_and_files': 
+	git config --add blame.ignoreRevsFile ignore_x &&
+	git blame --line-porcelain file --ignore-revs-file ignore_y >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse A >expect &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	git rev-parse B >expect &&
+	test_cmp expect actual
+
+ok 8 - ignore_revs_from_configs_and_files
+
+expecting success of 8013.9 'override_ignore_revs_file': 
+	git blame --line-porcelain file --ignore-revs-file "" --ignore-revs-file ignore_y >blame_raw &&
+	git rev-parse X >expect &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual
+	
+ok 9 - override_ignore_revs_file
+
+expecting success of 8013.10 'bad_files_and_revs': 
+	test_must_fail git blame file --ignore-rev NOREV 2>err &&
+	test_grep "cannot find revision NOREV to ignore" err &&
+
+	test_must_fail git blame file --ignore-revs-file NOFILE 2>err &&
+	test_grep "could not open.*: NOFILE" err &&
+
+	echo NOREV >ignore_norev &&
+	test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
+	test_grep "invalid object name: NOREV" err
+
+fatal: cannot find revision NOREV to ignore
+fatal: could not open object name list: NOFILE
+fatal: invalid object name: NOREV
+ok 10 - bad_files_and_revs
+
+expecting success of 8013.11 'mark_unblamable_lines': 
+	git config --add blame.markUnblamableLines true &&
+
+	git blame --ignore-rev Y file >blame_raw &&
+	echo "*" >expect &&
+
+	sed -n "3p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
+
+	sed -n "4p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual
+
+ok 11 - mark_unblamable_lines
+
+expecting success of 8013.12 'mark_ignored_lines': 
+	git config --add blame.markIgnoredLines true &&
+
+	test_write_lines line-one-Z line-two-Z y3 y4 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m Z &&
+	git tag Z &&
+
+	git blame --ignore-rev Z file >blame_raw &&
+	echo "?" >expect &&
+
+	sed -n "1p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
+
+	sed -n "2p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
+
+	sed -n "3p" blame_raw | cut -c1 >actual &&
+	! test_cmp expect actual &&
+
+	sed -n "4p" blame_raw | cut -c1 >actual &&
+	! test_cmp expect actual
+
+[master d1e4550] Z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+--- expect	2025-01-30 02:17:44.022253858 +0000
++++ actual	2025-01-30 02:17:44.110254386 +0000
+@@ -1 +1 @@
+-?
++e
+--- expect	2025-01-30 02:17:44.022253858 +0000
++++ actual	2025-01-30 02:17:44.142254578 +0000
+@@ -1 +1 @@
+-?
++e
+ok 12 - mark_ignored_lines
+
+expecting success of 8013.13 'mark_unblamable_lines_intermediate': 
+	git config --add blame.markUnblamableLines true &&
+
+	git blame --ignore-rev Y file >blame_raw 2>stderr &&
+	echo "*" >expect &&
+
+	sed -n "3p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
+
+	sed -n "4p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual
+
+ok 13 - mark_unblamable_lines_intermediate
+
+expecting success of 8013.14 'ignored_chunk_negative_parent_size': 
+	rm -rf .git/ &&
+	git init &&
+
+	test_write_lines L1 L2 L7 L8 L9 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m A &&
+	git tag A &&
+
+	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m B &&
+	git tag B &&
+
+	test_write_lines L1 L2 L3 L4 xxx L6 L7 L8 L9 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m C &&
+	git tag C &&
+
+	git blame file --ignore-rev B >blame_raw
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8013-blame-ignore-revs/.git/
+[master (root-commit) 0157998] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 file
+[master a8e635b] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+[master 3b3594b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 14 - ignored_chunk_negative_parent_size
+
+expecting success of 8013.15 'ignore_merge': 
+	rm -rf .git/ &&
+	git init &&
+
+	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m A &&
+	git tag A &&
+
+	test_write_lines BB L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m B &&
+	git tag B &&
+
+	git reset --hard A &&
+	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 CC >file &&
+	git add file &&
+	test_tick &&
+	git commit -m C &&
+	git tag C &&
+
+	test_merge M B &&
+	git blame --line-porcelain file --ignore-rev M >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse B >expect &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 9/s/ .*//p" blame_raw >actual &&
+	git rev-parse C >expect &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8013-blame-ignore-revs/.git/
+[master (root-commit) aebca2b] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file
+[master 38a4cbf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at aebca2b A
+[master 1f9babe] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - ignore_merge
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t8014-blame-ignore-fuzzy.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t8014-blame-ignore-fuzzy/.git/
 expecting success of 8014.1 'setup': 
@@ -511482,6 +511460,67 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9105-git-svn-commit-diff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
+	A	readme
+r3 = 5118cff93588c65205d1394304681d3dbfb4f60d (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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9102-git-svn-deep-rmdir.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9102-git-svn-deep-rmdir/.git/
 expecting success of 9102.1 'initialize repo': 
@@ -511514,7 +511553,7 @@
 	
 	A	deeply/nested/directory/number/1/file
 	A	deeply/nested/directory/number/2/another
-r1 = 4942172714de3661d9bbe617b722ffd6904bf21d (refs/remotes/git-svn)
+r1 = 9ba623c6ba4d0052e84c43f7d9f1c8a7ce3b103d (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9102-git-svn-deep-rmdir/svnrepo r1
 Switched to a new branch 'test-rmdir'
@@ -511527,7 +511566,7 @@
 	svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
 	
 rm 'deeply/nested/directory/number/2/another'
-[test-rmdir 146565f] remove another
+[test-rmdir a939a5b] remove another
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 100644 deeply/nested/directory/number/2/another
@@ -511536,7 +511575,7 @@
 	D	deeply/nested/directory/number/2/another
 	D	deeply/nested/directory/number/2/
 W: -empty_dir: deeply/nested/directory/number/2
-r2 = 40290df58613257692ca553fa9aec2cf2ce0b804 (refs/remotes/git-svn)
+r2 = f618da148cfd05185278188a9ab4f00499df74ad (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 deeply/nested/directory/number/1/
 deeply/nested/directory/number/1/file
@@ -511546,62 +511585,62 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9105-git-svn-commit-diff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9105-git-svn-commit-diff/.git/
-expecting success of 9105.1 'initialize repo': 
+*** t9103-git-svn-tracked-directory-removed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9103-git-svn-tracked-directory-removed/.git/
+expecting success of 9103.1 'make history for tracking': 
 	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
+	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.
-[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
+A    trunk/README
+Checked out revision 1.
+Committing transaction...
+Committed revision 2.
+Adding         trunk/FOLLOWME
 Committing transaction...
 Committed revision 3.
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
-	A	readme
-r3 = 15591f124eccc3ddac0578b697db2f017d83cb17 (refs/remotes/git-svn)
-	M	readme
-Committed r4
-ok 3 - commit-diff to a sub-directory (with git svn config)
+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.47.2/t/trash directory.t9103-git-svn-tracked-directory-removed/x/.git/
+	A	README
+r1 = 0c46672040b9660e65e4bf2ba0595c110b005004 (refs/remotes/origin/trunk)
+	D	README
+	A	FOLLOWME
+r3 = 163f218dc68f29fa6b665e4462345b80d0bd6ad8 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/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 0c46672 initial
+ok 3 - make sure r2 still has old file
 
 # passed all 3 test(s)
 1..3
@@ -511716,8 +511755,8 @@
 	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 8012.11 'blame with --contents and revision': 
@@ -511745,8 +511784,8 @@
 	check_count A 2 B 2 B1 2
 
 git blame -c  file 
-Author B1 (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
+Author B1 (expected 2, attributed 2) good
 Author B (expected 2, attributed 2) good
 ok 13 - blame 2 authors + 1 branch1 author
 
@@ -511785,28 +511824,28 @@
 	check_count A 2 B 1 B1 2 B2 1
 
 git blame -c  file 
-Author B (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
 Author B2 (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
 ok 17 - blame 2 authors + 2 merged-in authors
 
 expecting success of 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 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 B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+Author A U Thor (expected 2, attributed 2) good
 ok 18 - blame --first-parent blames merge for branch1
 
 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': 
@@ -511829,11 +511868,11 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
 
 git blame -c  file 
-Author B1 (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 22 - blame evil merge
 
 expecting success of 8012.23 'blame huge graft': 
@@ -512016,8 +512055,8 @@
 hint:
 hint: Turn this message off by running
 hint: "git config advice.graftFileDeprecated false"
-Author 10 (expected 1, attributed 1) good
 Author 01 (expected 1, attributed 1) good
+Author 10 (expected 1, attributed 1) good
 Switched to branch 'branch2'
 ok 23 - blame huge graft
 
@@ -512035,12 +512074,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 B2 (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
+Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
-Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
 ok 25 - blame incomplete line
 
 expecting success of 8012.26 'setup edits': 
@@ -512062,13 +512101,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 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 B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 ok 27 - blame edits
 
 expecting success of 8012.28 'setup obfuscated email': 
@@ -512087,42 +512126,42 @@
 	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 A U Thor (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 E (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 ok 29 - blame obfuscated email
 
 expecting success of 8012.30 'blame -L 1 (all)': 
 	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L1 file 
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author A 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 B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A (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 D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author C (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 A U Thor (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 31 - blame -L , (all)
 
 expecting success of 8012.32 'blame -L X (X to end)': 
@@ -512130,28 +512169,28 @@
 
 git blame -c  -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
-Author C (expected 1, attributed 1) good
 ok 32 - blame -L X (X to end)
 
 expecting success of 8012.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 B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 ok 33 - blame -L X, (X to end)
 
 expecting success of 8012.34 'blame -L ,Y (up to Y)': 
 	check_count -L,3 A 1 B2 1 E 1
 
 git blame -c  -L,3 file 
-Author A (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 34 - blame -L ,Y (up to Y)
 
 expecting success of 8012.35 'blame -L X,X': 
@@ -512165,19 +512204,19 @@
 	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,6 file 
-Author B2 (expected 1, attributed 1) good
-Author D (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 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 B1 (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)
 
@@ -512223,9 +512262,9 @@
 
 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 B1 (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': 
@@ -512251,29 +512290,29 @@
 	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 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 8012.49 'blame -L /RE/ (RE to end)': 
 	check_count -L/evil/ C 1 "A U Thor" 1
 
 git blame -c  -L/evil/ file 
-Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 49 - blame -L /RE/ (RE to end)
 
 expecting success of 8012.50 'blame -L /RE/,/RE2/': 
 	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
 
 git blame -c  -L/robot/,/green/ file 
-Author E (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 E (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 50 - blame -L /RE/,/RE2/
 
 expecting success of 8012.51 'blame -L X,/RE/': 
@@ -512289,18 +512328,18 @@
 	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 D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 52 - blame -L /RE/,Y
 
 expecting success of 8012.53 'blame -L /RE/,+N': 
 	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
 
 git blame -c  -L/99/,+3 file 
-Author D (expected 1, attributed 1) good
-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 53 - blame -L /RE/,+N
 
 expecting success of 8012.54 'blame -L /RE/,-N': 
@@ -512308,8 +512347,8 @@
 
 git blame -c  -L/99/,-3 file 
 Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 54 - blame -L /RE/,-N
 
 expecting success of 8012.55 'blame -L X (X == nlines)': 
@@ -512338,14 +512377,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 C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-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 B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 58 - blame -L ,Y (Y == nlines)
 
 expecting success of 8012.59 'blame -L ,Y (Y == nlines + 1)': 
@@ -512353,38 +512392,38 @@
 	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 A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author A (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 C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (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 A U Thor (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
+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 D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 60 - blame -L ,Y (Y > nlines)
 
 expecting success of 8012.61 'blame -L multiple (disjoint)': 
 	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
 
 git blame -c  -L2,3 -L6,7 file 
-Author B1 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 61 - blame -L multiple (disjoint)
 
 expecting success of 8012.62 'blame -L multiple (disjoint: unordered)': 
@@ -512393,28 +512432,28 @@
 git blame -c  -L6,7 -L2,3 file 
 Author A U Thor (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author B1 (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 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
+Author B (expected 1, attributed 1) good
 ok 63 - blame -L multiple (adjacent)
 
 expecting success of 8012.64 'blame -L multiple (adjacent: unordered)': 
 	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
 
 git blame -c  -L4,5 -L2,3 file 
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 ok 64 - blame -L multiple (adjacent: unordered)
 
 expecting success of 8012.65 'blame -L multiple (overlapping)': 
@@ -512422,8 +512461,8 @@
 
 git blame -c  -L2,4 -L3,5 file 
 Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 ok 65 - blame -L multiple (overlapping)
 
@@ -512431,9 +512470,9 @@
 	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
 
 git blame -c  -L3,5 -L2,4 file 
-Author D (expected 1, attributed 1) good
-Author 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 A (expected 1, attributed 1) good
 ok 66 - blame -L multiple (overlapping: unordered)
 
@@ -512441,12 +512480,12 @@
 	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L2,8 -L3,5 file 
+Author A U Thor (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 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 D (expected 1, attributed 1) good
 ok 67 - blame -L multiple (superset/subset)
 
@@ -512454,45 +512493,45 @@
 	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 C (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 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
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B2 (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 C (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 B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 69 - blame -L /RE/ (relative)
 
 expecting success of 8012.70 'blame -L /RE/ (relative: no preceding range)': 
 	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L/dog/ file 
-Author A (expected 1, attributed 1) good
+Author C (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 C (expected 1, attributed 1) good
-Author B1 (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
 ok 70 - blame -L /RE/ (relative: no preceding range)
 
 expecting success of 8012.71 'blame -L /RE/ (relative: adjacent)': 
 	check_count -L1,1 -L/dog/,+1 A 1 E 1
 
 git blame -c  -L1,1 -L/dog/,+1 file 
-Author 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)': 
@@ -512511,16 +512550,16 @@
 	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
 
 git blame -c  -L3,3 -L^/dog/,+2 file 
-Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 74 - blame -L ^/RE/ (absolute)
 
 expecting success of 8012.75 'blame -L ^/RE/ (absolute: no preceding range)': 
 	check_count -L^/dog/,+2 A 1 B2 1
 
 git blame -c  -L^/dog/,+2 file 
-Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 75 - blame -L ^/RE/ (absolute: no preceding range)
 
 expecting success of 8012.76 'blame -L ^/RE/ (absolute: not found)': 
@@ -512534,9 +512573,9 @@
 	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
 
 git blame -c  -L8 -L^/$/,+2 file 
+Author E (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 ok 77 - blame -L ^/RE/ (absolute: end-of-file)
 
 expecting success of 8012.78 'setup -L :regex': 
@@ -512641,8 +512680,8 @@
 	check_count -f hello.c -L^:ma.. F 4 G 1
 
 git blame -c  -L^:ma.. hello.c 
-Author G (expected 1, attributed 1) good
 Author F (expected 4, attributed 4) good
+Author G (expected 1, attributed 1) good
 ok 87 - blame -L ^:RE (absolute: no preceding range)
 
 expecting success of 8012.88 'blame -L ^:RE (absolute: not found)': 
@@ -512656,8 +512695,8 @@
 	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 F (expected 4, attributed 4) good
 Author H (expected 1, attributed 1) good
 ok 89 - blame -L ^:RE (absolute: end-of-file)
 
@@ -512690,8 +512729,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 8012.91 'setup incremental': 
@@ -512992,77 +513031,16 @@
 	test_line_count = 1 colored &&
 	grep qfunc colored
 
-[branch2 372f189] new commit
+[branch2 6f92d32] new commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-<CYAN>372f1897 (A U Thor 2026-03-04 08:03:28 +0000 11) <RESET>void qfunc();
+<CYAN>6f92d329 (A U Thor 2025-01-30 02:17:52 +0000 11) <RESET>void qfunc();
 ok 119 - blame color by age: new code is different
 
 # passed all 119 test(s)
 1..119
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9103-git-svn-tracked-directory-removed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t9103-git-svn-tracked-directory-removed/x/.git/
-	A	README
-r1 = 623539a099333f287f97058cff15a3de5a622910 (refs/remotes/origin/trunk)
-	D	README
-	A	FOLLOWME
-r3 = bcd8fd1d24d66d7aaad3a8b89af9591f035a7ab8 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/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 623539a 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9111-git-svn-use-svnsync-props.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9111-git-svn-use-svnsync-props/.git/
 expecting success of 9111.1 'load svnsync repo': 
@@ -513076,10 +513054,10 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir/a/b/c/d/e => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-	A	a/b/c/d/e/file
-r1 = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
 	A	file
 r1 = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
+	A	a/b/c/d/e/file
+r1 = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
 	D	a/b/c/d/e/file
 	D	a/
 	A	file
@@ -513144,256 +513122,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9106-git-svn-commit-diff-clobber.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9106-git-svn-commit-diff-clobber/.git/
-expecting success of 9106.1 'initialize repo': 
-	mkdir import &&
-	(
-		cd import &&
-		echo initial >file &&
-		svn_cmd import -m "initial" . "$svnrepo"
-	) &&
-	echo initial > file &&
-	git update-index --add file &&
-	git commit -a -m "initial"
-	
-Adding         file
-Committing transaction...
-Committed revision 1.
-[master (root-commit) 8d59b1f] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - initialize repo
-
-expecting success of 9106.2 'commit change from svn side': 
-	svn_cmd co "$svnrepo" t.svn &&
-	(
-		cd t.svn &&
-		echo second line from svn >>file &&
-		poke file &&
-		svn_cmd commit -m "second line from svn"
-	) &&
-	rm -rf t.svn
-	
-A    t.svn/file
-Checked out revision 1.
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-ok 2 - commit change from svn side
-
-expecting success of 9106.3 'commit conflicting change from git': 
-	echo second line from git >> file &&
-	git commit -a -m "second line from git" &&
-	test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
-
-[master 62e39e5] second line from git
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Transaction is out of date: File '/file' is out of date at /build/reproducible-path/git-2.47.2/git-svn line 1546.
-
-ok 3 - commit conflicting change from git
-
-expecting success of 9106.4 'commit complementing change from git': 
-	git reset --hard HEAD~1 &&
-	echo second line from svn >> file &&
-	git commit -a -m "second line from svn" &&
-	echo third line from git >> file &&
-	git commit -a -m "third line from git" &&
-	git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
-	
-HEAD is now at 8d59b1f initial
-[master 3494a8f] second line from svn
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 57507a0] third line from git
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-	M	file
-Committed r3
-ok 4 - commit complementing change from git
-
-expecting success of 9106.5 'dcommit fails to commit because of conflict': 
-	git svn init "$svnrepo" &&
-	git svn fetch &&
-	git reset --hard refs/remotes/git-svn &&
-	svn_cmd co "$svnrepo" t.svn &&
-	(
-		cd t.svn &&
-		echo fourth line from svn >>file &&
-		poke file &&
-		svn_cmd commit -m "fourth line from svn"
-	) &&
-	rm -rf t.svn &&
-	echo "fourth line from git" >> file &&
-	git commit -a -m "fourth line from git" &&
-	test_must_fail git svn dcommit
-	
-	A	file
-r1 = d2e8b9564883e297e1b701f5a5080dee44caee99 (refs/remotes/git-svn)
-	M	file
-r2 = f2bb31a7a34f6c184601a6e6dfb0568ee5f14b38 (refs/remotes/git-svn)
-	M	file
-r3 = 4ab13decdf043887e681b1905bedbbd367de19dd (refs/remotes/git-svn)
-HEAD is now at 4ab13de third line from git
-A    t.svn/file
-Checked out revision 3.
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 4.
-[master 51ec78f] fourth line from git
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-
-ERROR from SVN:
-Transaction is out of date: File '/file' is out of date
-W: 51ec78ff45448a417d10fd01228f919ad736a715 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 faa34c792e6a485955b65cc9f20e8ab0dd63e45c d270188940c824ce4f1e8aa864ca5d2f8c75f939 M	file
-Current branch master is up to date.
-ERROR: Not all changes have been committed into SVN, however the committed
-ones (if any) seem to be successfully integrated into the working tree.
-Please see the above messages for details.
-
-ok 5 - dcommit fails to commit because of conflict
-
-expecting success of 9106.6 'dcommit does the svn equivalent of an index merge': 
-	git reset --hard refs/remotes/git-svn &&
-	echo 'index merge' > file2 &&
-	git update-index --add file2 &&
-	git commit -a -m 'index merge' &&
-	echo 'more changes' >> file2 &&
-	git update-index file2 &&
-	git commit -a -m 'more changes' &&
-	git svn dcommit
-	
-HEAD is now at 4ab13de third line from git
-[master e11132c] index merge
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[master 34a3aed] more changes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-	A	file2
-Committed r5
-	M	file
-r4 = 1e0dfb05592d9a0ab4546256f4fd6bfd119d30e2 (refs/remotes/git-svn)
-	A	file2
-r5 = 6d6680ddb887bf2830df41007db89a74dcb495b2 (refs/remotes/git-svn)
-W: e11132cdd2717c4e2cfbea8f3da28445f8ef5926 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 d270188940c824ce4f1e8aa864ca5d2f8c75f939 b349877e032add143a5dc286d30e523181dea4ef M	file
-warning: skipped previously applied commit e11132c
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-	M	file2
-Committed r6
-	M	file2
-r6 = 0d3255628b2d5690c077a842b0cde0b93397c9b8 (refs/remotes/git-svn)
-No changes between 5346af00981774209a98c6620b14f979b9dee2b6 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 6 - dcommit does the svn equivalent of an index merge
-
-expecting success of 9106.7 'commit another change from svn side': 
-	svn_cmd co "$svnrepo" t.svn &&
-	(
-		cd t.svn &&
-		echo third line from svn >>file &&
-		poke file &&
-		svn_cmd commit -m "third line from svn"
-	) &&
-	rm -rf t.svn
-	
-A    t.svn/file
-A    t.svn/file2
-Checked out revision 6.
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 7.
-ok 7 - commit another change from svn side
-
-expecting success of 9106.8 'multiple dcommit from git svn will not clobber svn': 
-	git reset --hard refs/remotes/git-svn &&
-	echo new file >> new-file &&
-	git update-index --add new-file &&
-	git commit -a -m 'new file' &&
-	echo clobber > file &&
-	git commit -a -m 'clobber' &&
-	test_must_fail git svn dcommit
-	
-HEAD is now at 0d32556 more changes
-[master c22352a] new file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new-file
-[master 0cfd03c] clobber
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-	A	new-file
-Committed r8
-	M	file
-r7 = 8a7f48fd6a69754ea288b40fa0616c39fa2e8f79 (refs/remotes/git-svn)
-	A	new-file
-r8 = 95a5e21d8c797f066e3f3d5714d7ff458f28b5e2 (refs/remotes/git-svn)
-W: c22352a54eaae15ab4294531b49c18ea2ccb5813 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 b349877e032add143a5dc286d30e523181dea4ef fad4bec9888fc6883cc5a8447f365d44b8e4ebba M	file
-warning: skipped previously applied commit c22352a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 0cfd03c... 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 advice.mergeConflict false"
-Could not apply 0cfd03c... clobber
-rebase refs/remotes/git-svn: command returned error: 1
-
-ok 8 - multiple dcommit from git svn will not clobber svn
-
-expecting success of 9106.9 'check that rebase really failed': 
-	git status >output &&
-	grep currently.rebasing output
-
-You are currently rebasing branch 'master' on '95a5e21'.
-ok 9 - check that rebase really failed
-
-expecting success of 9106.10 'resolve, continue the rebase and dcommit': 
-	echo clobber and I really mean it > file &&
-	git update-index file &&
-	git rebase --continue &&
-	git svn dcommit
-	
-[detached HEAD f8b8c99] clobber
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 5 deletions(-)
-Successfully rebased and updated refs/heads/master.
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-	M	file
-Committed r9
-	M	file
-r9 = d5e409b330d5f74b9bf2fbf02fe4abd6521a0a0e (refs/remotes/git-svn)
-No changes between f8b8c994e0e23f3c7f097240cd8d71dcc86c2fe8 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 10 - resolve, continue the rebase and dcommit
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9108-git-svn-glob.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9108-git-svn-glob/.git/
 expecting success of 9108.1 'test refspec globbing': 
@@ -513492,22 +513220,22 @@
 	(required for this version (2.47.2) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = d9433adbc1bc1d6dbb4e693f6abd383e85c22bb7 (refs/remotes/trunk)
+r1 = 4c26ff03588ce8b03a96fcc22d9c213493e6fd3d (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a, 1
-Found branch parent: (refs/remotes/branches/start) d9433adbc1bc1d6dbb4e693f6abd383e85c22bb7
+Found branch parent: (refs/remotes/branches/start) 4c26ff03588ce8b03a96fcc22d9c213493e6fd3d
 Following parent with do_switch
 Successfully followed parent
-r2 = ebe7973b86e1ea021028ebe46a827a536b629042 (refs/remotes/branches/start)
+r2 = c21fa40f4d18aee12c7f9a57748d0276fa0c0084 (refs/remotes/branches/start)
 	M	readme
-r3 = 4b00bc71b7203e0df44894e69cd676bff72b8a79 (refs/remotes/branches/start)
+r3 = f595a935f3b24fe2555bf4e7e97951f4083f0a45 (refs/remotes/branches/start)
 branch_from: /branches/start => /branches/start/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) 4b00bc71b7203e0df44894e69cd676bff72b8a79
+Found branch parent: (refs/remotes/tags/end) f595a935f3b24fe2555bf4e7e97951f4083f0a45
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = 44bb826e8045b007084676ea116f573feb6befad (refs/remotes/tags/end)
+r4 = 79d20a1e2c682bf7dae175bdb3d52c66062039c1 (refs/remotes/tags/end)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/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.
@@ -513549,26 +513277,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 6ad8a59cda5e5858df2781e1c75a095decf1a0d3 (refs/remotes/two/trunk)
+r1 = d4ef2523f948d88e8c35ef87fef9a59d86a08a3c (refs/remotes/two/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start, 1
-Found branch parent: (refs/remotes/two/branches/start) 6ad8a59cda5e5858df2781e1c75a095decf1a0d3
+Found branch parent: (refs/remotes/two/branches/start) d4ef2523f948d88e8c35ef87fef9a59d86a08a3c
 Following parent with do_switch
 Successfully followed parent
-r2 = de06d0200f81617eeccf548ff72c50f40f0aa630 (refs/remotes/two/branches/start)
+r2 = 41e7403fb9d73a9fa42a60d21cac6679219a901a (refs/remotes/two/branches/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = 1e6776db5ffb8a1a59b3fdf9d589d7e8c395b281 (refs/remotes/two/branches/start)
+r3 = dc48fdd2f54210aacd6bcc7018a06e0a7f8ed191 (refs/remotes/two/branches/start)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) 1e6776db5ffb8a1a59b3fdf9d589d7e8c395b281
+Found branch parent: (refs/remotes/two/tags/end) dc48fdd2f54210aacd6bcc7018a06e0a7f8ed191
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 87476fce8d988b74b86954538d6473cb2df3d7d5 (refs/remotes/two/tags/end)
+r4 = 1f9c920164fb04612bc82ff46b36eef9bf2b5cd6 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r5 = 912b93c10161f9e457b17e0ef501e7c7f6a52398 (refs/remotes/two/tags/end)
+r5 = b70689c34873d04b902b2e3b66b7ee25446d8270 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r6 = 633dc705f063e4f85a0ad9ad937d3d24f5127560 (refs/remotes/two/tags/end)
+r6 = 11852bc59e0381326a31ae0a153702de8e77d46d (refs/remotes/two/tags/end)
 ok 2 - test left-hand-side only globbing
 
 expecting success of 9108.3 'prepare test disallow multi-globs': 
@@ -513606,101 +513334,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9110-git-svn-use-svm-props.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9110-git-svn-use-svm-props/.git/
-expecting success of 9110.1 'load svm repo': 
-	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9110/svm.dump &&
-	git svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
-	git svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
-	git svn init --minimize-url -R argh -i e \
-	  "$svnrepo"/mirror/argh/a/b/c/d/e &&
-	git config svn.useSvmProps true &&
-	git svn fetch --all
-	
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh/a/b/c/d/e => file:///build/reproducible-path/git-2.47.2/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)
-	D	a/b/c/d/e/file
-	D	a/
-	A	file
-W: -empty_dir: mirror/argh/a
-r10 (@2) = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
-	A	zzz
-r2 (@1) = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
-	M	zzz
-r3 (@6) = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
-	A	d
-r4 (@9) = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
-	A	newdir/dir
-r5 (@10) = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
-	M	newdir/dir
-r6 (@11) = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
-	M	d
-r7 (@12) = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr r7
-ok 1 - load svm repo
-
-expecting success of 9110.2 'verify metadata for /bar': 
-	git cat-file commit refs/remotes/bar >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~1 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~2 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~3 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~4 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~5 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
-	
-git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89
-ok 2 - verify metadata for /bar
-
-expecting success of 9110.3 'verify metadata for /dir/a/b/c/d/e': 
-	git cat-file commit refs/remotes/e >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
-	
-git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89
-ok 3 - verify metadata for /dir/a/b/c/d/e
-
-expecting success of 9110.4 'verify metadata for /dir': 
-	git cat-file commit refs/remotes/dir >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/dir~1 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
-	
-git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89
-ok 4 - verify metadata for /dir
-
-expecting success of 9110.5 'find commit based on SVN revision number': 
-	git svn find-rev r12 >actual &&
-	grep ab9ada04d293d792e2e941a664911858fe0167af actual
-        
-ab9ada04d293d792e2e941a664911858fe0167af
-ok 5 - find commit based on SVN revision number
-
-expecting success of 9110.6 'empty rebase': 
-	git svn rebase
-	
-Current branch master is up to date.
-ok 6 - empty rebase
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t7800-difftool.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t7800-difftool/.git/
 expecting success of 7800.1 'basic usage requires no repo': 
@@ -513854,7 +513487,7 @@
 		fi &&
 		test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
 	
-/build/reproducible-path/git-2.47.2/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/reproducible-path/git-2.47.2/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
 
@@ -513927,7 +513560,7 @@
 		fi &&
 		test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
 	
-/build/reproducible-path/git-2.47.2/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/reproducible-path/git-2.47.2/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
 
@@ -514803,10 +514436,10 @@
 		test_cmp expect "$(cat tmpdir)/file"
 	)
 
-warning: both files modified: '/build/reproducible-path/git-2.47.2/t/trash directory.t7800-difftool/file' and '/build/reproducible-path/git-2.47.2/t/trash directory.t7800-difftool/git-difftool.CjJA3D/right/file'.
+warning: both files modified: '/build/reproducible-path/git-2.47.2/t/trash directory.t7800-difftool/file' and '/build/reproducible-path/git-2.47.2/t/trash directory.t7800-difftool/git-difftool.GdK7ta/right/file'.
 warning: working tree file has been left.
 warning: 
-warning: temporary files exist in '/build/reproducible-path/git-2.47.2/t/trash directory.t7800-difftool/git-difftool.CjJA3D'.
+warning: temporary files exist in '/build/reproducible-path/git-2.47.2/t/trash directory.t7800-difftool/git-difftool.GdK7ta'.
 warning: you may want to cleanup or recover these.
 ok 82 - difftool --no-symlinks detects conflict 
 
@@ -515018,9 +514651,9 @@
 	git add -N intent-to-add &&
 	git difftool --dir-diff --extcmd ls
 
-/tmp/git-difftool.6wydxf/left/:
+/tmp/git-difftool.s5OuQR/left/:
 
-/tmp/git-difftool.6wydxf/right/:
+/tmp/git-difftool.s5OuQR/right/:
 intent-to-add
 HEAD is now at 8845cd2 initial
 ok 87 - add -N and difftool -d
@@ -515138,279 +514771,378 @@
 1..93
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9112-git-svn-md5less-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9112-git-svn-md5less-file/.git/
-expecting success of 9112.1 'load svn dumpfile': svnadmin load "$rawsvnrepo" < dumpfile.svn
-<<< Started new transaction, based on original revision 1
-     * editing path : md5less-file ... done.
+*** t9110-git-svn-use-svm-props.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9110-git-svn-use-svm-props/.git/
+expecting success of 9110.1 'load svm repo': 
+	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9110/svm.dump &&
+	git svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
+	git svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
+	git svn init --minimize-url -R argh -i e \
+	  "$svnrepo"/mirror/argh/a/b/c/d/e &&
+	git config svn.useSvmProps true &&
+	git svn fetch --all
+	
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh/a/b/c/d/e => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
+	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
+W: -empty_dir: mirror/argh/a
+r10 (@2) = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
+	A	zzz
+r2 (@1) = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
+	M	zzz
+r3 (@6) = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
+	A	d
+r4 (@9) = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
+	A	newdir/dir
+r5 (@10) = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
+	M	newdir/dir
+r6 (@11) = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
+	M	d
+r7 (@12) = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr r7
+ok 1 - load svm repo
 
-------- Committed revision 1 >>>
+expecting success of 9110.2 'verify metadata for /bar': 
+	git cat-file commit refs/remotes/bar >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~1 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~2 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~3 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~4 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~5 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
+	
+git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89
+ok 2 - verify metadata for /bar
 
-ok 1 - load svn dumpfile
+expecting success of 9110.3 'verify metadata for /dir/a/b/c/d/e': 
+	git cat-file commit refs/remotes/e >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
+	
+git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89
+ok 3 - verify metadata for /dir/a/b/c/d/e
 
-expecting success of 9112.2 'initialize git svn': git svn init "$svnrepo"
-ok 2 - initialize git svn
+expecting success of 9110.4 'verify metadata for /dir': 
+	git cat-file commit refs/remotes/dir >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/dir~1 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
+	
+git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89
+ok 4 - verify metadata for /dir
 
-expecting success of 9112.3 'fetch revisions from svn': git svn fetch
-	A	md5less-file
-r1 = b485ff71562b52054781867512fa70db802fd1e4 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
-ok 3 - fetch revisions from svn
+expecting success of 9110.5 'find commit based on SVN revision number': 
+	git svn find-rev r12 >actual &&
+	grep ab9ada04d293d792e2e941a664911858fe0167af actual
+        
+ab9ada04d293d792e2e941a664911858fe0167af
+ok 5 - find commit based on SVN revision number
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9113-git-svn-dcommit-new-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9113-git-svn-dcommit-new-file/.git/
-1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
+expecting success of 9110.6 'empty rebase': 
+	git svn rebase
+	
+Current branch master is up to date.
+ok 6 - empty rebase
+
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9107-git-svn-migrate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9107-git-svn-migrate/.git/
-expecting success of 9107.1 'setup old-looking metadata': 
-	cp "$GIT_DIR"/config "$GIT_DIR"/config-old-git-svn &&
+*** t9106-git-svn-commit-diff-clobber.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9106-git-svn-commit-diff-clobber/.git/
+expecting success of 9106.1 'initialize repo': 
 	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"
+		echo initial >file &&
+		svn_cmd import -m "initial" . "$svnrepo"
 	) &&
-	git svn init "$svnrepo" &&
-	git svn fetch &&
-	rm -rf "$GIT_DIR"/svn &&
-	git update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
-	git update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&
-	git update-ref -d refs/remotes/git-svn refs/remotes/git-svn
+	echo initial > file &&
+	git update-index --add file &&
+	git commit -a -m "initial"
 	
-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
+Adding         file
 Committing transaction...
 Committed revision 1.
-	A	branches/a/README
-	A	branches/b/README
-	A	tags/0.1/README
-	A	tags/0.2/README
-	A	tags/0.3/README
-	A	trunk/README
-r1 = 898c69d11e135b1764f75c124051a0d1384c3fdb (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo r1
-ok 1 - setup old-looking metadata
+[master (root-commit) 8d59b1f] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - initialize repo
 
-expecting success of 9107.2 'git-svn-HEAD is a real HEAD': 
-	git rev-parse --verify refs/heads/git-svn-HEAD^0
+expecting success of 9106.2 'commit change from svn side': 
+	svn_cmd co "$svnrepo" t.svn &&
+	(
+		cd t.svn &&
+		echo second line from svn >>file &&
+		poke file &&
+		svn_cmd commit -m "second line from svn"
+	) &&
+	rm -rf t.svn
+	
+A    t.svn/file
+Checked out revision 1.
+Sending        file
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+ok 2 - commit change from svn side
 
-898c69d11e135b1764f75c124051a0d1384c3fdb
-ok 2 - git-svn-HEAD is a real HEAD
+expecting success of 9106.3 'commit conflicting change from git': 
+	echo second line from git >> file &&
+	git commit -a -m "second line from git" &&
+	test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
 
-expecting success of 9107.3 'initialize old-style (v0) git svn layout': 
-	mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
-	echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
-	echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
-	git svn migrate &&
-	! test -d "$GIT_DIR"/git-svn &&
-	git rev-parse --verify refs/remotes/git-svn^0 &&
-	git rev-parse --verify refs/remotes/svn^0 &&
-	test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
-	test $(git config --get svn-remote.svn.fetch) = \
-		":refs/remotes/git-svn"
+[master 62e39e5] second line from git
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Transaction is out of date: File '/file' is out of date at /build/reproducible-path/git-2.47.2/git-svn line 1546.
+
+ok 3 - commit conflicting change from git
+
+expecting success of 9106.4 'commit complementing change from git': 
+	git reset --hard HEAD~1 &&
+	echo second line from svn >> file &&
+	git commit -a -m "second line from svn" &&
+	echo third line from git >> file &&
+	git commit -a -m "third line from git" &&
+	git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
 	
-Migrating from v0 layout...
-Renaming ref: refs/heads/git-svn-HEAD => refs/remotes/git-svn
-Renaming ref: refs/heads/svn-HEAD => refs/remotes/svn
-Done migrating from v0 layout...
-Migrating from a git-svn v1 layout...
-Data from a previous version of git-svn exists, but
-	.git/svn
-	(required for this version (2.47.2) of git-svn) does not exist.
- - .git/git-svn => .git/svn/git-svn
- - .git/svn/info => .git/svn/svn/info
-Done migrating from a git-svn v1 layout
-898c69d11e135b1764f75c124051a0d1384c3fdb
-898c69d11e135b1764f75c124051a0d1384c3fdb
-ok 3 - initialize old-style (v0) git svn layout
+HEAD is now at 8d59b1f initial
+[master 3494a8f] second line from svn
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 57507a0] third line from git
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+	M	file
+Committed r3
+ok 4 - commit complementing change from git
 
-expecting success of 9107.4 'initialize a multi-repository repo': 
-	git svn init "$svnrepo" -T trunk -t tags -b branches &&
-	git config --get-all svn-remote.svn.fetch > fetch.out &&
-	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
-	test -n "$(git config --get svn-remote.svn.branches \
-		    "^branches/\*:refs/remotes/origin/\*$")" &&
-	test -n "$(git config --get svn-remote.svn.tags \
-		    "^tags/\*:refs/remotes/origin/tags/\*$")" &&
-	git config --unset svn-remote.svn.branches \
-	                        "^branches/\*:refs/remotes/origin/\*$" &&
-	git config --unset svn-remote.svn.tags \
-	                        "^tags/\*:refs/remotes/origin/tags/\*$" &&
-	git config --add svn-remote.svn.fetch "branches/a:refs/remotes/origin/a" &&
-	git config --add svn-remote.svn.fetch "branches/b:refs/remotes/origin/b" &&
-	for i in tags/0.1 tags/0.2 tags/0.3
-	do
-		git config --add svn-remote.svn.fetch \
-			$i:refs/remotes/origin/$i || return 1
-	done &&
-	git config --get-all svn-remote.svn.fetch > fetch.out &&
-	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
-	grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
-	grep "^branches/b:refs/remotes/origin/b$" fetch.out &&
-	grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
-	grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
-	grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
-	grep "^:refs/remotes/git-svn" fetch.out
+expecting success of 9106.5 'dcommit fails to commit because of conflict': 
+	git svn init "$svnrepo" &&
+	git svn fetch &&
+	git reset --hard refs/remotes/git-svn &&
+	svn_cmd co "$svnrepo" t.svn &&
+	(
+		cd t.svn &&
+		echo fourth line from svn >>file &&
+		poke file &&
+		svn_cmd commit -m "fourth line from svn"
+	) &&
+	rm -rf t.svn &&
+	echo "fourth line from git" >> file &&
+	git commit -a -m "fourth line from git" &&
+	test_must_fail git svn dcommit
 	
-Using existing [svn-remote "svn"]
-trunk:refs/remotes/origin/trunk
-trunk:refs/remotes/origin/trunk
-branches/a:refs/remotes/origin/a
-branches/b:refs/remotes/origin/b
-tags/0.1:refs/remotes/origin/tags/0.1
-tags/0.2:refs/remotes/origin/tags/0.2
-tags/0.3:refs/remotes/origin/tags/0.3
-:refs/remotes/git-svn
-ok 4 - initialize a multi-repository repo
+	A	file
+r1 = 9f41702aebc7f57979b79fd91cea0b62545163e4 (refs/remotes/git-svn)
+	M	file
+r2 = b995cef55e83c1c46b21d78d14176333313c3427 (refs/remotes/git-svn)
+	M	file
+r3 = 4599f721040b7012579d9c5faa66ac8ec9042072 (refs/remotes/git-svn)
+HEAD is now at 4599f72 third line from git
+A    t.svn/file
+Checked out revision 3.
+Sending        file
+Transmitting file data .done
+Committing transaction...
+Committed revision 4.
+[master 56b6318] fourth line from git
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
 
-expecting success of 9107.5 'multi-fetch works on partial urls + paths': 
-	refs="trunk a b tags/0.1 tags/0.2 tags/0.3" &&
-	git svn multi-fetch &&
-	for i in $refs
-	do
-		git rev-parse --verify refs/remotes/origin/$i^0 || return 1;
-	done >refs.out &&
-	test -z "$(sort <refs.out | uniq -d)" &&
-	for i in $refs
-	do
-		for j in $refs
-		do
-			git diff --exit-code refs/remotes/origin/$i \
-					     refs/remotes/origin/$j ||
-				return 1
-		done
-	done
+ERROR from SVN:
+Transaction is out of date: File '/file' is out of date
+W: 56b6318fb484c8fe2a5fc333770418507e31154c and refs/remotes/git-svn differ, using rebase:
+:100644 100644 faa34c792e6a485955b65cc9f20e8ab0dd63e45c d270188940c824ce4f1e8aa864ca5d2f8c75f939 M	file
+Current branch master is up to date.
+ERROR: Not all changes have been committed into SVN, however the committed
+ones (if any) seem to be successfully integrated into the working tree.
+Please see the above messages for details.
 
-Rebuilding .git/svn/git-svn/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83 ...
-r1 = 898c69d11e135b1764f75c124051a0d1384c3fdb
-Done rebuilding .git/svn/git-svn/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83
-	A	README
-r1 = 560bc2d4f3299f442e5e3251d3df806587b19783 (refs/remotes/origin/trunk)
-	A	README
-r1 = 97c74c65e7910090541eb45cc6effa06703f5730 (refs/remotes/origin/tags/0.1)
-	A	README
-r1 = 525bd2f5669a8951f1d74851779383e5660dbe0e (refs/remotes/origin/b)
-	A	README
-r1 = fc956e7f7f44ac417fa2e38e22447f0b09365d1d (refs/remotes/origin/a)
-	A	README
-r1 = 6aa26aa3bd87ba7beb3947aa5c578408ec1bbaf5 (refs/remotes/origin/tags/0.2)
-	A	README
-r1 = ddce8d379dfc0bd64fd05a80b5a2702fc55fbbcb (refs/remotes/origin/tags/0.3)
-ok 5 - multi-fetch works on partial urls + paths
+ok 5 - dcommit fails to commit because of conflict
 
-expecting success of 9107.6 'migrate --minimize on old inited layout': 
-	git config --unset-all svn-remote.svn.fetch &&
-	git config --unset-all svn-remote.svn.url &&
-	rm -rf "$GIT_DIR"/svn &&
-	for i in $(cat fetch.out)
-	do
-		path=${i%%:*} &&
-		ref=${i#*:} &&
-		if test "$ref" = "${ref#refs/remotes/}"; then continue; fi &&
-		if test -n "$path"; then path="/$path"; fi &&
-		mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
-		echo "$svnrepo"$path >"$GIT_DIR"/svn/$ref/info/url ||
-		return 1
-	done &&
-	git svn migrate --minimize &&
-	test -z "$(git config -l | grep "^svn-remote\.git-svn\.")" &&
-	git config --get-all svn-remote.svn.fetch > fetch.out &&
-	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
-	grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
-	grep "^branches/b:refs/remotes/origin/b$" fetch.out &&
-	grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
-	grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
-	grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
-	grep "^:refs/remotes/git-svn" fetch.out
+expecting success of 9106.6 'dcommit does the svn equivalent of an index merge': 
+	git reset --hard refs/remotes/git-svn &&
+	echo 'index merge' > file2 &&
+	git update-index --add file2 &&
+	git commit -a -m 'index merge' &&
+	echo 'more changes' >> file2 &&
+	git update-index file2 &&
+	git commit -a -m 'more changes' &&
+	git svn dcommit
 	
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/b => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.1 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.2 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.3 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-trunk:refs/remotes/origin/trunk
-branches/a:refs/remotes/origin/a
-branches/b:refs/remotes/origin/b
-tags/0.1:refs/remotes/origin/tags/0.1
-tags/0.2:refs/remotes/origin/tags/0.2
-tags/0.3:refs/remotes/origin/tags/0.3
-:refs/remotes/git-svn
-ok 6 - migrate --minimize on old inited layout
+HEAD is now at 4599f72 third line from git
+[master 4e36032] index merge
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[master a2ae0d0] more changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
+	A	file2
+Committed r5
+	M	file
+r4 = dd123004b9ff7e02004b1ecfba05e6dc54d12451 (refs/remotes/git-svn)
+	A	file2
+r5 = bd8ee941de2ded4a187ab5d47960360fd67a04e1 (refs/remotes/git-svn)
+W: 4e3603202be070ebdec168904875911855328823 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 d270188940c824ce4f1e8aa864ca5d2f8c75f939 b349877e032add143a5dc286d30e523181dea4ef M	file
+warning: skipped previously applied commit 4e36032
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+	M	file2
+Committed r6
+	M	file2
+r6 = 132457d717053ae1e6aa65533ecfa0079ad4495e (refs/remotes/git-svn)
+No changes between b9bc8859902028003d827ab68c7f90e33ed65962 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 6 - dcommit does the svn equivalent of an index merge
 
-expecting success of 9107.7 '.rev_db auto-converted to .rev_map.UUID': 
-	git svn fetch -i trunk &&
-	test -z "$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db.* 2>/dev/null)" &&
-	expect="$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_map.*)" &&
-	test -n "$expect" &&
-	rev_db="$(echo $expect | sed -e "s,_map,_db,")" &&
-	convert_to_rev_db "$expect" "$rev_db" &&
-	rm -f "$expect" &&
-	test -f "$rev_db" &&
-	git svn fetch -i trunk &&
-	test -z "$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db.* 2>/dev/null)" &&
-	test ! -e "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db &&
-	test -f "$expect"
+expecting success of 9106.7 'commit another change from svn side': 
+	svn_cmd co "$svnrepo" t.svn &&
+	(
+		cd t.svn &&
+		echo third line from svn >>file &&
+		poke file &&
+		svn_cmd commit -m "third line from svn"
+	) &&
+	rm -rf t.svn
 	
-Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83 ...
-r1 = 898c69d11e135b1764f75c124051a0d1384c3fdb
-Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83
-Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83 ...
-r1 = fc956e7f7f44ac417fa2e38e22447f0b09365d1d
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83
-Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83 ...
-r1 = 525bd2f5669a8951f1d74851779383e5660dbe0e
-Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83
-Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83 ...
-r1 = 97c74c65e7910090541eb45cc6effa06703f5730
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83
-Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83 ...
-r1 = 6aa26aa3bd87ba7beb3947aa5c578408ec1bbaf5
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83
-Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83 ...
-r1 = ddce8d379dfc0bd64fd05a80b5a2702fc55fbbcb
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83 ...
-r1 = 560bc2d4f3299f442e5e3251d3df806587b19783
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83 ...
-r1 = 560bc2d4f3299f442e5e3251d3df806587b19783
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.cdec47cc-53b6-40fc-8a31-196e5d532b83
-ok 7 - .rev_db auto-converted to .rev_map.UUID
+A    t.svn/file
+A    t.svn/file2
+Checked out revision 6.
+Sending        file
+Transmitting file data .done
+Committing transaction...
+Committed revision 7.
+ok 7 - commit another change from svn side
 
-# passed all 7 test(s)
-1..7
+expecting success of 9106.8 'multiple dcommit from git svn will not clobber svn': 
+	git reset --hard refs/remotes/git-svn &&
+	echo new file >> new-file &&
+	git update-index --add new-file &&
+	git commit -a -m 'new file' &&
+	echo clobber > file &&
+	git commit -a -m 'clobber' &&
+	test_must_fail git svn dcommit
+	
+HEAD is now at 132457d more changes
+[master 914a7a4] new file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-file
+[master 6c59537] clobber
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
+	A	new-file
+Committed r8
+	M	file
+r7 = 11aed276e4833e5d016e0dbd215da7cfc294d0f4 (refs/remotes/git-svn)
+	A	new-file
+r8 = abc243698342131d3b793c2db78fc34266c4454b (refs/remotes/git-svn)
+W: 914a7a47ea7abbc16060df0ba456c392b4e05fee and refs/remotes/git-svn differ, using rebase:
+:100644 100644 b349877e032add143a5dc286d30e523181dea4ef fad4bec9888fc6883cc5a8447f365d44b8e4ebba M	file
+warning: skipped previously applied commit 914a7a4
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 6c59537... 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 advice.mergeConflict false"
+Could not apply 6c59537... clobber
+rebase refs/remotes/git-svn: command returned error: 1
+
+ok 8 - multiple dcommit from git svn will not clobber svn
+
+expecting success of 9106.9 'check that rebase really failed': 
+	git status >output &&
+	grep currently.rebasing output
+
+You are currently rebasing branch 'master' on 'abc2436'.
+ok 9 - check that rebase really failed
+
+expecting success of 9106.10 'resolve, continue the rebase and dcommit': 
+	echo clobber and I really mean it > file &&
+	git update-index file &&
+	git rebase --continue &&
+	git svn dcommit
+	
+[detached HEAD 4aec80f] clobber
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+Successfully rebased and updated refs/heads/master.
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
+	M	file
+Committed r9
+	M	file
+r9 = 39507fe4aaafe67c822719b15d0772074d934289 (refs/remotes/git-svn)
+No changes between 4aec80f815a4e06b6d6738d42da576b72c75a608 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 10 - resolve, continue the rebase and dcommit
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9113-git-svn-dcommit-new-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9113-git-svn-dcommit-new-file/.git/
+1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9112-git-svn-md5less-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9112-git-svn-md5less-file/.git/
+expecting success of 9112.1 'load svn dumpfile': svnadmin load "$rawsvnrepo" < dumpfile.svn
+<<< Started new transaction, based on original revision 1
+     * editing path : md5less-file ... done.
+
+------- Committed revision 1 >>>
+
+ok 1 - load svn dumpfile
+
+expecting success of 9112.2 'initialize git svn': git svn init "$svnrepo"
+ok 2 - initialize git svn
+
+expecting success of 9112.3 'fetch revisions from svn': git svn fetch
+	A	md5less-file
+r1 = 64b7be0282f4c7d71602e5394dd9e6a4f4a0b169 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
+ok 3 - fetch revisions from svn
+
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9101-git-svn-props.sh ***
@@ -515473,13 +515205,13 @@
 	A	ne_cr
 	A	ne_crlf
 	A	ne_lf
-r1 = 3200a710178cdded85a9a4f1650b1a90dc8d99a0 (refs/remotes/git-svn)
+r1 = b87bbc52de6cc5628b3c903fe33ad6a174338147 (refs/remotes/git-svn)
 	M	kw.c
-r2 = 91cc5d149ec7025c7b1ffd004baf27c9bce82d11 (refs/remotes/git-svn)
+r2 = a27b76cd6202f85aad0120152ed93171237c944a (refs/remotes/git-svn)
 	M	kw.c
-r3 = fe9544d5884f0723bbfa822d0001dd202d77b175 (refs/remotes/git-svn)
+r3 = ce96ec45c5385c22c50f5f0c3e623bcc07a704ca (refs/remotes/git-svn)
 	M	kw.c
-r4 = a69639077480be0ab3457c9b63c0ad5f52a810e8 (refs/remotes/git-svn)
+r4 = 6921eae3b12959f26624f0eb410511a90ff9eae9 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9101-git-svn-props/svnrepo r4
 ok 4 - fetch revisions from svn
@@ -515490,16 +515222,16 @@
 	git svn set-tree remotes/git-svn..mybranch &&
 	git pull . remotes/git-svn
 Switched to a new branch 'mybranch'
-[mybranch 3f8a068] test keywords ignoring
+[mybranch 6e8e1b6] test keywords ignoring
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	M	kw.c
 	M	kw.c
-r5 = 5a94346ab986e23f3cd33e7656d00cc230805de0 (refs/remotes/git-svn)
+r5 = f7145c10ccaead3a56b61e6cdfeaafab0e8de9cd (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 3f8a068..5a94346
+Updating 6e8e1b6..f7145c1
 Fast-forward
 ok 5 - test svn:keywords ignoring
 
@@ -515532,10 +515264,10 @@
 	M	crlf
 	M	empty
 	M	ne_crlf
-r6 = 0d2a1bbff924a546074a7937945c65479fe8c37c (refs/remotes/git-svn)
+r6 = 6dc79d8205cbf7271e68b6dbc359ee7c6be8c8ab (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 5a94346..0d2a1bb
+Updating f7145c1..6dc79d8
 Fast-forward
  crlf    | 3 +--
  ne_crlf | 3 +--
@@ -515603,10 +515335,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 = 866b6f1627e774ab4df754182ae6defe7f144964 (refs/remotes/git-svn)
+r7 = 23deff18e75d3cf02fe5c27703e7787c6be093de (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 0d2a1bb..866b6f1
+Updating 6dc79d8..23deff1
 Fast-forward
  cr    | 4 +++-
  ne_cr | 4 +++-
@@ -515666,10 +515398,10 @@
 	grep gitignore ls_files_result | cmp - create-ignore-index.expect
 	
 	A	deeply/nested/directory/.keep
-r8 = 9c97d2ee2acd86c32f6b6440284675b1b016a540 (refs/remotes/git-svn)
+r8 = 69c8e4d3afb1fc51c98b2935059ccb307fad9a15 (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 866b6f1..9c97d2e
+Updating 23deff1..69c8e4d
 Fast-forward
  deeply/nested/directory/.keep | 0
  1 file changed, 0 insertions(+), 0 deletions(-)
@@ -515706,146 +515438,255 @@
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9119-git-svn-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9119-git-svn-info/.git/
-1..0 # SKIP skipping svn-info test (SVN version: 1.14.5 not supported)
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9114-git-svn-dcommit-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+*** t9107-git-svn-migrate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9107-git-svn-migrate/.git/
+expecting success of 9107.1 'setup old-looking metadata': 
+	cp "$GIT_DIR"/config "$GIT_DIR"/config-old-git-svn &&
+	mkdir import &&
 	(
-		cd mysvnwork &&
-		big_text_block >>trunk/README &&
-		svn_cmd add trunk &&
-		svn_cmd ci -m "first commit" trunk
-	)
+		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" &&
+	git svn fetch &&
+	rm -rf "$GIT_DIR"/svn &&
+	git update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
+	git update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&
+	git update-ref -d refs/remotes/git-svn refs/remotes/git-svn
 	
-Checked out revision 0.
-A         trunk
-A         trunk/README
+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
-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 = 767ddc30de2f448e1ad5f27aa259c56df444b254 (refs/remotes/origin/trunk)
+	A	branches/a/README
+	A	branches/b/README
+	A	tags/0.1/README
+	A	tags/0.2/README
+	A	tags/0.3/README
+	A	trunk/README
+r1 = 3448098df6d44a39ea187468c9dd7e0ed0df82c0 (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
-Switched to a new branch 'svn'
-Switched to a new branch 'merge'
-[merge b1f617d] New file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new_file
-[merge 454b702] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[merge f8da3a0] add some stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'svn'
-[svn d16595d] 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
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo r1
+ok 1 - setup old-looking metadata
 
-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 9107.2 'git-svn-HEAD is a real HEAD': 
+	git rev-parse --verify refs/heads/git-svn-HEAD^0
 
-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.47.2/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk ...
-	M	README
-Committed r2
-	M	README
-r2 = df13b1b42745534f8f8254e25a3ef60ea8f43c46 (refs/remotes/origin/trunk)
-	A	new_file
-	M	README
-Committed r3
-	M	README
-	A	new_file
-r3 = ca035e592a784655d0dbe09932f15b75b34200aa (refs/remotes/origin/trunk)
-No changes between 15ddc1469e336765524a39a567f436f3938dbb00 and refs/remotes/origin/trunk
-Resetting to the latest refs/remotes/origin/trunk
-ok 4 - git svn dcommit merges
+3448098df6d44a39ea187468c9dd7e0ed0df82c0
+ok 2 - git-svn-HEAD is a real HEAD
 
-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
+expecting success of 9107.3 'initialize old-style (v0) git svn layout': 
+	mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
+	echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
+	echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
+	git svn migrate &&
+	! test -d "$GIT_DIR"/git-svn &&
+	git rev-parse --verify refs/remotes/git-svn^0 &&
+	git rev-parse --verify refs/remotes/svn^0 &&
+	test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
+	test $(git config --get svn-remote.svn.fetch) = \
+		":refs/remotes/git-svn"
 	
-friend
-ok 5 - verify post-merge ancestry
+Migrating from v0 layout...
+Renaming ref: refs/heads/git-svn-HEAD => refs/remotes/git-svn
+Renaming ref: refs/heads/svn-HEAD => refs/remotes/svn
+Done migrating from v0 layout...
+Migrating from a git-svn v1 layout...
+Data from a previous version of git-svn exists, but
+	.git/svn
+	(required for this version (2.47.2) of git-svn) does not exist.
+ - .git/git-svn => .git/svn/git-svn
+ - .git/svn/info => .git/svn/svn/info
+Done migrating from a git-svn v1 layout
+3448098df6d44a39ea187468c9dd7e0ed0df82c0
+3448098df6d44a39ea187468c9dd7e0ed0df82c0
+ok 3 - initialize old-style (v0) git svn layout
 
-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
+expecting success of 9107.4 'initialize a multi-repository repo': 
+	git svn init "$svnrepo" -T trunk -t tags -b branches &&
+	git config --get-all svn-remote.svn.fetch > fetch.out &&
+	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
+	test -n "$(git config --get svn-remote.svn.branches \
+		    "^branches/\*:refs/remotes/origin/\*$")" &&
+	test -n "$(git config --get svn-remote.svn.tags \
+		    "^tags/\*:refs/remotes/origin/tags/\*$")" &&
+	git config --unset svn-remote.svn.branches \
+	                        "^branches/\*:refs/remotes/origin/\*$" &&
+	git config --unset svn-remote.svn.tags \
+	                        "^tags/\*:refs/remotes/origin/tags/\*$" &&
+	git config --add svn-remote.svn.fetch "branches/a:refs/remotes/origin/a" &&
+	git config --add svn-remote.svn.fetch "branches/b:refs/remotes/origin/b" &&
+	for i in tags/0.1 tags/0.2 tags/0.3
+	do
+		git config --add svn-remote.svn.fetch \
+			$i:refs/remotes/origin/$i || return 1
+	done &&
+	git config --get-all svn-remote.svn.fetch > fetch.out &&
+	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
+	grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
+	grep "^branches/b:refs/remotes/origin/b$" fetch.out &&
+	grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
+	grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
+	grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
+	grep "^:refs/remotes/git-svn" fetch.out
 	
-    Merge branch 'merge' into svn
-ok 6 - verify merge commit message
+Using existing [svn-remote "svn"]
+trunk:refs/remotes/origin/trunk
+trunk:refs/remotes/origin/trunk
+branches/a:refs/remotes/origin/a
+branches/b:refs/remotes/origin/b
+tags/0.1:refs/remotes/origin/tags/0.1
+tags/0.2:refs/remotes/origin/tags/0.2
+tags/0.3:refs/remotes/origin/tags/0.3
+:refs/remotes/git-svn
+ok 4 - initialize a multi-repository repo
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9121-git-svn-fetch-renamed-dir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9121-git-svn-fetch-renamed-dir/.git/
-expecting success of 9121.1 'load repository with renamed directory': 
-	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9121/renamed-dir.dump
+expecting success of 9107.5 'multi-fetch works on partial urls + paths': 
+	refs="trunk a b tags/0.1 tags/0.2 tags/0.3" &&
+	git svn multi-fetch &&
+	for i in $refs
+	do
+		git rev-parse --verify refs/remotes/origin/$i^0 || return 1;
+	done >refs.out &&
+	test -z "$(sort <refs.out | uniq -d)" &&
+	for i in $refs
+	do
+		for j in $refs
+		do
+			git diff --exit-code refs/remotes/origin/$i \
+					     refs/remotes/origin/$j ||
+				return 1
+		done
+	done
+
+Rebuilding .git/svn/git-svn/.rev_map.f242903e-d154-4999-af51-268d2eb252a0 ...
+r1 = 3448098df6d44a39ea187468c9dd7e0ed0df82c0
+Done rebuilding .git/svn/git-svn/.rev_map.f242903e-d154-4999-af51-268d2eb252a0
+	A	README
+r1 = ead94a628a79c7a248fdf4b731ebf6979ef371ff (refs/remotes/origin/tags/0.1)
+	A	README
+r1 = 0bd5221f2d55843c1cc931b59b61521e424b4397 (refs/remotes/origin/a)
+	A	README
+r1 = b9ee321476a14815203613d180778ed0d50b2dc8 (refs/remotes/origin/tags/0.3)
+	A	README
+r1 = 66efe0d83d12daa662c6ba81ea10a92f3106ee24 (refs/remotes/origin/tags/0.2)
+	A	README
+r1 = 7e7802a92cfc7a1c708858ecf3f885cc95752b9a (refs/remotes/origin/trunk)
+	A	README
+r1 = cfe524f9e5a058e441dbc617b69c6cfc65e9e357 (refs/remotes/origin/b)
+ok 5 - multi-fetch works on partial urls + paths
+
+expecting success of 9107.6 'migrate --minimize on old inited layout': 
+	git config --unset-all svn-remote.svn.fetch &&
+	git config --unset-all svn-remote.svn.url &&
+	rm -rf "$GIT_DIR"/svn &&
+	for i in $(cat fetch.out)
+	do
+		path=${i%%:*} &&
+		ref=${i#*:} &&
+		if test "$ref" = "${ref#refs/remotes/}"; then continue; fi &&
+		if test -n "$path"; then path="/$path"; fi &&
+		mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
+		echo "$svnrepo"$path >"$GIT_DIR"/svn/$ref/info/url ||
+		return 1
+	done &&
+	git svn migrate --minimize &&
+	test -z "$(git config -l | grep "^svn-remote\.git-svn\.")" &&
+	git config --get-all svn-remote.svn.fetch > fetch.out &&
+	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
+	grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
+	grep "^branches/b:refs/remotes/origin/b$" fetch.out &&
+	grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
+	grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
+	grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
+	grep "^:refs/remotes/git-svn" fetch.out
 	
-ok 1 - load repository with renamed directory
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/b => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.1 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.2 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.3 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+trunk:refs/remotes/origin/trunk
+branches/a:refs/remotes/origin/a
+branches/b:refs/remotes/origin/b
+tags/0.1:refs/remotes/origin/tags/0.1
+tags/0.2:refs/remotes/origin/tags/0.2
+tags/0.3:refs/remotes/origin/tags/0.3
+:refs/remotes/git-svn
+ok 6 - migrate --minimize on old inited layout
 
-expecting success of 9121.2 'init and fetch repository': 
-	git svn init "$svnrepo/newname" &&
-	git svn fetch
+expecting success of 9107.7 '.rev_db auto-converted to .rev_map.UUID': 
+	git svn fetch -i trunk &&
+	test -z "$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db.* 2>/dev/null)" &&
+	expect="$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_map.*)" &&
+	test -n "$expect" &&
+	rev_db="$(echo $expect | sed -e "s,_map,_db,")" &&
+	convert_to_rev_db "$expect" "$rev_db" &&
+	rm -f "$expect" &&
+	test -f "$rev_db" &&
+	git svn fetch -i trunk &&
+	test -z "$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db.* 2>/dev/null)" &&
+	test ! -e "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db &&
+	test -f "$expect"
 	
-	A	a.txt
-r2 = 5e19f53bdd67022f568fc71038f6215d481fe288 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9121-git-svn-fetch-renamed-dir/svnrepo/newname r2
-ok 2 - init and fetch repository
+Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.f242903e-d154-4999-af51-268d2eb252a0 ...
+r1 = 3448098df6d44a39ea187468c9dd7e0ed0df82c0
+Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.f242903e-d154-4999-af51-268d2eb252a0
+Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.f242903e-d154-4999-af51-268d2eb252a0 ...
+r1 = 0bd5221f2d55843c1cc931b59b61521e424b4397
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.f242903e-d154-4999-af51-268d2eb252a0
+Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.f242903e-d154-4999-af51-268d2eb252a0 ...
+r1 = cfe524f9e5a058e441dbc617b69c6cfc65e9e357
+Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.f242903e-d154-4999-af51-268d2eb252a0
+Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.f242903e-d154-4999-af51-268d2eb252a0 ...
+r1 = ead94a628a79c7a248fdf4b731ebf6979ef371ff
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.f242903e-d154-4999-af51-268d2eb252a0
+Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.f242903e-d154-4999-af51-268d2eb252a0 ...
+r1 = 66efe0d83d12daa662c6ba81ea10a92f3106ee24
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.f242903e-d154-4999-af51-268d2eb252a0
+Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.f242903e-d154-4999-af51-268d2eb252a0 ...
+r1 = b9ee321476a14815203613d180778ed0d50b2dc8
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.f242903e-d154-4999-af51-268d2eb252a0
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.f242903e-d154-4999-af51-268d2eb252a0 ...
+r1 = 7e7802a92cfc7a1c708858ecf3f885cc95752b9a
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.f242903e-d154-4999-af51-268d2eb252a0
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.f242903e-d154-4999-af51-268d2eb252a0 ...
+r1 = 7e7802a92cfc7a1c708858ecf3f885cc95752b9a
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.f242903e-d154-4999-af51-268d2eb252a0
+ok 7 - .rev_db auto-converted to .rev_map.UUID
 
-# passed all 2 test(s)
-1..2
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9119-git-svn-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9119-git-svn-info/.git/
+1..0 # SKIP skipping svn-info test (SVN version: 1.14.5 not supported)
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9109-git-svn-multi-glob.sh ***
@@ -515948,22 +515789,22 @@
 	(required for this version (2.47.2) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = 1ad244f011c11f0879a64cbd47c422cde41f335d (refs/remotes/trunk)
+r1 = efbee5e29c8667259f852d74622ff840ee5e12fe (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a, 1
-Found branch parent: (refs/remotes/branches/v1/start) 1ad244f011c11f0879a64cbd47c422cde41f335d
+Found branch parent: (refs/remotes/branches/v1/start) efbee5e29c8667259f852d74622ff840ee5e12fe
 Following parent with do_switch
 Successfully followed parent
-r2 = f0815663dd83e0054543090d13ad84e715563d50 (refs/remotes/branches/v1/start)
+r2 = b300953ba0ab47895bd46300f41587b578abd8f3 (refs/remotes/branches/v1/start)
 	M	readme
-r3 = 57e9e1d1bc2bd3aff1a5f95f0bbbda4cef6cf4a3 (refs/remotes/branches/v1/start)
+r3 = ce1a732d3d10538717896a1d7fb6c9d0972a891c (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.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) 57e9e1d1bc2bd3aff1a5f95f0bbbda4cef6cf4a3
+Found branch parent: (refs/remotes/tags/end) ce1a732d3d10538717896a1d7fb6c9d0972a891c
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = a6903d2d36d4a0c69dfcce9ef5d3d7275bfc21ae (refs/remotes/tags/end)
+r4 = 8cb48fd6a4285a9cba4c951a6aece3faa5e73bbd (refs/remotes/tags/end)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/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.
@@ -516005,26 +515846,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 2166cea4157dbe97c5b6b6c67530a450c70632f1 (refs/remotes/two/trunk)
+r1 = e0982cbe65edc52fbf880a93bc8510dddfa90737 (refs/remotes/two/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/two/branches/v1/start) 2166cea4157dbe97c5b6b6c67530a450c70632f1
+Found branch parent: (refs/remotes/two/branches/v1/start) e0982cbe65edc52fbf880a93bc8510dddfa90737
 Following parent with do_switch
 Successfully followed parent
-r2 = dff979eb66e36e3400ae1d7183164babe4f811ca (refs/remotes/two/branches/v1/start)
+r2 = 98ba68fc14e466178d2e59fc215b926007bcbacb (refs/remotes/two/branches/v1/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = 2517a8c30af7e0eeeab7db492fe019da2c603a03 (refs/remotes/two/branches/v1/start)
+r3 = 5ea0df8df6bb358f51107ae4cd05fdb61c6001f7 (refs/remotes/two/branches/v1/start)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) 2517a8c30af7e0eeeab7db492fe019da2c603a03
+Found branch parent: (refs/remotes/two/tags/end) 5ea0df8df6bb358f51107ae4cd05fdb61c6001f7
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 43bc8a3c6a989d3a123ef0475496464cab2c278f (refs/remotes/two/tags/end)
+r4 = 9d0e7ce7a1e1536315bd7f54f3a61353664bed74 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r5 = 28776922890bbca95d61a3e27f0804548846b473 (refs/remotes/two/tags/end)
+r5 = f8fcd3a239db062fe79ff1e9ebde42a7d6656585 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r6 = e79356c7dd2dfe5ed5563e23d1ba345c1136e6fb (refs/remotes/two/tags/end)
+r6 = 662c6aa15414920d9ad8c031cbae93d62940cc64 (refs/remotes/two/tags/end)
 ok 2 - test left-hand-side only globbing
 
 expecting success of 9109.3 'test another branch': 
@@ -516099,43 +515940,43 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 2166cea4157dbe97c5b6b6c67530a450c70632f1 (refs/remotes/four/trunk)
+r1 = e0982cbe65edc52fbf880a93bc8510dddfa90737 (refs/remotes/four/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/four/branches/v1/start) 2166cea4157dbe97c5b6b6c67530a450c70632f1
+Found branch parent: (refs/remotes/four/branches/v1/start) e0982cbe65edc52fbf880a93bc8510dddfa90737
 Following parent with do_switch
 Successfully followed parent
-r2 = dff979eb66e36e3400ae1d7183164babe4f811ca (refs/remotes/four/branches/v1/start)
+r2 = 98ba68fc14e466178d2e59fc215b926007bcbacb (refs/remotes/four/branches/v1/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = 2517a8c30af7e0eeeab7db492fe019da2c603a03 (refs/remotes/four/branches/v1/start)
+r3 = 5ea0df8df6bb358f51107ae4cd05fdb61c6001f7 (refs/remotes/four/branches/v1/start)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/four/tags/end) 2517a8c30af7e0eeeab7db492fe019da2c603a03
+Found branch parent: (refs/remotes/four/tags/end) 5ea0df8df6bb358f51107ae4cd05fdb61c6001f7
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 43bc8a3c6a989d3a123ef0475496464cab2c278f (refs/remotes/four/tags/end)
+r4 = 9d0e7ce7a1e1536315bd7f54f3a61353664bed74 (refs/remotes/four/tags/end)
 	M	src/b/readme
-r5 = 28776922890bbca95d61a3e27f0804548846b473 (refs/remotes/four/tags/end)
+r5 = f8fcd3a239db062fe79ff1e9ebde42a7d6656585 (refs/remotes/four/tags/end)
 	M	src/b/readme
-r6 = e79356c7dd2dfe5ed5563e23d1ba345c1136e6fb (refs/remotes/four/tags/end)
+r6 = 662c6aa15414920d9ad8c031cbae93d62940cc64 (refs/remotes/four/tags/end)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start, 3
-Found branch parent: (refs/remotes/four/branches/v2/start) 2166cea4157dbe97c5b6b6c67530a450c70632f1
+Found branch parent: (refs/remotes/four/branches/v2/start) e0982cbe65edc52fbf880a93bc8510dddfa90737
 Following parent with do_switch
 Successfully followed parent
-r7 = ba65b24bcb6bfc0a5356d0e8ff74661557e62faf (refs/remotes/four/branches/v2/start)
+r7 = 14962fd0000a9bda8429b0d9f2f4be976a68f0b2 (refs/remotes/four/branches/v2/start)
 	M	src/a/readme
 	M	src/b/readme
-r8 = f85f18de6516965b40f50f495c7f1f67504460e7 (refs/remotes/four/branches/v2/start)
+r8 = 1f2305f3869b4327842f8e43e5dfecc52c0ce569 (refs/remotes/four/branches/v2/start)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/next, 8
-Found branch parent: (refs/remotes/four/tags/next) f85f18de6516965b40f50f495c7f1f67504460e7
+Found branch parent: (refs/remotes/four/tags/next) 1f2305f3869b4327842f8e43e5dfecc52c0ce569
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r9 = 9272b0a60e8e7856facccb5fcf092111dc5b4eb5 (refs/remotes/four/tags/next)
+r9 = b11fe2b03c0447a605b7ae7c59b84c1874029d73 (refs/remotes/four/tags/next)
 	M	src/b/readme
-r10 = 9e3c2097dc3d672921bcb70ff9ee510a62208144 (refs/remotes/four/tags/next)
+r10 = 50a3b11abdd988bed5f13b0dc073d4a980f3dbb4 (refs/remotes/four/tags/next)
 ok 3 - test another branch
 
 expecting success of 9109.4 'prepare test disallow multiple globs': 
@@ -516173,6 +516014,143 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9114-git-svn-dcommit-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 = 262fe89450c3d2444ce2d4d3e7e13830a8f40565 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
+Switched to a new branch 'svn'
+Switched to a new branch 'merge'
+[merge 5fedc09] New file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new_file
+[merge 4b81a58] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[merge 613c404] add some stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'svn'
+[svn 6f9516c] 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.47.2/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk ...
+	M	README
+Committed r2
+	M	README
+r2 = 63247e7a9d1a25971091e4587ef77bbed06ac80b (refs/remotes/origin/trunk)
+	A	new_file
+	M	README
+Committed r3
+	M	README
+	A	new_file
+r3 = 193bbb262660a73dc422ad5e4605fcc65e04cbeb (refs/remotes/origin/trunk)
+No changes between 4ba65828f496558ab09e8069a4afe86a009789d7 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9121-git-svn-fetch-renamed-dir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9121-git-svn-fetch-renamed-dir/.git/
+expecting success of 9121.1 'load repository with renamed directory': 
+	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9121/renamed-dir.dump
+	
+ok 1 - load repository with renamed directory
+
+expecting success of 9121.2 'init and fetch repository': 
+	git svn init "$svnrepo/newname" &&
+	git svn fetch
+	
+	A	a.txt
+r2 = 5e19f53bdd67022f568fc71038f6215d481fe288 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9121-git-svn-fetch-renamed-dir/svnrepo/newname r2
+ok 2 - init and fetch repository
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9123-git-svn-rebuild-with-rewriteroot.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9123-git-svn-rebuild-with-rewriteroot/.git/
 expecting success of 9123.1 'init, fetch and checkout repository': 
@@ -516181,7 +516159,7 @@
 	git checkout -b mybranch remotes/git-svn
 	
 	A	foo
-r1 = b861d5b1359f220d05e5617945caaa26ffb5af8e (refs/remotes/git-svn)
+r1 = 242dd072ceace4441ba7b4d5055a751692b04ff3 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9123-git-svn-rebuild-with-rewriteroot/svnrepo r1
 Switched to a new branch 'mybranch'
@@ -516201,6 +516179,177 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9122-git-svn-author.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9122-git-svn-author/.git/
+expecting success of 9122.1 'setup svn repository': 
+	svn_cmd checkout "$svnrepo" work.svn &&
+	(
+		cd work.svn &&
+		echo >file &&
+		svn_cmd add file &&
+		svn_cmd commit -m "first commit" file
+	)
+
+Checked out revision 0.
+A         file
+Adding         file
+Transmitting file data .done
+Committing transaction...
+Committed revision 1.
+ok 1 - setup svn repository
+
+expecting success of 9122.2 'interact with it via git svn': 
+	mkdir work.git &&
+	(
+		cd work.git &&
+		git svn init "$svnrepo" &&
+		git svn fetch &&
+
+		echo modification >file &&
+		test_tick &&
+		git commit -a -m second &&
+
+		test_tick &&
+		git svn dcommit &&
+
+		echo "further modification" >file &&
+		test_tick &&
+		git commit -a -m third &&
+
+		test_tick &&
+		git svn --add-author-from dcommit &&
+
+		echo "yet further modification" >file &&
+		test_tick &&
+		git commit -a -m fourth &&
+
+		test_tick &&
+		git svn --add-author-from --use-log-author dcommit &&
+
+		git log &&
+
+		git show -s HEAD^^ >../actual.2 &&
+		git show -s HEAD^  >../actual.3 &&
+		git show -s HEAD   >../actual.4
+
+	) &&
+
+	# Make sure that --add-author-from without --use-log-author
+	# did not affect the authorship information
+	myself=$(grep "^Author: " actual.2) &&
+	unaffected=$(grep "^Author: " actual.3) &&
+	test "z$myself" = "z$unaffected" &&
+
+	# Make sure lack of --add-author-from did not add cruft
+	! grep "^    From: A U Thor " actual.2 &&
+
+	# Make sure --add-author-from added cruft
+	grep "^    From: A U Thor " actual.3 &&
+	grep "^    From: A U Thor " actual.4 &&
+
+	# Make sure --add-author-from with --use-log-author affected
+	# the authorship information
+	grep "^Author: A U Thor " actual.4 &&
+
+	# Make sure there are no commit messages with excess blank lines
+	test $(grep "^ " actual.2 | wc -l) = 3 &&
+	test $(grep "^ " actual.3 | wc -l) = 5 &&
+	test $(grep "^ " actual.4 | wc -l) = 5 &&
+
+	# Make sure there are no svn commit messages with excess blank lines
+	(
+		cd work.svn &&
+		svn_cmd up &&
+		
+		test $(svn_cmd log -r2:2 | wc -l) = 5 &&
+		test $(svn_cmd log -r4:4 | wc -l) = 7
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9122-git-svn-author/work.git/.git/
+	A	file
+r1 = 199c0b3fe1c9050f54d6f1b23c2cf7e84e653ed6 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo r1
+[master 51a2a9e] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
+	M	file
+Committed r2
+	M	file
+r2 = fce45eb1e23406cf7c0c0652f26b63694bc8e7ff (refs/remotes/git-svn)
+No changes between 51a2a9e1e094abd26bfda11b87a6f39a575f9e7d and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+[master e2fc533] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
+	M	file
+Committed r3
+	M	file
+r3 = 2c8ed7f4d78fe2676739d3dcfa001e38740de689 (refs/remotes/git-svn)
+No changes between e2fc533c2d0001d2f09358e0564891396a342301 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+[master dabf315] fourth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
+	M	file
+Committed r4
+	M	file
+r4 = db35b322dddf1ea63b05adf728c6184f844e5965 (refs/remotes/git-svn)
+No changes between dabf31577b612bc30d6bd7995850712ac90fe5ba and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+commit db35b322dddf1ea63b05adf728c6184f844e5965
+Author: A U Thor <author@example.com>
+Date:   Thu Jan 30 02:18:28 2025 +0000
+
+    fourth
+    
+    From: A U Thor <author@example.com>
+    
+    git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo@4 68cf3c53-42d5-47cf-a571-c8d38cee6ae0
+
+commit 2c8ed7f4d78fe2676739d3dcfa001e38740de689
+Author: pbuilder2 <pbuilder2@68cf3c53-42d5-47cf-a571-c8d38cee6ae0>
+Date:   Thu Jan 30 02:18:25 2025 +0000
+
+    third
+    
+    From: A U Thor <author@example.com>
+    
+    git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo@3 68cf3c53-42d5-47cf-a571-c8d38cee6ae0
+
+commit fce45eb1e23406cf7c0c0652f26b63694bc8e7ff
+Author: pbuilder2 <pbuilder2@68cf3c53-42d5-47cf-a571-c8d38cee6ae0>
+Date:   Thu Jan 30 02:18:22 2025 +0000
+
+    second
+    
+    git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo@2 68cf3c53-42d5-47cf-a571-c8d38cee6ae0
+
+commit 199c0b3fe1c9050f54d6f1b23c2cf7e84e653ed6
+Author: pbuilder2 <pbuilder2@68cf3c53-42d5-47cf-a571-c8d38cee6ae0>
+Date:   Thu Jan 30 02:18:16 2025 +0000
+
+    first commit
+    
+    git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo@1 68cf3c53-42d5-47cf-a571-c8d38cee6ae0
+    From: A U Thor <author@example.com>
+    From: A U Thor <author@example.com>
+Author: A U Thor <author@example.com>
+Updating '.':
+U    file
+Updated to revision 4.
+ok 2 - interact with it via git svn
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9118-git-svn-funky-branch-names.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9118-git-svn-funky-branch-names/.git/
 expecting success of 9118.1 'setup svnrepo': 
@@ -516268,51 +516417,51 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9118-git-svn-funky-branch-names/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo
 	A	foo
-r1 = c7fcd0a706a9a2584e47995821a40113e962e5a1 (refs/remotes/origin/trunk)
+r1 = 9717dd3babc14fa4ede6c6e9b46aa8da1f610e9c (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin, 1
-Found branch parent: (refs/remotes/origin/fun plugin) c7fcd0a706a9a2584e47995821a40113e962e5a1
+Found branch parent: (refs/remotes/origin/fun plugin) 9717dd3babc14fa4ede6c6e9b46aa8da1f610e9c
 Following parent with do_switch
 Successfully followed parent
-r2 = 6cd637a1b546d01e40992aa0cfefa7cc56339349 (refs/remotes/origin/fun plugin)
+r2 = 6fa5b96b971858af762b5352ef8de730fd77b84a (refs/remotes/origin/fun plugin)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.47.2/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!) 6cd637a1b546d01e40992aa0cfefa7cc56339349
+Found branch parent: (refs/remotes/origin/more fun plugin!) 6fa5b96b971858af762b5352ef8de730fd77b84a
 Following parent with do_switch
 Successfully followed parent
-r3 = 9e65f3520ae57071b10049d2c4f4b950a26478fe (refs/remotes/origin/more fun plugin!)
+r3 = 81d759e38a1f8b3ba372c944d5bb910357ff3552 (refs/remotes/origin/more fun plugin!)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.47.2/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)) 6cd637a1b546d01e40992aa0cfefa7cc56339349
+Found branch parent: (refs/remotes/origin/Abo-Uebernahme (Bug #994)) 6fa5b96b971858af762b5352ef8de730fd77b84a
 Following parent with do_switch
 Successfully followed parent
-r4 = c156908e4151eec6122ed24bc9ab1f24adad97bf (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+r4 = b9dc1c46bf3e37453ea8d566a1610c3c9fed0af2 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/.leading_dot, 4
-Found branch parent: (refs/remotes/origin/.leading_dot) c7fcd0a706a9a2584e47995821a40113e962e5a1
+Found branch parent: (refs/remotes/origin/.leading_dot) 9717dd3babc14fa4ede6c6e9b46aa8da1f610e9c
 Following parent with do_switch
 Successfully followed parent
-r5 = 1c73e8ce9e9b6fc1d47ad152a832bb1922f00dee (refs/remotes/origin/.leading_dot)
+r5 = a53f64ee4cd6be72c3f9f8a0abc60966d76a6ed2 (refs/remotes/origin/.leading_dot)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dot., 5
-Found branch parent: (refs/remotes/origin/trailing_dot.) c7fcd0a706a9a2584e47995821a40113e962e5a1
+Found branch parent: (refs/remotes/origin/trailing_dot.) 9717dd3babc14fa4ede6c6e9b46aa8da1f610e9c
 Following parent with do_switch
 Successfully followed parent
-r6 = 34fb8c9ac21974db85efe85b4e59bf9b00221b7d (refs/remotes/origin/trailing_dot.)
+r6 = d69ee02231dbe999695ea3060b7addc6902c8d50 (refs/remotes/origin/trailing_dot.)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/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) c7fcd0a706a9a2584e47995821a40113e962e5a1
+Found branch parent: (refs/remotes/origin/trailing_dotlock.lock) 9717dd3babc14fa4ede6c6e9b46aa8da1f610e9c
 Following parent with do_switch
 Successfully followed parent
-r7 = 91c7bf3f0d68ddcf523b29318ca3393a334a42d9 (refs/remotes/origin/trailing_dotlock.lock)
+r7 = c7687bcc42d03d6fe37fd185343ef4e8d0cad985 (refs/remotes/origin/trailing_dotlock.lock)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/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) c7fcd0a706a9a2584e47995821a40113e962e5a1
+Found branch parent: (refs/remotes/origin/not-a@{0}reflog) 9717dd3babc14fa4ede6c6e9b46aa8da1f610e9c
 Following parent with do_switch
 Successfully followed parent
-r8 = 223b72aa5cfd1fc4461f9720e04e55814cb2ea70 (refs/remotes/origin/not-a@{0}reflog)
+r8 = 74cb649bb892b0cee2505f3baa802d504afe272e (refs/remotes/origin/not-a@{0}reflog)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk r1
-6cd637a1b546d01e40992aa0cfefa7cc56339349
-9e65f3520ae57071b10049d2c4f4b950a26478fe
-c156908e4151eec6122ed24bc9ab1f24adad97bf
-1c73e8ce9e9b6fc1d47ad152a832bb1922f00dee
-34fb8c9ac21974db85efe85b4e59bf9b00221b7d
-91c7bf3f0d68ddcf523b29318ca3393a334a42d9
-223b72aa5cfd1fc4461f9720e04e55814cb2ea70
+6fa5b96b971858af762b5352ef8de730fd77b84a
+81d759e38a1f8b3ba372c944d5bb910357ff3552
+b9dc1c46bf3e37453ea8d566a1610c3c9fed0af2
+a53f64ee4cd6be72c3f9f8a0abc60966d76a6ed2
+d69ee02231dbe999695ea3060b7addc6902c8d50
+c7687bcc42d03d6fe37fd185343ef4e8d0cad985
+74cb649bb892b0cee2505f3baa802d504afe272e
 ok 2 - test clone with funky branch names
 
 expecting success of 9118.3 'test dcommit to funky branch': 
@@ -516324,8 +516473,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 9e65f35 more fun!
-[master aafd4d0] hello
+HEAD is now at 81d759e more fun!
+[master 91da1ea] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -516333,8 +516482,8 @@
 	M	foo
 Committed r9
 	M	foo
-r9 = 742752f986f2d20338df0558a840bce79ca4559a (refs/remotes/origin/more fun plugin!)
-No changes between aafd4d09eb04fa9a9952cc1776b439209b1c47c5 and refs/remotes/origin/more%20fun%20plugin!
+r9 = 5ec8130bf7aee01f152fa59b08093d047af3dc8f (refs/remotes/origin/more fun plugin!)
+No changes between 91da1eafa65aeab552eb7a27fa71e1549c514564 and refs/remotes/origin/more%20fun%20plugin!
 Resetting to the latest refs/remotes/origin/more%20fun%20plugin!
 ok 3 - test dcommit to funky branch
 
@@ -516347,8 +516496,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at c156908 scary
-[master 27a4fe0] eep
+HEAD is now at b9dc1c4 scary
+[master 00ffc0c] eep
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -516356,8 +516505,8 @@
 	M	foo
 Committed r10
 	M	foo
-r10 = 166b6609707211b41e1f90d893b03647b754f02a (refs/remotes/origin/Abo-Uebernahme (Bug #994))
-No changes between 27a4fe04cf48abf7603225e1c7d8ae3908fa7251 and refs/remotes/origin/Abo-Uebernahme%20(Bug%20#994)
+r10 = 4b626844be4894e79803e459d196d4a51f53f16b (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+No changes between 00ffc0c65c555143daa7c8a3ae2c7d56121e6e8f 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
 
@@ -516370,8 +516519,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 91c7bf3 trailing .lock
-[master 78a1cc0] bar
+HEAD is now at c7687bc trailing .lock
+[master 24bdca0] bar
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -516379,8 +516528,8 @@
 	M	foo
 Committed r11
 	M	foo
-r11 = 5bb2668a08d73957e3122dbe154aa891c3a1c794 (refs/remotes/origin/trailing_dotlock.lock)
-No changes between 78a1cc0a86a080c219a5752d34b1fb2465025579 and refs/remotes/origin/trailing_dotlock%2Elock
+r11 = fe9ceb3925e9a5c83873c63c3439c08e7a17f4e5 (refs/remotes/origin/trailing_dotlock.lock)
+No changes between 24bdca0fe7b0ab9184d13a0788f875eb5ee51b48 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
 
@@ -516388,185 +516537,189 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9122-git-svn-author.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9122-git-svn-author/.git/
-expecting success of 9122.1 'setup svn repository': 
-	svn_cmd checkout "$svnrepo" work.svn &&
-	(
-		cd work.svn &&
-		echo >file &&
-		svn_cmd add file &&
-		svn_cmd commit -m "first commit" file
-	)
+*** t9126-git-svn-follow-deleted-readded-directory.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9126-git-svn-follow-deleted-readded-directory/.git/
+1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9128-git-svn-cmd-branch.sh ***
+skipping test t9128 altogether
+1..0 # SKIP skip all tests in t9128
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9120-git-svn-clone-with-percent-escapes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/.git/
+expecting success of 9120.1 'setup svnrepo': 
+	mkdir project project/trunk project/branches project/tags &&
+	echo foo > project/trunk/foo &&
+	svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
+	svn_cmd cp -m "branch" "$svnrepo/pr ject/trunk" \
+	  "$svnrepo/pr ject/branches/b" &&
+	svn_cmd cp -m "tag" "$svnrepo/pr ject/trunk" \
+	  "$svnrepo/pr ject/tags/v1" &&
+	rm -rf project &&
+	maybe_start_httpd
 
-Checked out revision 0.
-A         file
-Adding         file
-Transmitting file data .done
+Adding         project/branches
+Adding         project/tags
+Adding         project/trunk
+Adding         project/trunk/foo
 Committing transaction...
 Committed revision 1.
-ok 1 - setup svn repository
+Committing transaction...
+Committed revision 2.
+Committing transaction...
+Committed revision 3.
+ok 1 - setup svnrepo
 
-expecting success of 9122.2 'interact with it via git svn': 
-	mkdir work.git &&
+expecting success of 9120.2 'test clone with percent escapes': 
+	git svn clone "$svnrepo/pr%20ject" clone &&
 	(
-		cd work.git &&
-		git svn init "$svnrepo" &&
-		git svn fetch &&
-
-		echo modification >file &&
-		test_tick &&
-		git commit -a -m second &&
-
-		test_tick &&
-		git svn dcommit &&
-
-		echo "further modification" >file &&
-		test_tick &&
-		git commit -a -m third &&
-
-		test_tick &&
-		git svn --add-author-from dcommit &&
-
-		echo "yet further modification" >file &&
-		test_tick &&
-		git commit -a -m fourth &&
-
-		test_tick &&
-		git svn --add-author-from --use-log-author dcommit &&
-
-		git log &&
-
-		git show -s HEAD^^ >../actual.2 &&
-		git show -s HEAD^  >../actual.3 &&
-		git show -s HEAD   >../actual.4
-
-	) &&
+		cd clone &&
+		git rev-parse refs/remotes/git-svn
+	)
 
-	# Make sure that --add-author-from without --use-log-author
-	# did not affect the authorship information
-	myself=$(grep "^Author: " actual.2) &&
-	unaffected=$(grep "^Author: " actual.3) &&
-	test "z$myself" = "z$unaffected" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/clone/.git/
+	A	trunk/foo
+W: +empty_dir: branches
+W: +empty_dir: tags
+r1 = ad433f06e945b27eb49c2106e2a9df43db678926 (refs/remotes/git-svn)
+	A	branches/b/foo
+r2 = 25ec968f27ea5d03d0721c6fd28e0e341720c288 (refs/remotes/git-svn)
+	A	tags/v1/foo
+r3 = cc212ecaa9b23d4e9eccfe2098a07768e4743f39 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject r3
+cc212ecaa9b23d4e9eccfe2098a07768e4743f39
+ok 2 - test clone with percent escapes
 
-	# Make sure lack of --add-author-from did not add cruft
-	! grep "^    From: A U Thor " actual.2 &&
+expecting success of 9120.3 'svn checkout with percent escapes': 
+	svn_cmd checkout "$svnrepo/pr%20ject" svn.percent &&
+	svn_cmd checkout "$svnrepo/pr%20ject/trunk" svn.percent.trunk
 
-	# Make sure --add-author-from added cruft
-	grep "^    From: A U Thor " actual.3 &&
-	grep "^    From: A U Thor " actual.4 &&
+A    svn.percent/branches
+A    svn.percent/branches/b
+A    svn.percent/branches/b/foo
+A    svn.percent/tags
+A    svn.percent/tags/v1
+A    svn.percent/tags/v1/foo
+A    svn.percent/trunk
+A    svn.percent/trunk/foo
+Checked out revision 3.
+A    svn.percent.trunk/foo
+Checked out revision 3.
+ok 3 - svn checkout with percent escapes
 
-	# Make sure --add-author-from with --use-log-author affected
-	# the authorship information
-	grep "^Author: A U Thor " actual.4 &&
+expecting success of 9120.4 'svn checkout with space': 
+	svn_cmd checkout "$svnrepo/pr ject" svn.space &&
+	svn_cmd checkout "$svnrepo/pr ject/trunk" svn.space.trunk
 
-	# Make sure there are no commit messages with excess blank lines
-	test $(grep "^ " actual.2 | wc -l) = 3 &&
-	test $(grep "^ " actual.3 | wc -l) = 5 &&
-	test $(grep "^ " actual.4 | wc -l) = 5 &&
+A    svn.space/branches
+A    svn.space/branches/b
+A    svn.space/branches/b/foo
+A    svn.space/tags
+A    svn.space/tags/v1
+A    svn.space/tags/v1/foo
+A    svn.space/trunk
+A    svn.space/trunk/foo
+Checked out revision 3.
+A    svn.space.trunk/foo
+Checked out revision 3.
+ok 4 - svn checkout with space
 
-	# Make sure there are no svn commit messages with excess blank lines
+expecting success of 9120.5 'test clone trunk with percent escapes and minimize-url': 
+	git svn clone --minimize-url "$svnrepo/pr%20ject/trunk" minimize &&
 	(
-		cd work.svn &&
-		svn_cmd up &&
-		
-		test $(svn_cmd log -r2:2 | wc -l) = 5 &&
-		test $(svn_cmd log -r4:4 | wc -l) = 7
+		cd minimize &&
+		git rev-parse refs/remotes/git-svn
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9122-git-svn-author/work.git/.git/
-	A	file
-r1 = 2e3f00a72c4187e0a90eb3159c72fb5508a2f1aa (refs/remotes/git-svn)
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/minimize/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = 1c97e834bd410e2316edf9f3ecb05074196adf64 (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo r1
-[master f8935e0] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
-	M	file
-Committed r2
-	M	file
-r2 = 92a7963672d94fb780ff276c6750705a63aa30df (refs/remotes/git-svn)
-No changes between f8935e0a3302a19d3d320f5dac8a3da6ab23e984 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-[master 430d8c8] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
-	M	file
-Committed r3
-	M	file
-r3 = d49bec0d8fb17a6f26ac8f66d15c05b2373a692f (refs/remotes/git-svn)
-No changes between 430d8c841078ad51259802cd50c271b5ea8383ee and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-[master d5320c0] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
-	M	file
-Committed r4
-	M	file
-r4 = a18073ff9d087ebda427341ffe8f964fce69fd8d (refs/remotes/git-svn)
-No changes between d5320c08269627943cd514cbd8baa3ccb952242f and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-commit a18073ff9d087ebda427341ffe8f964fce69fd8d
-Author: A U Thor <author@example.com>
-Date:   Wed Mar 4 08:03:55 2026 +0000
-
-    fourth
-    
-    From: A U Thor <author@example.com>
-    
-    git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo@4 24dff9e4-9030-47b4-ab6e-4cce27bd0762
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+1c97e834bd410e2316edf9f3ecb05074196adf64
+ok 5 - test clone trunk with percent escapes and minimize-url
 
-commit d49bec0d8fb17a6f26ac8f66d15c05b2373a692f
-Author: pbuilder1 <pbuilder1@24dff9e4-9030-47b4-ab6e-4cce27bd0762>
-Date:   Wed Mar 4 08:03:53 2026 +0000
+expecting success of 9120.6 'test clone trunk with percent escapes': 
+	git svn clone "$svnrepo/pr%20ject/trunk" trunk &&
+	(
+		cd trunk &&
+		git rev-parse refs/remotes/git-svn
+	)
 
-    third
-    
-    From: A U Thor <author@example.com>
-    
-    git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo@3 24dff9e4-9030-47b4-ab6e-4cce27bd0762
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/trunk/.git/
+	A	foo
+r1 = 1c97e834bd410e2316edf9f3ecb05074196adf64 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+1c97e834bd410e2316edf9f3ecb05074196adf64
+ok 6 - test clone trunk with percent escapes
 
-commit 92a7963672d94fb780ff276c6750705a63aa30df
-Author: pbuilder1 <pbuilder1@24dff9e4-9030-47b4-ab6e-4cce27bd0762>
-Date:   Wed Mar 4 08:03:51 2026 +0000
+expecting success of 9120.7 'test clone --stdlayout with percent escapes': 
+	git svn clone --stdlayout "$svnrepo/pr%20ject" percent &&
+	(
+		cd percent &&
+		git rev-parse refs/remotes/origin/trunk^0 &&
+		git rev-parse refs/remotes/origin/b^0 &&
+		git rev-parse refs/remotes/origin/tags/v1^0
+	)
 
-    second
-    
-    git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo@2 24dff9e4-9030-47b4-ab6e-4cce27bd0762
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/percent/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = 1c97e834bd410e2316edf9f3ecb05074196adf64 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
+Found branch parent: (refs/remotes/origin/b) 1c97e834bd410e2316edf9f3ecb05074196adf64
+Following parent with do_switch
+Successfully followed parent
+r2 = 7ad10828c652e2c1737a815f9bb2d90268d45066 (refs/remotes/origin/b)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
+Found branch parent: (refs/remotes/origin/tags/v1) 1c97e834bd410e2316edf9f3ecb05074196adf64
+Following parent with do_switch
+Successfully followed parent
+r3 = c8261f08780df958aa9c3053b45131ae3957cf4c (refs/remotes/origin/tags/v1)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+1c97e834bd410e2316edf9f3ecb05074196adf64
+7ad10828c652e2c1737a815f9bb2d90268d45066
+c8261f08780df958aa9c3053b45131ae3957cf4c
+ok 7 - test clone --stdlayout with percent escapes
 
-commit 2e3f00a72c4187e0a90eb3159c72fb5508a2f1aa
-Author: pbuilder1 <pbuilder1@24dff9e4-9030-47b4-ab6e-4cce27bd0762>
-Date:   Wed Mar 4 08:03:47 2026 +0000
+expecting success of 9120.8 'test clone -s with unescaped space': 
+	git svn clone -s "$svnrepo/pr ject" --prefix origin/ space &&
+	(
+		cd space &&
+		git rev-parse refs/remotes/origin/trunk^0 &&
+		git rev-parse refs/remotes/origin/b^0 &&
+		git rev-parse refs/remotes/origin/tags/v1^0
+	)
 
-    first commit
-    
-    git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9122-git-svn-author/svnrepo@1 24dff9e4-9030-47b4-ab6e-4cce27bd0762
-    From: A U Thor <author@example.com>
-    From: A U Thor <author@example.com>
-Author: A U Thor <author@example.com>
-Updating '.':
-U    file
-Updated to revision 4.
-ok 2 - interact with it via git svn
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/space/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = 1c97e834bd410e2316edf9f3ecb05074196adf64 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
+Found branch parent: (refs/remotes/origin/b) 1c97e834bd410e2316edf9f3ecb05074196adf64
+Following parent with do_switch
+Successfully followed parent
+r2 = 7ad10828c652e2c1737a815f9bb2d90268d45066 (refs/remotes/origin/b)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
+Found branch parent: (refs/remotes/origin/tags/v1) 1c97e834bd410e2316edf9f3ecb05074196adf64
+Following parent with do_switch
+Successfully followed parent
+r3 = c8261f08780df958aa9c3053b45131ae3957cf4c (refs/remotes/origin/tags/v1)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+1c97e834bd410e2316edf9f3ecb05074196adf64
+7ad10828c652e2c1737a815f9bb2d90268d45066
+c8261f08780df958aa9c3053b45131ae3957cf4c
+ok 8 - test clone -s with unescaped space
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9126-git-svn-follow-deleted-readded-directory.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9126-git-svn-follow-deleted-readded-directory/.git/
-1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9128-git-svn-cmd-branch.sh ***
-skipping test t9128 altogether
-1..0 # SKIP skip all tests in t9128
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9124-git-svn-dcommit-auto-props.sh ***
@@ -516586,7 +516739,7 @@
 Committing transaction...
 Committed revision 1.
 	A	foo
-r1 = 4413fb04bc5c1bfc817f8b63b7ccb24b08b4f74e (refs/remotes/git-svn)
+r1 = 6e9e7e4966aa07e6bd2554ff6b2a3015bbd68468 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9124-git-svn-dcommit-auto-props/svnrepo r1
 ok 1 - initialize git svn
@@ -516605,7 +516758,7 @@
 	git commit -m "files for enabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master d80ab7d] files for enabled auto-props
+[master 6478231] files for enabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100644 bar
@@ -516620,8 +516773,8 @@
 	A	bar
 	A	exec1.sh
 	A	hello.txt
-r2 = 16654610b016091ef61493a29abf349e40370b20 (refs/remotes/git-svn)
-No changes between d80ab7d4cd97db170c013a5963296d645d1ebd67 and refs/remotes/git-svn
+r2 = 41e2aa1d592b3eec0a9a9c85e4ee15ddd58c270d (refs/remotes/git-svn)
+No changes between 6478231d0ceaac341a0bf22cc30e0ca36ca60d7d and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - add files matching auto-props
 
@@ -516638,7 +516791,7 @@
 	git commit -m "files for disabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master f238ed1] files for disabled auto-props
+[master 9f5832e] files for disabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100755 exec2.sh
@@ -516653,8 +516806,8 @@
 	A	exec2.sh
 	A	world.txt
 	A	zot
-r3 = 8104d501e76f5d50d2f58eaf6346f2f76347e113 (refs/remotes/git-svn)
-No changes between f238ed1b5eb40abd941523579d32825bf377d335 and refs/remotes/git-svn
+r3 = 4ae0c3887912f170af03d7b4ec93a44965394fe8 (refs/remotes/git-svn)
+No changes between 9f5832e3716a8f22df70ab5046f1845c3b6fa541 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - add files matching disabled auto-props
 
@@ -516723,7 +516876,7 @@
 		test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF"
 	)
 
-[master 44abb6f] foo => foo.sh
+[master c344e92] foo => foo.sh
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename foo => foo.sh (100%)
@@ -516734,8 +516887,8 @@
 	D	foo
 	A	foo.sh
 W: -empty_dir: foo
-r4 = 167d0bbb014a398f779b86b84211206cd000b400 (refs/remotes/git-svn)
-No changes between 44abb6f38cf63f88adcd5587c1e54a28143cd3f3 and refs/remotes/git-svn
+r4 = 3a69933752eb1e37746e6e035ef83999a5145097 (refs/remotes/git-svn)
+No changes between c344e9284d71b085726a023d2e27d0b77b80d116 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 D    foo
@@ -516784,21 +516937,21 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9125-git-svn-multi-glob-branch-names/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo
 	A	foo
-r1 = cc26b29cd0de7468098217a7945782f17051408b (refs/remotes/origin/trunk)
+r1 = 9bfcec5e284fa6406428027be82f15803f6c2186 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/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) cc26b29cd0de7468098217a7945782f17051408b
+Found branch parent: (refs/remotes/origin/v14.1/beta) 9bfcec5e284fa6406428027be82f15803f6c2186
 Following parent with do_switch
 Successfully followed parent
-r2 = a2d08d1d81ce8193b1511a58208d4f28886d17ca (refs/remotes/origin/v14.1/beta)
+r2 = 4155438168451e2aa1c12b3fbedd0d6906070f19 (refs/remotes/origin/v14.1/beta)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta => file:///build/reproducible-path/git-2.47.2/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) a2d08d1d81ce8193b1511a58208d4f28886d17ca
+Found branch parent: (refs/remotes/origin/v14.1/gold) 4155438168451e2aa1c12b3fbedd0d6906070f19
 Following parent with do_switch
 Successfully followed parent
-r3 = da034bb55703c821457a3de21b09da2bba4952e8 (refs/remotes/origin/v14.1/gold)
+r3 = 4aa233ad644e204e433c553cf47a8dedc367e9c9 (refs/remotes/origin/v14.1/gold)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk r1
-a2d08d1d81ce8193b1511a58208d4f28886d17ca
-da034bb55703c821457a3de21b09da2bba4952e8
+4155438168451e2aa1c12b3fbedd0d6906070f19
+4aa233ad644e204e433c553cf47a8dedc367e9c9
 ok 2 - test clone with multi-glob in branch names
 
 expecting success of 9125.3 'test dcommit to multi-globbed branch': 
@@ -516809,8 +516962,8 @@
 	git svn dcommit
 	)
 	
-HEAD is now at da034bb more fun!
-[master 2aa1268] hello
+HEAD is now at 4aa233a more fun!
+[master ac5fe3d] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -516818,8 +516971,8 @@
 	M	foo
 Committed r4
 	M	foo
-r4 = 219a8cb733f4f1a56780bcf33473ddf919b8468d (refs/remotes/origin/v14.1/gold)
-No changes between 2aa126820854b2b48c617a59b22fa6ff4cc638da and refs/remotes/origin/v14.1/gold
+r4 = 9c4e84e75c3a151a99e0978b75fa95e61bbfca24 (refs/remotes/origin/v14.1/gold)
+No changes between ac5fe3d426829e6d9752cd32af54a41682c05e24 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
 
@@ -516827,181 +516980,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9120-git-svn-clone-with-percent-escapes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/.git/
-expecting success of 9120.1 'setup svnrepo': 
-	mkdir project project/trunk project/branches project/tags &&
-	echo foo > project/trunk/foo &&
-	svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
-	svn_cmd cp -m "branch" "$svnrepo/pr ject/trunk" \
-	  "$svnrepo/pr ject/branches/b" &&
-	svn_cmd cp -m "tag" "$svnrepo/pr ject/trunk" \
-	  "$svnrepo/pr ject/tags/v1" &&
-	rm -rf project &&
-	maybe_start_httpd
-
-Adding         project/branches
-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 9120.2 'test clone with percent escapes': 
-	git svn clone "$svnrepo/pr%20ject" clone &&
-	(
-		cd clone &&
-		git rev-parse refs/remotes/git-svn
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/clone/.git/
-	A	trunk/foo
-W: +empty_dir: branches
-W: +empty_dir: tags
-r1 = a279086eba0dceaf424a6ecec2fc0eb6b0d6413e (refs/remotes/git-svn)
-	A	branches/b/foo
-r2 = 72e0abb6d3786aab0988a0b5e4f94493e7046f70 (refs/remotes/git-svn)
-	A	tags/v1/foo
-r3 = e90eceec8c50b08b6b6a66a4e8eed4e5aba38a83 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject r3
-e90eceec8c50b08b6b6a66a4e8eed4e5aba38a83
-ok 2 - test clone with percent escapes
-
-expecting success of 9120.3 'svn checkout with percent escapes': 
-	svn_cmd checkout "$svnrepo/pr%20ject" svn.percent &&
-	svn_cmd checkout "$svnrepo/pr%20ject/trunk" svn.percent.trunk
-
-A    svn.percent/branches
-A    svn.percent/branches/b
-A    svn.percent/branches/b/foo
-A    svn.percent/tags
-A    svn.percent/tags/v1
-A    svn.percent/tags/v1/foo
-A    svn.percent/trunk
-A    svn.percent/trunk/foo
-Checked out revision 3.
-A    svn.percent.trunk/foo
-Checked out revision 3.
-ok 3 - svn checkout with percent escapes
-
-expecting success of 9120.4 'svn checkout with space': 
-	svn_cmd checkout "$svnrepo/pr ject" svn.space &&
-	svn_cmd checkout "$svnrepo/pr ject/trunk" svn.space.trunk
-
-A    svn.space/branches
-A    svn.space/branches/b
-A    svn.space/branches/b/foo
-A    svn.space/tags
-A    svn.space/tags/v1
-A    svn.space/tags/v1/foo
-A    svn.space/trunk
-A    svn.space/trunk/foo
-Checked out revision 3.
-A    svn.space.trunk/foo
-Checked out revision 3.
-ok 4 - svn checkout with space
-
-expecting success of 9120.5 'test clone trunk with percent escapes and minimize-url': 
-	git svn clone --minimize-url "$svnrepo/pr%20ject/trunk" minimize &&
-	(
-		cd minimize &&
-		git rev-parse refs/remotes/git-svn
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/minimize/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = 1370c64f6a39a23269497add4c00166409016b7c (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-1370c64f6a39a23269497add4c00166409016b7c
-ok 5 - test clone trunk with percent escapes and minimize-url
-
-expecting success of 9120.6 'test clone trunk with percent escapes': 
-	git svn clone "$svnrepo/pr%20ject/trunk" trunk &&
-	(
-		cd trunk &&
-		git rev-parse refs/remotes/git-svn
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/trunk/.git/
-	A	foo
-r1 = 1370c64f6a39a23269497add4c00166409016b7c (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-1370c64f6a39a23269497add4c00166409016b7c
-ok 6 - test clone trunk with percent escapes
-
-expecting success of 9120.7 'test clone --stdlayout with percent escapes': 
-	git svn clone --stdlayout "$svnrepo/pr%20ject" percent &&
-	(
-		cd percent &&
-		git rev-parse refs/remotes/origin/trunk^0 &&
-		git rev-parse refs/remotes/origin/b^0 &&
-		git rev-parse refs/remotes/origin/tags/v1^0
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/percent/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = 1370c64f6a39a23269497add4c00166409016b7c (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) 1370c64f6a39a23269497add4c00166409016b7c
-Following parent with do_switch
-Successfully followed parent
-r2 = 9dd7397db5cdd27827ec6b9f851d326d478fc4a9 (refs/remotes/origin/b)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) 1370c64f6a39a23269497add4c00166409016b7c
-Following parent with do_switch
-Successfully followed parent
-r3 = f58d52ad0bd96ad69b4185c4b0eb8c3c93b0a445 (refs/remotes/origin/tags/v1)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-1370c64f6a39a23269497add4c00166409016b7c
-9dd7397db5cdd27827ec6b9f851d326d478fc4a9
-f58d52ad0bd96ad69b4185c4b0eb8c3c93b0a445
-ok 7 - test clone --stdlayout with percent escapes
-
-expecting success of 9120.8 'test clone -s with unescaped space': 
-	git svn clone -s "$svnrepo/pr ject" --prefix origin/ space &&
-	(
-		cd space &&
-		git rev-parse refs/remotes/origin/trunk^0 &&
-		git rev-parse refs/remotes/origin/b^0 &&
-		git rev-parse refs/remotes/origin/tags/v1^0
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/space/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = 1370c64f6a39a23269497add4c00166409016b7c (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) 1370c64f6a39a23269497add4c00166409016b7c
-Following parent with do_switch
-Successfully followed parent
-r2 = 9dd7397db5cdd27827ec6b9f851d326d478fc4a9 (refs/remotes/origin/b)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) 1370c64f6a39a23269497add4c00166409016b7c
-Following parent with do_switch
-Successfully followed parent
-r3 = f58d52ad0bd96ad69b4185c4b0eb8c3c93b0a445 (refs/remotes/origin/tags/v1)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-1370c64f6a39a23269497add4c00166409016b7c
-9dd7397db5cdd27827ec6b9f851d326d478fc4a9
-f58d52ad0bd96ad69b4185c4b0eb8c3c93b0a445
-ok 8 - test clone -s with unescaped space
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9117-git-svn-init-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9117-git-svn-init-clone/.git/
 expecting success of 9117.1 'setup svnrepo': 
@@ -517027,7 +517005,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
 	A	foo
-r1 = d6ca4fb296599a51c29feaf24fb62ea797190cd6 (refs/remotes/git-svn)
+r1 = 66d9daf0b3d0b20d7f8067cbdbfb89c5b95a2811 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 2 - basic clone
@@ -517041,7 +517019,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9117-git-svn-init-clone/target/.git/
 	A	foo
-r1 = d6ca4fb296599a51c29feaf24fb62ea797190cd6 (refs/remotes/git-svn)
+r1 = 66d9daf0b3d0b20d7f8067cbdbfb89c5b95a2811 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 3 - clone to target directory
@@ -517056,7 +517034,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
 	A	foo
-r1 = d6ca4fb296599a51c29feaf24fb62ea797190cd6 (refs/remotes/origin/trunk)
+r1 = 66d9daf0b3d0b20d7f8067cbdbfb89c5b95a2811 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 4 - clone with --stdlayout
@@ -517071,7 +517049,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9117-git-svn-init-clone/target/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
 	A	foo
-r1 = d6ca4fb296599a51c29feaf24fb62ea797190cd6 (refs/remotes/origin/trunk)
+r1 = 66d9daf0b3d0b20d7f8067cbdbfb89c5b95a2811 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 5 - clone to target directory with --stdlayout
@@ -517095,7 +517073,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
 	A	foo
-r1 = d6ca4fb296599a51c29feaf24fb62ea797190cd6 (refs/remotes/git-svn)
+r1 = 66d9daf0b3d0b20d7f8067cbdbfb89c5b95a2811 (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/': 
@@ -517119,7 +517097,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
 	A	foo
-r1 = d6ca4fb296599a51c29feaf24fb62ea797190cd6 (refs/remotes/origin/trunk)
+r1 = 66d9daf0b3d0b20d7f8067cbdbfb89c5b95a2811 (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': 
@@ -517143,7 +517121,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
 	A	foo
-r1 = d6ca4fb296599a51c29feaf24fb62ea797190cd6 (refs/remotes/trunk)
+r1 = 66d9daf0b3d0b20d7f8067cbdbfb89c5b95a2811 (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': 
@@ -517348,12 +517326,12 @@
 	git svn fetch -r1:2
 
 	A	foo
-r1 = fba5a3aece43ab70f60902584b42970babe356c9 (refs/remotes/origin/trunk)
+r1 = 59b6454a7d13e439f122d0753ba4e6183feb4c0a (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) fba5a3aece43ab70f60902584b42970babe356c9
+Found branch parent: (refs/remotes/origin/a) 59b6454a7d13e439f122d0753ba4e6183feb4c0a
 Following parent with do_switch
 Successfully followed parent
-r2 = 98cc2b4e0d61adffa6a1f96e784de945d4272b43 (refs/remotes/origin/a)
+r2 = 12d1afe0bded84352358106e5e755d2d5b2d7f80 (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r1
 ok 2 - import an early SVN revision into git
@@ -517370,16 +517348,16 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9127-git-svn-partial-rebuild/mirror/.git/
 	A	foo
-r1 = fba5a3aece43ab70f60902584b42970babe356c9 (refs/remotes/origin/trunk)
+r1 = 59b6454a7d13e439f122d0753ba4e6183feb4c0a (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) fba5a3aece43ab70f60902584b42970babe356c9
+Found branch parent: (refs/remotes/origin/a) 59b6454a7d13e439f122d0753ba4e6183feb4c0a
 Following parent with do_switch
 Successfully followed parent
-r2 = 98cc2b4e0d61adffa6a1f96e784de945d4272b43 (refs/remotes/origin/a)
+r2 = 12d1afe0bded84352358106e5e755d2d5b2d7f80 (refs/remotes/origin/a)
 	M	foo
-r3 = 980b92695f43fac05f8172b680a2eb88d3496a23 (refs/remotes/origin/trunk)
+r3 = 6e9cd80f2281d7b2e2215ed4ab0f62d0a8ef55b3 (refs/remotes/origin/trunk)
 	A	a
-r4 = 7a98f9bc81603c1a9f05d0d8fbcc5782c8db6cd2 (refs/remotes/origin/a)
+r4 = 4f95b1abf7c1298f2ab53051b108ace773b2e5b0 (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r3
 ok 3 - make full git mirror of SVN
@@ -517391,280 +517369,22 @@
 	git svn fetch
 
 From file:///build/reproducible-path/git-2.47.2/t/trash directory.t9127-git-svn-partial-rebuild/mirror/
-   98cc2b4..7a98f9b  origin/a     -> origin/a
-   fba5a3a..980b926  origin/trunk -> origin/trunk
-Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.bac60bd1-268f-401c-b1f3-8a380c803836 ...
-Currently at 1 = fba5a3aece43ab70f60902584b42970babe356c9
-r3 = 980b92695f43fac05f8172b680a2eb88d3496a23
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.bac60bd1-268f-401c-b1f3-8a380c803836
-Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.bac60bd1-268f-401c-b1f3-8a380c803836 ...
-Currently at 2 = 98cc2b4e0d61adffa6a1f96e784de945d4272b43
-r4 = 7a98f9bc81603c1a9f05d0d8fbcc5782c8db6cd2
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.bac60bd1-268f-401c-b1f3-8a380c803836
+   12d1afe..4f95b1a  origin/a     -> origin/a
+   59b6454..6e9cd80  origin/trunk -> origin/trunk
+Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.2254379b-55a8-47ea-952b-1830ba2f2e89 ...
+Currently at 1 = 59b6454a7d13e439f122d0753ba4e6183feb4c0a
+r3 = 6e9cd80f2281d7b2e2215ed4ab0f62d0a8ef55b3
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.2254379b-55a8-47ea-952b-1830ba2f2e89
+Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.2254379b-55a8-47ea-952b-1830ba2f2e89 ...
+Currently at 2 = 12d1afe0bded84352358106e5e755d2d5b2d7f80
+r4 = 4f95b1abf7c1298f2ab53051b108ace773b2e5b0
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.2254379b-55a8-47ea-952b-1830ba2f2e89
 ok 4 - fetch from git mirror and partial-rebuild
 
 # passed all 4 test(s)
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9133-git-svn-nested-git-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9133-git-svn-nested-git-repo/.git/
-expecting success of 9133.1 'setup repo with a git repo inside it': 
-	svn_cmd co "$svnrepo" s &&
-	(
-		cd s &&
-		git init &&
-		git symbolic-ref HEAD &&
-		> .git/a &&
-		echo a > a &&
-		svn_cmd add .git a &&
-		svn_cmd commit -m "create a nested git repo" &&
-		svn_cmd up &&
-		echo hi >> .git/a &&
-		svn_cmd commit -m "modify .git/a" &&
-		svn_cmd up
-	)
-
-Checked out revision 0.
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9133-git-svn-nested-git-repo/s/.git/
-refs/heads/master
-A         .git
-A         .git/refs
-A         .git/refs/tags
-A         .git/refs/heads
-A         .git/a
-A         .git/HEAD
-A         .git/hooks
-A         .git/hooks/prepare-commit-msg.sample
-A         .git/hooks/sendemail-validate.sample
-A         .git/hooks/applypatch-msg.sample
-A         .git/hooks/pre-applypatch.sample
-A         .git/hooks/pre-merge-commit.sample
-A         .git/hooks/commit-msg.sample
-A         .git/hooks/pre-commit.sample
-A         .git/hooks/fsmonitor-watchman.sample
-A         .git/hooks/push-to-checkout.sample
-A         .git/hooks/update.sample
-A         .git/hooks/pre-push.sample
-A         .git/hooks/post-update.sample
-A         .git/hooks/pre-rebase.sample
-A         .git/hooks/pre-receive.sample
-A         .git/description
-A         .git/config
-A         .git/branches
-A         .git/objects
-A         .git/objects/info
-A         .git/objects/pack
-A         .git/info
-A         .git/info/exclude
-A         a
-Adding         .git
-Adding         .git/HEAD
-Adding         .git/a
-Adding         .git/branches
-Adding         .git/config
-Adding         .git/description
-Adding         .git/hooks
-Adding         .git/hooks/applypatch-msg.sample
-Adding         .git/hooks/commit-msg.sample
-Adding         .git/hooks/fsmonitor-watchman.sample
-Adding         .git/hooks/post-update.sample
-Adding         .git/hooks/pre-applypatch.sample
-Adding         .git/hooks/pre-commit.sample
-Adding         .git/hooks/pre-merge-commit.sample
-Adding         .git/hooks/pre-push.sample
-Adding         .git/hooks/pre-rebase.sample
-Adding         .git/hooks/pre-receive.sample
-Adding         .git/hooks/prepare-commit-msg.sample
-Adding         .git/hooks/push-to-checkout.sample
-Adding         .git/hooks/sendemail-validate.sample
-Adding         .git/hooks/update.sample
-Adding         .git/info
-Adding         .git/info/exclude
-Adding         .git/objects
-Adding         .git/objects/info
-Adding         .git/objects/pack
-Adding         .git/refs
-Adding         .git/refs/heads
-Adding         .git/refs/tags
-Adding         a
-Transmitting file data ....................done
-Committing transaction...
-Committed revision 1.
-Updating '.':
-At revision 1.
-Sending        .git/a
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-ok 1 - setup repo with a git repo inside it
-
-expecting success of 9133.2 'clone an SVN repo containing a git repo': 
-	git svn clone "$svnrepo" g &&
-	echo a > expect &&
-	test_cmp expect g/a
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9133-git-svn-nested-git-repo/g/.git/
-	A	a
-r1 = b07a36c16edf1c26c4322edfd8b6bf727eec5989 (refs/remotes/git-svn)
-r2 = 277404e053582eee517a4a52643fcb79f196fca7 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9133-git-svn-nested-git-repo/svnrepo r2
-ok 2 - clone an SVN repo containing a git repo
-
-expecting success of 9133.3 'SVN-side change outside of .git': 
-	(
-		cd s &&
-		echo b >> a &&
-		svn_cmd commit -m "SVN-side change outside of .git" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep -F "SVN-side change outside of .git"
-	)
-
-Sending        a
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Updating '.':
-At revision 3.
-SVN-side change outside of .git
-ok 3 - SVN-side change outside of .git
-
-expecting success of 9133.4 'update git svn-cloned repo': 
-	(
-		cd g &&
-		git svn rebase &&
-		echo a > expect &&
-		echo b >> expect &&
-		test_cmp expect a &&
-		rm expect
-	)
-
-	M	a
-r3 = bdca6fe4183f14a583bbdefd4e087a729b8fea0c (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 4 - update git svn-cloned repo
-
-expecting success of 9133.5 'SVN-side change inside of .git': 
-	(
-		cd s &&
-		git add a &&
-		git commit -m "add a inside an SVN repo" &&
-		git log &&
-		svn_cmd add --force .git &&
-		svn_cmd commit -m "SVN-side change inside of .git" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep -F "SVN-side change inside of .git"
-	)
-
-[master (root-commit) 2c8aa43] add a inside an SVN repo
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 a
-commit 2c8aa43a22d2c918b77cfe09cfecdfbb4dce2117
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    add a inside an SVN repo
-A         .git/refs/heads/master
-A         .git/logs
-A         .git/logs/refs
-A         .git/logs/refs/heads
-A         .git/logs/refs/heads/master
-A         .git/logs/HEAD
-A         .git/COMMIT_EDITMSG
-A  (bin)  .git/index
-A         .git/objects/a3
-A  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
-A         .git/objects/2c
-A  (bin)  .git/objects/2c/8aa43a22d2c918b77cfe09cfecdfbb4dce2117
-A         .git/objects/42
-A  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
-Adding         .git/COMMIT_EDITMSG
-Adding  (bin)  .git/index
-Adding         .git/logs
-Adding         .git/logs/HEAD
-Adding         .git/logs/refs
-Adding         .git/logs/refs/heads
-Adding         .git/logs/refs/heads/master
-Adding         .git/objects/2c
-Adding  (bin)  .git/objects/2c/8aa43a22d2c918b77cfe09cfecdfbb4dce2117
-Adding         .git/objects/42
-Adding  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
-Adding         .git/objects/a3
-Adding  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
-Adding         .git/refs/heads/master
-Transmitting file data ........done
-Committing transaction...
-Committed revision 4.
-Updating '.':
-At revision 4.
-SVN-side change inside of .git
-ok 5 - SVN-side change inside of .git
-
-expecting success of 9133.6 'update git svn-cloned repo': 
-	(
-		cd g &&
-		git svn rebase &&
-		echo a > expect &&
-		echo b >> expect &&
-		test_cmp expect a &&
-		rm expect
-	)
-
-r4 = ee94516582bf3a8b3c2e356a2a724d5556f9d619 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 6 - update git svn-cloned repo
-
-expecting success of 9133.7 'SVN-side change in and out of .git': 
-	(
-		cd s &&
-		echo c >> a &&
-		git add a &&
-		git commit -m "add a inside an SVN repo" &&
-		svn_cmd commit -m "SVN-side change in and out of .git" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep -F "SVN-side change in and out of .git"
-	)
-
-[master 1e2f668] add a inside an SVN repo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Sending        .git/index
-Sending        .git/logs/HEAD
-Sending        .git/logs/refs/heads/master
-Sending        .git/refs/heads/master
-Sending        a
-Transmitting file data .....done
-Committing transaction...
-Committed revision 5.
-Updating '.':
-At revision 5.
-SVN-side change in and out of .git
-ok 7 - SVN-side change in and out of .git
-
-expecting success of 9133.8 'update git svn-cloned repo again': 
-	(
-		cd g &&
-		git svn rebase &&
-		echo a > expect &&
-		echo b >> expect &&
-		echo c >> expect &&
-		test_cmp expect a &&
-		rm expect
-	)
-
-	M	a
-r5 = e117b588a2faf4fa7ea23e1d40a9818018bc7605 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 8 - update git svn-cloned repo again
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9115-git-svn-dcommit-funky-renames.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9115-git-svn-dcommit-funky-renames/.git/
 expecting success of 9115.1 'load repository with strange names': 
@@ -517710,7 +517430,7 @@
 	A	#{bad_directory_name}/ foo
 Committed r2
 	A	#{bad_directory_name}/ foo
-r2 = 3788da0cd18376a563332c1a8a9fc2420f121c5a (refs/remotes/git-svn)
+r2 = 177703bd023c3db468c43a649663273f751f1c41 (refs/remotes/git-svn)
 No changes between 44e312ce34fc51c4ae6227a1b06f447fc60ee8c2 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - create file in existing ugly and empty dir
@@ -517720,7 +517440,7 @@
 	git commit -m "rename ugly file" &&
 	git svn dcommit
 	
-[master 10b6a81] rename ugly file
+[master 15f781b] 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%)
@@ -517731,8 +517451,8 @@
 	D	#{bad_directory_name}/ foo
 	A	file name with feces
 W: -empty_dir: #{bad_directory_name}/ foo
-r3 = 09b103500761aa8d8dc4ab3bed3fb5d446b54145 (refs/remotes/git-svn)
-No changes between 10b6a81054dbd23fa9b12ed6645764374a1e5f05 and refs/remotes/git-svn
+r3 = 81b01df53c40ffa4d2b18adbc3ef14038f737cc5 (refs/remotes/git-svn)
+No changes between 15f781b2ce9d5fe5070ddd672813ef7debdd88f9 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 4 - rename ugly file
 
@@ -517746,7 +517466,7 @@
 	git commit -m "moved pretty file" &&
 	git svn dcommit
 	
-[master a2f75bd] pretty :x
+[master 6d702b1] pretty :x
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 pretty
@@ -517755,10 +517475,10 @@
 	A	pretty
 Committed r4
 	A	pretty
-r4 = c8398565cac3358fd390478b58811e70d345aa9c (refs/remotes/git-svn)
-No changes between a2f75bd21734a3c3118fac825e09fc1e6f3e3eed and refs/remotes/git-svn
+r4 = 27c971fe9a16201dd683946ffcc4ef3145ec5515 (refs/remotes/git-svn)
+No changes between 6d702b12b4d98a3d535bedfca779ee1ba6946fca and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master 5203902] moved pretty file
+[master e797122] moved pretty file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename pretty => regular_dir_name/pretty (100%)
@@ -517769,8 +517489,8 @@
 	D	pretty
 	A	regular_dir_name/pretty
 W: -empty_dir: pretty
-r5 = e2560de98744d6a05d1f779e36ba8ca14b543e2a (refs/remotes/git-svn)
-No changes between 5203902b0105b7782ecc6d891b505a5f96c4e416 and refs/remotes/git-svn
+r5 = 3923730c6f8da14103bad0914020a4f47c9cb3b4 (refs/remotes/git-svn)
+No changes between e797122e663a8118b97c6c4a6822f55c48ed725d and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - rename pretty file
 
@@ -517779,7 +517499,7 @@
 	git commit -m booboo &&
 	git svn dcommit
 	
-[master 2ef4c1e] booboo
+[master 3b172a7] 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%)
@@ -517790,8 +517510,8 @@
 	A	#{bad_directory_name}/ booboo
 	D	regular_dir_name/pretty
 W: -empty_dir: regular_dir_name/pretty
-r6 = 7e657730bc318c5973f7507bfbd4cef7ab27fbb4 (refs/remotes/git-svn)
-No changes between 2ef4c1ec283f716724a07f122730d6a777aef2b0 and refs/remotes/git-svn
+r6 = f6a0aeaa6b1a94992865e6af517392450956f1a6 (refs/remotes/git-svn)
+No changes between 3b172a70f7fab50c27b94b1a7abd45735bf22eb2 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 6 - rename pretty file into ugly one
 
@@ -517804,11 +517524,11 @@
 	git commit -m plus_dir &&
 	git svn dcommit
 	
-[master c497ded] plus
+[master 4cdbfbf] plus
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 +_+
-[master 35ee096] plus_dir
+[master d9a8825] plus_dir
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename +_+ => gtk+/_+_ (100%)
@@ -517817,14 +517537,14 @@
 	A	+_+
 Committed r7
 	A	+_+
-r7 = cd0145774fc0bce62ffe7c7a3da7e09535a2bdc7 (refs/remotes/git-svn)
+r7 = 6dfd9e30ddcd9a8a0b71fe19b322cc5d50e2782f (refs/remotes/git-svn)
 	R	+_+ => gtk+/_+_
 Committed r8
 	D	+_+
 	A	gtk+/_+_
 W: -empty_dir: +_+
-r8 = 47fd1a66b629222c59164ef3acab2537e0bf5ba8 (refs/remotes/git-svn)
-No changes between 35ee096cd14d63cb1808d5708756ea545d6c2acd and refs/remotes/git-svn
+r8 = 1f9cbf69810a280a81de22501b1f66bb30645704 (refs/remotes/git-svn)
+No changes between d9a88258902c5989fb60fab2ccbd037b3afc0012 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 7 - add a file with plus signs
 
@@ -517847,33 +517567,33 @@
 W: +empty_dir: regular_dir_name
 r1 = dd328b0d9192af35fade211af01e4362c7c2be29 (refs/remotes/git-svn)
 	A	#{bad_directory_name}/ foo
-r2 = 3788da0cd18376a563332c1a8a9fc2420f121c5a (refs/remotes/git-svn)
+r2 = 177703bd023c3db468c43a649663273f751f1c41 (refs/remotes/git-svn)
 	D	#{bad_directory_name}/ foo
 	A	file name with feces
 W: -empty_dir: #{bad_directory_name}/ foo
-r3 = 09b103500761aa8d8dc4ab3bed3fb5d446b54145 (refs/remotes/git-svn)
+r3 = 81b01df53c40ffa4d2b18adbc3ef14038f737cc5 (refs/remotes/git-svn)
 	A	pretty
-r4 = c8398565cac3358fd390478b58811e70d345aa9c (refs/remotes/git-svn)
+r4 = 27c971fe9a16201dd683946ffcc4ef3145ec5515 (refs/remotes/git-svn)
 	D	pretty
 	A	regular_dir_name/pretty
 W: -empty_dir: pretty
-r5 = e2560de98744d6a05d1f779e36ba8ca14b543e2a (refs/remotes/git-svn)
+r5 = 3923730c6f8da14103bad0914020a4f47c9cb3b4 (refs/remotes/git-svn)
 	A	#{bad_directory_name}/ booboo
 	D	regular_dir_name/pretty
 W: -empty_dir: regular_dir_name/pretty
-r6 = 7e657730bc318c5973f7507bfbd4cef7ab27fbb4 (refs/remotes/git-svn)
+r6 = f6a0aeaa6b1a94992865e6af517392450956f1a6 (refs/remotes/git-svn)
 	A	+_+
-r7 = cd0145774fc0bce62ffe7c7a3da7e09535a2bdc7 (refs/remotes/git-svn)
+r7 = 6dfd9e30ddcd9a8a0b71fe19b322cc5d50e2782f (refs/remotes/git-svn)
 	D	+_+
 	A	gtk+/_+_
 W: -empty_dir: +_+
-r8 = 47fd1a66b629222c59164ef3acab2537e0bf5ba8 (refs/remotes/git-svn)
+r8 = 1f9cbf69810a280a81de22501b1f66bb30645704 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/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 c6e3447] test-rebase
+[master 2f79cd7] test-rebase
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 test-rebase
@@ -517885,7 +517605,7 @@
 		git commit -m test-rebase-main &&
 		git svn dcommit
 	
-[master 8048801] test-rebase-main
+[master 341b262] test-rebase-main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 test-rebase-main
@@ -517894,8 +517614,8 @@
 	A	test-rebase-main
 Committed r9
 	A	test-rebase-main
-r9 = ee364849e8d65f9c3c976a568fdec1e79c88eb43 (refs/remotes/git-svn)
-No changes between 8048801b6d6ef891f1339072ca62bebd31f1de12 and refs/remotes/git-svn
+r9 = 7fd09d2ef9e2ec81fdd421c6dd8d9689ff8728ea (refs/remotes/git-svn)
+No changes between 341b26296502d4d748e562dca2f150a41631aa24 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 9 - make a commit to test rebase
 
@@ -517907,7 +517627,7 @@
 		test -e test-rebase
 	)
 	A	test-rebase-main
-r9 = ee364849e8d65f9c3c976a568fdec1e79c88eb43 (refs/remotes/git-svn)
+r9 = 7fd09d2ef9e2ec81fdd421c6dd8d9689ff8728ea (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
 
@@ -517934,7 +517654,7 @@
 	git commit -m "neq" &&
 	git svn dcommit
 
-[master 93743e9] neq
+[master 9784c30] neq
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\201\202"
@@ -517943,8 +517663,8 @@
 	A	�‚
 Committed r10
 	A	�‚
-r10 = 6723ff84eb1ceed9f613298ea48084ac73194690 (refs/remotes/git-svn)
-No changes between 93743e916166e90027e49905fea14ee800d1683b and refs/remotes/git-svn
+r10 = 13e7b29080b92cd0e52da5a494a29f7f149b8aa9 (refs/remotes/git-svn)
+No changes between 9784c304d14b5642e212801067d85c154ee505f7 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 11 - svn.pathnameencoding=cp932 new file on dcommit
 
@@ -517961,7 +517681,7 @@
 	git commit -m "inf rename" &&
 	git svn dcommit
 
-[master ceb3eae] inf
+[master e069b33] inf
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\201\207"
@@ -517970,10 +517690,10 @@
 	A	�‡
 Committed r11
 	A	�‡
-r11 = 83aaf311b83daa2619fa2b894aed12215403cbce (refs/remotes/git-svn)
-No changes between ceb3eaee8e2b1794aa66492dab4cf54558ef154f and refs/remotes/git-svn
+r11 = 7c4f2057cad9a8cd83b3b76e7cc1fc179ce73f9d (refs/remotes/git-svn)
+No changes between e069b33ec0b3a2204db9701b4b29735ddf4f3509 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master d0f2dac] inf rename
+[master 8b43c9f] inf rename
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename "\201\207" => inf (100%)
@@ -517984,8 +517704,8 @@
 	D	�‡
 	A	inf
 W: -empty_dir: ∞
-r12 = 3ffdde42c5ca0a2b26704299e71c17e24258c989 (refs/remotes/git-svn)
-No changes between d0f2dacf802aaa72fcb66f74dfeeaa315376c129 and refs/remotes/git-svn
+r12 = 0ae1c84b1121cc93ab726bfd83cab0477e4b6460 (refs/remotes/git-svn)
+No changes between 8b43c9f4859636bc859ff4e5702435f037a441f5 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 12 - svn.pathnameencoding=cp932 rename on dcommit
 
@@ -517993,6 +517713,264 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9133-git-svn-nested-git-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9133-git-svn-nested-git-repo/.git/
+expecting success of 9133.1 'setup repo with a git repo inside it': 
+	svn_cmd co "$svnrepo" s &&
+	(
+		cd s &&
+		git init &&
+		git symbolic-ref HEAD &&
+		> .git/a &&
+		echo a > a &&
+		svn_cmd add .git a &&
+		svn_cmd commit -m "create a nested git repo" &&
+		svn_cmd up &&
+		echo hi >> .git/a &&
+		svn_cmd commit -m "modify .git/a" &&
+		svn_cmd up
+	)
+
+Checked out revision 0.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9133-git-svn-nested-git-repo/s/.git/
+refs/heads/master
+A         .git
+A         .git/hooks
+A         .git/hooks/fsmonitor-watchman.sample
+A         .git/hooks/push-to-checkout.sample
+A         .git/hooks/update.sample
+A         .git/hooks/pre-push.sample
+A         .git/hooks/post-update.sample
+A         .git/hooks/pre-rebase.sample
+A         .git/hooks/pre-receive.sample
+A         .git/hooks/prepare-commit-msg.sample
+A         .git/hooks/sendemail-validate.sample
+A         .git/hooks/applypatch-msg.sample
+A         .git/hooks/pre-applypatch.sample
+A         .git/hooks/pre-merge-commit.sample
+A         .git/hooks/commit-msg.sample
+A         .git/hooks/pre-commit.sample
+A         .git/description
+A         .git/config
+A         .git/branches
+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         .git/a
+A         .git/HEAD
+A         a
+Adding         .git
+Adding         .git/HEAD
+Adding         .git/a
+Adding         .git/branches
+Adding         .git/config
+Adding         .git/description
+Adding         .git/hooks
+Adding         .git/hooks/applypatch-msg.sample
+Adding         .git/hooks/commit-msg.sample
+Adding         .git/hooks/fsmonitor-watchman.sample
+Adding         .git/hooks/post-update.sample
+Adding         .git/hooks/pre-applypatch.sample
+Adding         .git/hooks/pre-commit.sample
+Adding         .git/hooks/pre-merge-commit.sample
+Adding         .git/hooks/pre-push.sample
+Adding         .git/hooks/pre-rebase.sample
+Adding         .git/hooks/pre-receive.sample
+Adding         .git/hooks/prepare-commit-msg.sample
+Adding         .git/hooks/push-to-checkout.sample
+Adding         .git/hooks/sendemail-validate.sample
+Adding         .git/hooks/update.sample
+Adding         .git/info
+Adding         .git/info/exclude
+Adding         .git/objects
+Adding         .git/objects/info
+Adding         .git/objects/pack
+Adding         .git/refs
+Adding         .git/refs/heads
+Adding         .git/refs/tags
+Adding         a
+Transmitting file data ....................done
+Committing transaction...
+Committed revision 1.
+Updating '.':
+At revision 1.
+Sending        .git/a
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+Updating '.':
+At revision 2.
+ok 1 - setup repo with a git repo inside it
+
+expecting success of 9133.2 'clone an SVN repo containing a git repo': 
+	git svn clone "$svnrepo" g &&
+	echo a > expect &&
+	test_cmp expect g/a
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9133-git-svn-nested-git-repo/g/.git/
+	A	a
+r1 = 91fcb3ce6a74c14d7d698452d22a6cc1bd945174 (refs/remotes/git-svn)
+r2 = ddf4b459dc99bec8a09cd000c283ad375248f50a (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9133-git-svn-nested-git-repo/svnrepo r2
+ok 2 - clone an SVN repo containing a git repo
+
+expecting success of 9133.3 'SVN-side change outside of .git': 
+	(
+		cd s &&
+		echo b >> a &&
+		svn_cmd commit -m "SVN-side change outside of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep -F "SVN-side change outside of .git"
+	)
+
+Sending        a
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Updating '.':
+At revision 3.
+SVN-side change outside of .git
+ok 3 - SVN-side change outside of .git
+
+expecting success of 9133.4 'update git svn-cloned repo': 
+	(
+		cd g &&
+		git svn rebase &&
+		echo a > expect &&
+		echo b >> expect &&
+		test_cmp expect a &&
+		rm expect
+	)
+
+	M	a
+r3 = eab76d8ddfd0850cb8484e47e8261eb7bf371dbe (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 4 - update git svn-cloned repo
+
+expecting success of 9133.5 'SVN-side change inside of .git': 
+	(
+		cd s &&
+		git add a &&
+		git commit -m "add a inside an SVN repo" &&
+		git log &&
+		svn_cmd add --force .git &&
+		svn_cmd commit -m "SVN-side change inside of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep -F "SVN-side change inside of .git"
+	)
+
+[master (root-commit) 2c8aa43] add a inside an SVN repo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 a
+commit 2c8aa43a22d2c918b77cfe09cfecdfbb4dce2117
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    add a inside an SVN repo
+A  (bin)  .git/index
+A         .git/objects/a3
+A  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
+A         .git/objects/2c
+A  (bin)  .git/objects/2c/8aa43a22d2c918b77cfe09cfecdfbb4dce2117
+A         .git/objects/42
+A  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
+A         .git/refs/heads/master
+A         .git/logs
+A         .git/logs/refs
+A         .git/logs/refs/heads
+A         .git/logs/refs/heads/master
+A         .git/logs/HEAD
+A         .git/COMMIT_EDITMSG
+Adding         .git/COMMIT_EDITMSG
+Adding  (bin)  .git/index
+Adding         .git/logs
+Adding         .git/logs/HEAD
+Adding         .git/logs/refs
+Adding         .git/logs/refs/heads
+Adding         .git/logs/refs/heads/master
+Adding         .git/objects/2c
+Adding  (bin)  .git/objects/2c/8aa43a22d2c918b77cfe09cfecdfbb4dce2117
+Adding         .git/objects/42
+Adding  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
+Adding         .git/objects/a3
+Adding  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
+Adding         .git/refs/heads/master
+Transmitting file data ........done
+Committing transaction...
+Committed revision 4.
+Updating '.':
+At revision 4.
+SVN-side change inside of .git
+ok 5 - SVN-side change inside of .git
+
+expecting success of 9133.6 'update git svn-cloned repo': 
+	(
+		cd g &&
+		git svn rebase &&
+		echo a > expect &&
+		echo b >> expect &&
+		test_cmp expect a &&
+		rm expect
+	)
+
+r4 = 32331ca8411842965c2574e47b6a76577e7d44b7 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 6 - update git svn-cloned repo
+
+expecting success of 9133.7 'SVN-side change in and out of .git': 
+	(
+		cd s &&
+		echo c >> a &&
+		git add a &&
+		git commit -m "add a inside an SVN repo" &&
+		svn_cmd commit -m "SVN-side change in and out of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep -F "SVN-side change in and out of .git"
+	)
+
+[master 1e2f668] add a inside an SVN repo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Sending        .git/index
+Sending        .git/logs/HEAD
+Sending        .git/logs/refs/heads/master
+Sending        .git/refs/heads/master
+Sending        a
+Transmitting file data .....done
+Committing transaction...
+Committed revision 5.
+Updating '.':
+At revision 5.
+SVN-side change in and out of .git
+ok 7 - SVN-side change in and out of .git
+
+expecting success of 9133.8 'update git svn-cloned repo again': 
+	(
+		cd g &&
+		git svn rebase &&
+		echo a > expect &&
+		echo b >> expect &&
+		echo c >> expect &&
+		test_cmp expect a &&
+		rm expect
+	)
+
+	M	a
+r5 = d10f96b31fd20b29a8be6c0dd12e0d8502fa24eb (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 8 - update git svn-cloned repo again
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9131-git-svn-empty-symlink.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9131-git-svn-empty-symlink/.git/
 expecting success of 9131.1 'load svn dumpfile': 
@@ -518174,6 +518152,198 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9129-git-svn-i18n-commitencoding.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9129-git-svn-i18n-commitencoding/.git/
+expecting success of 9129.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.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO8859-1/.git/
+r1 = 3e67fa623a4d75fac22cf0b407fd584a58c454cb (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 r1
+ok 1 - ISO8859-1 setup
+
+expecting success of 9129.2 'eucJP setup': 
+		mkdir $H &&
+		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
+		git svn clone "$svnrepo"/$H $H
+	
+Committing transaction...
+Committed revision 2.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9129-git-svn-i18n-commitencoding/eucJP/.git/
+r2 = e2e6ff150fddc99c21e49e271c7f07132c4e5387 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP r2
+ok 2 - eucJP setup
+
+expecting success of 9129.3 'ISO-2022-JP setup': 
+		mkdir $H &&
+		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
+		git svn clone "$svnrepo"/$H $H
+	
+Committing transaction...
+Committed revision 3.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO-2022-JP/.git/
+r3 = 06df725f817db2f8c540d1a02afd14106f6d918b (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP r3
+ok 3 - ISO-2022-JP setup
+
+expecting success of 9129.4 'ISO8859-1 commit on git side': 
+	(
+		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" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Switched to a new branch 't'
+[t 977c33a] ÄËÑÏÖ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F
+ok 4 - ISO8859-1 commit on git side
+
+expecting success of 9129.5 'eucJP commit on git side': 
+	(
+		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" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Switched to a new branch 't'
+[t aab92c3] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F
+ok 5 - eucJP commit on git side
+
+expecting success of 9129.6 'ISO-2022-JP commit on git side': 
+	(
+		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" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Switched to a new branch 't'
+[t adcb57c] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F
+ok 6 - ISO-2022-JP commit on git side
+
+expecting success of 9129.7 'ISO8859-1 dcommit to svn': 
+	(
+		cd $H &&
+		git svn dcommit &&
+		git cat-file commit HEAD | grep git-svn-id: &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 ...
+	A	F
+Committed r4
+	A	F
+r4 = 795abfae5389d40dd853b3b46d38c8b4d234d832 (refs/remotes/git-svn)
+No changes between 977c33ac3180a396d36a20b7a4b3ad1be18bef1d and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 42de1ded-740e-4ff4-9bb8-6b83e4635a0e
+ok 7 - ISO8859-1 dcommit to svn
+
+expecting success of 9129.8 'eucJP dcommit to svn': 
+	(
+		cd $H &&
+		git svn dcommit &&
+		git cat-file commit HEAD | grep git-svn-id: &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP ...
+	A	F
+Committed r5
+	A	F
+r5 = 96ac1eab5cab73143304a1aea863ccbe566a72d0 (refs/remotes/git-svn)
+No changes between aab92c3d630fcac38d723b24418b0d3d0552d4c2 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 42de1ded-740e-4ff4-9bb8-6b83e4635a0e
+ok 8 - eucJP dcommit to svn
+
+expecting success of 9129.9 'ISO-2022-JP dcommit to svn': 
+	(
+		cd $H &&
+		git svn dcommit &&
+		git cat-file commit HEAD | grep git-svn-id: &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP ...
+	A	F
+Committed r6
+	A	F
+r6 = 9f0a54e65a0df7d00f3c58cb9be04912791274aa (refs/remotes/git-svn)
+No changes between adcb57cc0c32fae2b12afd010b710edbe4281a29 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 42de1ded-740e-4ff4-9bb8-6b83e4635a0e
+ok 9 - ISO-2022-JP dcommit to svn
+
+expecting success of 9129.10 'ISO-8859-1 should match UTF-8 in svn': 
+	(
+		cd ISO8859-1 &&
+		compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+	)
+
+ok 10 - ISO-8859-1 should match UTF-8 in svn
+
+expecting success of 9129.11 'eucJP should match UTF-8 in svn': 
+		(
+			cd $H &&
+			compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+		)
+	
+ok 11 - eucJP should match UTF-8 in svn
+
+expecting success of 9129.12 'ISO-2022-JP should match UTF-8 in svn': 
+		(
+			cd $H &&
+			compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+		)
+	
+ok 12 - ISO-2022-JP should match UTF-8 in svn
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9116-git-svn-log.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9116-git-svn-log/.git/
 expecting success of 9116.1 'setup repository and import': 
@@ -518227,21 +518397,21 @@
 Committing transaction...
 Committed revision 1.
 	A	README
-r1 = 8fdb2494b2241ba892e2873af9585090ca1f60dc (refs/remotes/origin/trunk)
+r1 = 70bd1841fab1f834be1691359d8c5b8e8d2452a4 (refs/remotes/origin/b)
 	A	README
-r1 = 423b0e6006fcbd451cd209547e4669cbc5569501 (refs/remotes/origin/tags/0.2)
+r1 = 86106d499a3ad1d432030256727ce2ecaf2cbea4 (refs/remotes/origin/tags/0.1)
 	A	README
-r1 = a3cf25e45ea4c16f75207474fd176587fa587b8a (refs/remotes/origin/b)
+r1 = edfe59a98f7df612351091fc06c8539f172da18e (refs/remotes/origin/trunk)
 	A	README
-r1 = 6f86ce68881e8a0e310f99ce8aa7a02e85b5cffb (refs/remotes/origin/a)
+r1 = fdf14d8dc392b131acf1111934072e7f7921de80 (refs/remotes/origin/a)
 	A	README
-r1 = 799953691194cf41f74779bacc59424dc996fb17 (refs/remotes/origin/tags/0.1)
+r1 = ee87b38fe4abe5b485d9110dbb43cf27e038b8f5 (refs/remotes/origin/tags/0.2)
 	A	README
-r1 = 945be3b555e301b0b9b166da5deabe7096445b57 (refs/remotes/origin/tags/0.3)
+r1 = 77c97314a084fe42b868ab248ce59916e866c6dd (refs/remotes/origin/tags/0.3)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk r1
-HEAD is now at 8fdb249 test
-[master fe673a8] bye
+HEAD is now at edfe59a test
+[master 62bf14d] bye
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -518249,11 +518419,11 @@
 	M	README
 Committed r2
 	M	README
-r2 = dbb117df882a66a7e474d588839960a65d492901 (refs/remotes/origin/trunk)
-No changes between fe673a83520b84772b7d2bc673ab25d50370233c and refs/remotes/origin/trunk
+r2 = 924bd054fc2818c74b12f947a3ccfdfac864d1ad (refs/remotes/origin/trunk)
+No changes between 62bf14d0be326d7eeb9429f4913564d8cd75d4aa and refs/remotes/origin/trunk
 Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at 6f86ce6 test
-[master 1d04e12] feedme
+HEAD is now at fdf14d8 test
+[master 10b0c8f] feedme
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 FEEDME
@@ -518262,11 +518432,11 @@
 	A	FEEDME
 Committed r3
 	A	FEEDME
-r3 = 3f1922a9f795b84b86ce41356eb8c59ae5de6def (refs/remotes/origin/a)
-No changes between 1d04e1296de6a84c741c0ab36ce7167357cfe8f3 and refs/remotes/origin/a
+r3 = 3a387c7b85f56cda585ed7f1ff9c5fbce8dd9415 (refs/remotes/origin/a)
+No changes between 10b0c8fcba6cfb0b51ca6be9f7ede8fcca334cd4 and refs/remotes/origin/a
 Resetting to the latest refs/remotes/origin/a
-HEAD is now at dbb117d bye
-[master 95a9bf2] aye
+HEAD is now at 924bd05 bye
+[master d72531f] aye
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -518274,14 +518444,14 @@
 	M	README
 Committed r4
 	M	README
-r4 = 779d9e3b6bebcd202b0b03ae10b4f443c8850bfe (refs/remotes/origin/trunk)
-No changes between 95a9bf26d07621c290b8cf0d826342d91bacdeb1 and refs/remotes/origin/trunk
+r4 = b29de3a7e51d98155fbb0dfcca37d39a29990682 (refs/remotes/origin/trunk)
+No changes between d72531ff9c089d3d9b70d2a4e32f9b2022e969be and refs/remotes/origin/trunk
 Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at a3cf25e test
-[master c79be32] spy
+HEAD is now at 70bd184 test
+[master 52c85a6] spy
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 25ecc5d] try
+[master f0027ab] try
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -518289,12 +518459,12 @@
 	M	README
 Committed r5
 	M	README
-r5 = b185a49bc6179ef2bd4be1aa7a06971bde98fbc6 (refs/remotes/origin/b)
+r5 = 148f31a86722260b00f5755b2b5ae96c060c41d5 (refs/remotes/origin/b)
 	M	README
 Committed r6
 	M	README
-r6 = 61793aa6c7bf4fb69c22a09b5d70fe5083d66043 (refs/remotes/origin/b)
-No changes between 25ecc5d86c0a6a2093615ac76a078e65bf7d33d4 and refs/remotes/origin/b
+r6 = d6fe8d1ae8d506ee8cd208025570f19bc9195bad (refs/remotes/origin/b)
+No changes between f0027ab1d1c52fe98318c060505c6a0916d20470 and refs/remotes/origin/b
 Resetting to the latest refs/remotes/origin/b
 ok 1 - setup repository and import
 
@@ -518307,10 +518477,10 @@
 	git svn log -r3 >out &&
 	grep ^r3 out
 	
-HEAD is now at 3f1922a feedme
-r2 | pbuilder1 | 2026-03-04 08:03:46 +0000 (Wed, 04 Mar 2026) | 2 lines
-r4 | pbuilder1 | 2026-03-04 08:03:50 +0000 (Wed, 04 Mar 2026) | 2 lines
-r3 | pbuilder1 | 2026-03-04 08:03:48 +0000 (Wed, 04 Mar 2026) | 2 lines
+HEAD is now at 3a387c7 feedme
+r2 | pbuilder2 | 2025-01-30 02:18:16 +0000 (Thu, 30 Jan 2025) | 2 lines
+r4 | pbuilder2 | 2025-01-30 02:18:22 +0000 (Thu, 30 Jan 2025) | 2 lines
+r3 | pbuilder2 | 2025-01-30 02:18:19 +0000 (Thu, 30 Jan 2025) | 2 lines
 ok 2 - run log
 
 expecting success of 9116.3 'run log against a from trunk': 
@@ -518318,22 +518488,22 @@
 	git svn log -r3 origin/a >out &&
 	grep ^r3 out
 	
-HEAD is now at 779d9e3 aye
-r3 | pbuilder1 | 2026-03-04 08:03:48 +0000 (Wed, 04 Mar 2026) | 2 lines
+HEAD is now at b29de3a aye
+r3 | pbuilder2 | 2025-01-30 02:18:19 +0000 (Thu, 30 Jan 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 779d9e3 aye
+HEAD is now at b29de3a 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 779d9e3 aye
+HEAD is now at b29de3a aye
 ok 5 - test ascending revision range with --show-commit
 
 expecting success of 9116.6 'test ascending revision range with --show-commit (sha1)': 
@@ -518345,280 +518515,88 @@
 	git rev-parse $(cat out) >actual &&
 	test_cmp expected-range-r1-r2-r4-sha1 actual
 	
-HEAD is now at 779d9e3 aye
+HEAD is now at b29de3a 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 779d9e3 aye
+HEAD is now at b29de3a 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 779d9e3 aye
+HEAD is now at b29de3a 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 779d9e3 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 779d9e3 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 779d9e3 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 779d9e3 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 779d9e3 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 779d9e3 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 779d9e3 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 779d9e3 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 779d9e3 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9129-git-svn-i18n-commitencoding.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9129-git-svn-i18n-commitencoding/.git/
-expecting success of 9129.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.
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO8859-1/.git/
-r1 = 6e8f7d5efb3f614f4164c37ba58042a3876b8827 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 r1
-ok 1 - ISO8859-1 setup
-
-expecting success of 9129.2 'eucJP setup': 
-		mkdir $H &&
-		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
-		git svn clone "$svnrepo"/$H $H
-	
-Committing transaction...
-Committed revision 2.
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9129-git-svn-i18n-commitencoding/eucJP/.git/
-r2 = df5ddc572934d8752efe3c0e1b52c9f220cfa6f2 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP r2
-ok 2 - eucJP setup
-
-expecting success of 9129.3 'ISO-2022-JP setup': 
-		mkdir $H &&
-		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
-		git svn clone "$svnrepo"/$H $H
-	
-Committing transaction...
-Committed revision 3.
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO-2022-JP/.git/
-r3 = f7e7b92e63d0aec7dc6f171a03cbdb6aab16d224 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP r3
-ok 3 - ISO-2022-JP setup
-
-expecting success of 9129.4 'ISO8859-1 commit on git side': 
-	(
-		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" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
-	
-Switched to a new branch 't'
-[t db3c867] ÄËÑÏÖ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F
-ok 4 - ISO8859-1 commit on git side
-
-expecting success of 9129.5 'eucJP commit on git side': 
-	(
-		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" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
-	
-Switched to a new branch 't'
-[t 4d2d9e8] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F
-ok 5 - eucJP commit on git side
-
-expecting success of 9129.6 'ISO-2022-JP commit on git side': 
-	(
-		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" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
+	git reset --hard origin/trunk &&
+	git svn log -r 3:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2-r1 -
 	
-Switched to a new branch 't'
-[t 551becb] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F
-ok 6 - ISO-2022-JP commit on git side
+HEAD is now at b29de3a aye
+ok 9 - test descending revision range with unreachable revision
 
-expecting success of 9129.7 'ISO8859-1 dcommit to svn': 
-	(
-		cd $H &&
-		git svn dcommit &&
-		git cat-file commit HEAD | grep git-svn-id: &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
+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 -
 	
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 ...
-	A	F
-Committed r4
-	A	F
-r4 = fa6fbd388d5e540bec2996bbedb816d2f72733e3 (refs/remotes/git-svn)
-No changes between db3c867cdee16f07a0d670f175906d2007f676f7 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 6ce995fd-74fd-4e4a-be49-53ff9decfac3
-ok 7 - ISO8859-1 dcommit to svn
+HEAD is now at b29de3a aye
+ok 10 - test ascending revision range with unreachable upper boundary revision and 1 commit
 
-expecting success of 9129.8 'eucJP dcommit to svn': 
-	(
-		cd $H &&
-		git svn dcommit &&
-		git cat-file commit HEAD | grep git-svn-id: &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
+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 -
 	
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP ...
-	A	F
-Committed r5
-	A	F
-r5 = b4cb662e9ab23e7a7c098cd39a4de38943fbf099 (refs/remotes/git-svn)
-No changes between 4d2d9e8697889c818eaf1b4fb9d1f278b5a839fa and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 6ce995fd-74fd-4e4a-be49-53ff9decfac3
-ok 8 - eucJP dcommit to svn
+HEAD is now at b29de3a aye
+ok 11 - test descending revision range with unreachable upper boundary revision and 1 commit
 
-expecting success of 9129.9 'ISO-2022-JP dcommit to svn': 
-	(
-		cd $H &&
-		git svn dcommit &&
-		git cat-file commit HEAD | grep git-svn-id: &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
+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 -
 	
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP ...
-	A	F
-Committed r6
-	A	F
-r6 = 911d7d9b8a7233bfcb0294a91b5e2575665512ce (refs/remotes/git-svn)
-No changes between 551becb4be385899c6bea28879afd33cbb7a47fe and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 6ce995fd-74fd-4e4a-be49-53ff9decfac3
-ok 9 - ISO-2022-JP dcommit to svn
+HEAD is now at b29de3a aye
+ok 12 - test ascending revision range with unreachable lower boundary revision and 1 commit
 
-expecting success of 9129.10 'ISO-8859-1 should match UTF-8 in svn': 
-	(
-		cd ISO8859-1 &&
-		compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
-	)
+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 b29de3a aye
+ok 13 - test descending revision range with unreachable lower boundary revision and 1 commit
 
-ok 10 - ISO-8859-1 should match UTF-8 in svn
+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 b29de3a aye
+ok 14 - test ascending revision range with unreachable boundary revisions and no commits
 
-expecting success of 9129.11 'eucJP should match UTF-8 in svn': 
-		(
-			cd $H &&
-			compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-		)
+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 -
 	
-ok 11 - eucJP should match UTF-8 in svn
+HEAD is now at b29de3a aye
+ok 15 - test descending revision range with unreachable boundary revisions and no commits
 
-expecting success of 9129.12 'ISO-2022-JP should match UTF-8 in svn': 
-		(
-			cd $H &&
-			compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-		)
+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 -
 	
-ok 12 - ISO-2022-JP should match UTF-8 in svn
+HEAD is now at b29de3a aye
+ok 16 - test ascending revision range with unreachable boundary revisions and 1 commit
 
-# passed all 12 test(s)
-1..12
+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 b29de3a 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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9135-git-svn-moved-branch-empty-file.sh ***
@@ -518794,9 +518772,9 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9130-git-svn-authors-file/x/.git/
 W: +empty_dir: aa
-r1 = 634d6b3175f4224c1d9caa0b7d8a204d2f21b1ef (refs/remotes/git-svn)
+r1 = 623599ddc22fd6e4aa5001a88a07ebe8551b500a (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = e29a3ea72ce01e95aca49f7c06efde431ff8b27e (refs/remotes/git-svn)
+r2 = 83b22c5b9669359d7370ade1b0d185d698497e42 (refs/remotes/git-svn)
 W: +empty_dir: cc
 Author: cc not defined in svn-authors file
 
@@ -518813,8 +518791,8 @@
 		grep "^author AAAAAAA AAAAAAA <aa@example\.com> " actual
 	)
 	
-author BBBBBBB BBBBBBB <bb@example.com> 1772611438 +0000
-author AAAAAAA AAAAAAA <aa@example.com> 1772611438 +0000
+author BBBBBBB BBBBBBB <bb@example.com> 1738203513 +0000
+author AAAAAAA AAAAAAA <aa@example.com> 1738203513 +0000
 ok 3 - imported 2 revisions successfully
 
 expecting success of 9130.4 'continues to import once authors have been added': 
@@ -518830,17 +518808,17 @@
 	)
 	
 W: +empty_dir: cc
-r3 = 5b95cbb744ed111f398105a1802315f056f01526 (refs/remotes/git-svn)
+r3 = 54b099aeff8c273f113bdd491d65bec676773601 (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = a1c66f0a8875863422457c942c99df9ddc23e832 (refs/remotes/git-svn)
+r4 = e5f3248df5c8a50da469530aeedad9677df46353 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/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> 1772611439 +0000
-author CCCCCCC CCCCCCC <cc@example.com> 1772611439 +0000
+author DDDDDDD DDDDDDD <dd@example.com> 1738203514 +0000
+author CCCCCCC CCCCCCC <cc@example.com> 1738203513 +0000
 ok 4 - continues to import once authors have been added
 
 expecting success of 9130.5 'authors-file against globs': 
@@ -518857,7 +518835,7 @@
 Committed revision 5.
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9130-git-svn-authors-file/aa-work/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9130-git-svn-authors-file/svnrepo
-r5 = d2033f2477e320b480189a1b626800d60088b2c9 (refs/remotes/origin/trunk)
+r5 = e8e936cd28afdf17f1ef9cbb04fde2d4b6e2b148 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa/trunk r5
 Committing transaction...
@@ -518871,7 +518849,7 @@
 expecting success of 9130.6 'fetch fails on ee': 
 	( cd aa-work && test_must_fail git svn fetch --authors-file=../svn-authors )
 	
-r6 = aba20b1e36c0d8c553fe6d710ffad8d476f4da79 (refs/remotes/origin/bb)
+r6 = 5d74c94f171d786e85682b7a490ae2b5034d0d60 (refs/remotes/origin/bb)
 Author: ee not defined in ../svn-authors file
 
 ok 6 - fetch fails on ee
@@ -518893,8 +518871,8 @@
 		test 8 -eq "$(tmp_config_get svn-remote.svn.tags-maxRev)"
 	)
 	
-r7 = 40db9f5124e742e4660d8323f28535c502cbb8a7 (refs/remotes/origin/ee)
-r8 = b346a22fcf4f699e6b22f84f905ca151af1a89ae (refs/remotes/origin/cc)
+r7 = 338e758403b71b1b913b689b374ac83afe117522 (refs/remotes/origin/ee)
+r8 = 31eaacd46e84e9ef5a9eb90454df8d5d20d7ce9b (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': 
@@ -518917,23 +518895,23 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9130-git-svn-authors-file/gitconfig.clone/.git/
 W: +empty_dir: aa
-r1 = 634d6b3175f4224c1d9caa0b7d8a204d2f21b1ef (refs/remotes/git-svn)
+r1 = 623599ddc22fd6e4aa5001a88a07ebe8551b500a (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = e29a3ea72ce01e95aca49f7c06efde431ff8b27e (refs/remotes/git-svn)
+r2 = 83b22c5b9669359d7370ade1b0d185d698497e42 (refs/remotes/git-svn)
 W: +empty_dir: cc
-r3 = 5b95cbb744ed111f398105a1802315f056f01526 (refs/remotes/git-svn)
+r3 = 54b099aeff8c273f113bdd491d65bec676773601 (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = a1c66f0a8875863422457c942c99df9ddc23e832 (refs/remotes/git-svn)
+r4 = e5f3248df5c8a50da469530aeedad9677df46353 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches
 W: +empty_dir: aa/tags
 W: +empty_dir: aa/trunk
-r5 = fac0cbd92fea5b1da5da19d5b3dbbefcc0787054 (refs/remotes/git-svn)
+r5 = a1a86287ebf9fbaabda0e20e87257368ff665e10 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/bb
-r6 = 17e4ae5170f70513625208874df2063e10537dcd (refs/remotes/git-svn)
+r6 = 9f06fc75eff66784189a1bd82c60a8a3012b67e9 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/ee
-r7 = d5089d95b65fdcab99bc554b6ad34a791a9e3416 (refs/remotes/git-svn)
+r7 = c1af407a7ba74150200e5df443c4e58f41d278f1 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/cc
-r8 = 6c60e0b375307328b9fd9f70a8149e5f744283d3 (refs/remotes/git-svn)
+r8 = ecf42edeb3d6a96496ae3a850e75fea179cca090 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9130-git-svn-authors-file/svnrepo r8
 creating empty directory: aa
@@ -518959,8 +518937,8 @@
 	
 Committing transaction...
 Committed revision 9.
-r9 = 4248a4742e4e358776905d05fa25e6565caefa9c (refs/remotes/origin/ff)
-author FFFFFFF FFFFFFF <> 1772611453 +0000
+r9 = 208451f1975cb322f831cb5ece5fb75e5e1ccb4d (refs/remotes/origin/ff)
+author FFFFFFF FFFFFFF <> 1738203533 +0000
 ok 10 - authors-file imported user without email
 
 # passed all 10 test(s)
@@ -518983,7 +518961,7 @@
 Committing transaction...
 Committed revision 1.
 	A	file
-r1 = 63e26b1846ed10ba858ef3e56d648f1f52e2a729 (refs/remotes/git-svn)
+r1 = afb0b9ace2b870d44e601753ac49951f62203cab (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo r1
 ok 1 - initialize repo
@@ -519016,11 +518994,11 @@
 	echo bye >> life &&
 	git commit -m bye-life life
 	
-[master 01a9674] hi-life
+[master 43cb687] hi-life
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 life
-[master 97dca2e] bye-life
+[master 0018745] bye-life
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 3 - some unrelated changes to git
@@ -519041,7 +519019,7 @@
 		test x"$(sed -n -e 58p < file)" = x5588 &&
 		test x"$(sed -n -e 61p < file)" = x6611
 	
-[master a98b2b2] 4 => 4444, 7 => 7777
+[master b65155f] 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"
@@ -519049,24 +519027,24 @@
 	A	life
 Committed r3
 	M	file
-r2 = a01b4bd7ba73293ba28017f7d2493675685ebea9 (refs/remotes/git-svn)
+r2 = 4b16bb6692d6e83c2635110be97c85ea28f5eb87 (refs/remotes/git-svn)
 	A	life
-r3 = 4932184e5fbac42bb28060ccca8d3fd5725a574b (refs/remotes/git-svn)
-W: 01a967465575d0d24fecfbe5c4d41416c2d35cf9 and refs/remotes/git-svn differ, using rebase:
+r3 = 8eaf5d609375a5743d6902e12b93f85cb6488bdb (refs/remotes/git-svn)
+W: 43cb687ea831f5bf7eac2641aea3fe5f4eca573d and refs/remotes/git-svn differ, using rebase:
 :100644 100644 55200b3d5d7c0e515eaccaf8465a295017e88249 15dcf092297e5fcea41cadcc3eb0a689aaa3e65e M	file
-warning: skipped previously applied commit 01a9674
+warning: skipped previously applied commit 43cb687
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config advice.skippedCherryPicks false"
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
 	M	life
 Committed r4
 	M	life
-r4 = d8f35d05e18a20170f9aa4e8b318578d14ed72f9 (refs/remotes/git-svn)
+r4 = d21620e5d7961007c33a482a6766d410cc42deaf (refs/remotes/git-svn)
 	M	file
 Committed r5
 	M	file
-r5 = 53a280fc2791be52cb1a24625b90194ba6a72d73 (refs/remotes/git-svn)
-No changes between 3c91b12091d47deb31e0398fc8bad55b45ca0484 and refs/remotes/git-svn
+r5 = 26713cc88544e942359ccd82fcd36fba30e8f784 (refs/remotes/git-svn)
+No changes between b5f5b95e6c920b2ef1ecec5ca2184c4092d5c5f0 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating 'tmp':
 U    tmp/file
@@ -519122,7 +519100,7 @@
 	( cd g && git rev-parse --symbolic --verify HEAD )
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9142-git-svn-shallow-clone/g/.git/
-r1 = fde7974899e238c0be1f58cdbb001e0ba6247b8d (refs/remotes/git-svn)
+r1 = 7a29c2bdcbf0c8ee1c4989088414c018f9bbfa7f (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9142-git-svn-shallow-clone/svnrepo/trunk r1
 HEAD
@@ -519167,17 +519145,17 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9138-git-svn-authors-prog/x/.git/
 W: +empty_dir: aa
-r1 = 67d555c2e98794702d60e53968c22a793dfeeb83 (refs/remotes/git-svn)
+r1 = cc7504782278a114c5e09f09b9167f71d6cef72c (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = 1cbdf33be2d7b38b7c24723a4f1571e9c39a70f9 (refs/remotes/git-svn)
+r2 = 1355687cdd9454f23f4856deea405a39823a055f (refs/remotes/git-svn)
 W: +empty_dir: cc-sub
-r3 = 05c02fe7c0c355c026dccecd8a93b3f4c7f15243 (refs/remotes/git-svn)
+r3 = f2fab3133a7b85239c28ce1ed58035aa2feb51a4 (refs/remotes/git-svn)
 W: +empty_dir: dd-sub
-r4 = 45eac1ee79146f5c6478b98b179cc120f47380db (refs/remotes/git-svn)
+r4 = f9b4178781976362c88fd314229807ee2f3dbad2 (refs/remotes/git-svn)
 W: +empty_dir: ee-foo
-r5 = 922dbc8dca75dbecae24d825b6003d03c46b8dcf (refs/remotes/git-svn)
+r5 = f39a9c4a45f4ed17bfae937bfdbc624bdea9656f (refs/remotes/git-svn)
 W: +empty_dir: ff
-r6 = dd6e96543ff12b3c5386b566d89cbe1917419b61 (refs/remotes/git-svn)
+r6 = 6f6b08507872c6866f78937dddfe26ed194691f5 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9138-git-svn-authors-prog/svnrepo r6
 creating empty directory: aa
@@ -519212,11 +519190,11 @@
 		grep "^author aa <aa@example\.com> " actual
 	)
 
-author ee-foo <ee-foo@example.com> 1772611450 +0000
-author dd <dd@sub.example.com> 1772611450 +0000
-author cc <cc@sub.example.com> 1772611450 +0000
-author bb <bb@example.com> 1772611450 +0000
-author aa <aa@example.com> 1772611450 +0000
+author ee-foo <ee-foo@example.com> 1738203530 +0000
+author dd <dd@sub.example.com> 1738203530 +0000
+author cc <cc@sub.example.com> 1738203530 +0000
+author bb <bb@example.com> 1738203530 +0000
+author aa <aa@example.com> 1738203530 +0000
 ok 5 - authors-prog ran correctly
 
 expecting success of 9138.6 'authors-file overrode authors-prog': 
@@ -519226,7 +519204,7 @@
 		grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " actual
 	)
 
-author FFFFFFF FFFFFFF <fFf@other.example.com> 1772611450 +0000
+author FFFFFFF FFFFFFF <fFf@other.example.com> 1738203530 +0000
 ok 6 - authors-file overrode authors-prog
 
 expecting success of 9138.7 'authors-prog imported user without email': 
@@ -519241,8 +519219,8 @@
 Committing transaction...
 Committed revision 7.
 W: +empty_dir: gg
-r7 = fa7d365569a9156276e605c10a9eb81337ed7269 (refs/remotes/git-svn)
-author gg <> 1772611453 +0000
+r7 = da852e53cadfe5ed68c6f43ca56d0e6408dde93c (refs/remotes/git-svn)
+author gg <> 1738203534 +0000
 ok 7 - authors-prog imported user without email
 
 expecting success of 9138.8 'imported without authors-prog and authors-file': 
@@ -519259,8 +519237,8 @@
 Committing transaction...
 Committed revision 8.
 W: +empty_dir: hh
-r8 = 48c6c8adcfe495a90986062c1c2c778f0d00cf87 (refs/remotes/git-svn)
-author hh <hh@ee8b9faa-f330-4406-ad95-a5e443de7c9a> 1772611455 +0000
+r8 = c2555663ecc7bfce147d43e3e2be9cd3f9b97b0d (refs/remotes/git-svn)
+author hh <hh@38b15b31-0b0a-45ff-83a4-43e371096657> 1738203536 +0000
 ok 8 - imported without authors-prog and authors-file
 
 expecting success of 9138.9 'authors-prog handled special characters in username': 
@@ -519276,14 +519254,241 @@
 Committing transaction...
 Committed revision 9.
 W: +empty_dir: bad
-r9 = aacc0bc712b788802a6e65da30215a2b23cfc16d (refs/remotes/git-svn)
-author xyz; touch evil <xyz; touch evil@example.com> 1772611456 +0000
+r9 = 49b66b9096c71722fdf2e04f705fdd94e1dc677f (refs/remotes/git-svn)
+author xyz; touch evil <xyz; touch evil@example.com> 1738203538 +0000
 ok 9 - authors-prog handled special characters in username
 
 # passed all 9 test(s)
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9134-git-svn-ignore-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9134-git-svn-ignore-paths/.git/
+expecting success of 9134.1 'setup test repository': 
+	svn_cmd co "$svnrepo" s &&
+	(
+		cd s &&
+		mkdir qqq www &&
+		echo test_qqq > qqq/test_qqq.txt &&
+		echo test_www > www/test_www.txt &&
+		svn_cmd add qqq &&
+		svn_cmd add www &&
+		svn_cmd commit -m "create some files" &&
+		svn_cmd up &&
+		echo hi >> www/test_www.txt &&
+		svn_cmd commit -m "modify www/test_www.txt" &&
+		svn_cmd up
+	)
+
+Checked out revision 0.
+A         qqq
+A         qqq/test_qqq.txt
+A         www
+A         www/test_www.txt
+Adding         qqq
+Adding         qqq/test_qqq.txt
+Adding         www
+Adding         www/test_www.txt
+Transmitting file data ..done
+Committing transaction...
+Committed revision 1.
+Updating '.':
+At revision 1.
+Sending        www/test_www.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+Updating '.':
+At revision 2.
+ok 1 - setup test repository
+
+expecting success of 9134.2 'clone an SVN repository with ignored www directory': 
+	git svn clone --ignore-paths="^www" "$svnrepo" g &&
+	echo test_qqq > expect &&
+	for i in g/*/*.txt; do cat $i >> expect2 || return 1; done &&
+	test_cmp expect expect2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9134-git-svn-ignore-paths/g/.git/
+	A	qqq/test_qqq.txt
+r1 = dc0b5ab769fdbe6790936f3001a960ce28f3e7a1 (refs/remotes/git-svn)
+r2 = 43980be834fe46ea57ec163ea1cddbae5396aa8d (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t9134-git-svn-ignore-paths/c/.git/
+	A	qqq/test_qqq.txt
+r1 = dc0b5ab769fdbe6790936f3001a960ce28f3e7a1 (refs/remotes/git-svn)
+r2 = 43980be834fe46ea57ec163ea1cddbae5396aa8d (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
+ok 3 - init+fetch an SVN repository with ignored www directory
+
+expecting success of 9134.4 'verify ignore-paths config saved by clone': 
+	(
+	    cd g &&
+	    git config --get svn-remote.svn.ignore-paths | grep www
+	)
+
+^www
+ok 4 - verify ignore-paths config saved by clone
+
+expecting success of 9134.5 'SVN-side change outside of www': 
+	(
+		cd s &&
+		echo b >> qqq/test_qqq.txt &&
+		svn_cmd commit -m "SVN-side change outside of www" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep "SVN-side change outside of www"
+	)
+
+Sending        qqq/test_qqq.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Updating '.':
+At revision 3.
+SVN-side change outside of www
+ok 5 - SVN-side change outside of www
+
+expecting success of 9134.6 'update git svn-cloned repo (config ignore)': 
+	(
+		cd g &&
+		git svn rebase &&
+		printf "test_qqq\nb\n" > expect &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
+		test_cmp expect2 expect &&
+		rm expect expect2
+	)
+
+	M	qqq/test_qqq.txt
+r3 = 7b1816ec3af48cb5b87f7c3ad46d3d3e894c3af8 (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 = 7b1816ec3af48cb5b87f7c3ad46d3d3e894c3af8 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 7 - update git svn-cloned repo (option ignore)
+
+expecting success of 9134.8 'SVN-side change inside of ignored www': 
+	(
+		cd s &&
+		echo zaq >> www/test_www.txt &&
+		svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep -F "SVN-side change inside of www/test_www.txt"
+	)
+
+Sending        www/test_www.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 4.
+Updating '.':
+At revision 4.
+SVN-side change inside of www/test_www.txt
+ok 8 - SVN-side change inside of ignored www
+
+expecting success of 9134.9 'update git svn-cloned repo (config ignore)': 
+	(
+		cd g &&
+		git svn rebase &&
+		printf "test_qqq\nb\n" > expect &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
+		test_cmp expect2 expect &&
+		rm expect expect2
+	)
+
+r4 = ebe998c9e98f2b57f7f67f14496cc03ba0f5c48c (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 = ebe998c9e98f2b57f7f67f14496cc03ba0f5c48c (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 = ed0a9a9c01138e8a9a69ef3acd0cffa65031c341 (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 = ed0a9a9c01138e8a9a69ef3acd0cffa65031c341 (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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9100-git-svn-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9100-git-svn-basic/.git/
 expecting success of 9100.1 'git svn --version works anywhere': 
@@ -519559,7 +519764,7 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 4be3a625b43fa27931bd5aa64e966043eb05dbc7 (refs/remotes/git-svn)
+r1 = d208bf9c5c62344bc18e91c8a74687283d72f80d (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9100-git-svn-basic/svnrepo r1
 ok 4 - import an SVN revision into git
@@ -519591,7 +519796,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a
 Switched to a new branch 'mybranch'
-[mybranch 7785a61] try a deep --rmdir with a commit
+[mybranch 1401fc0] 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%)
@@ -519608,7 +519813,7 @@
 	A	dir/file
 	A	file
 W: -empty_dir: dir/a
-r2 = ce0e5ed0de4e55763bf8439101e83a9b599cfe31 (refs/remotes/git-svn)
+r2 = cfa145a77a91d34560d55a34642f1cdfc69c6609 (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
@@ -519627,7 +519832,7 @@
 	test_must_fail git svn set-tree --find-copies-harder --rmdir \
 		remotes/git-svn..mybranch
 
-[mybranch dbde8da] detect node change from file to directory #1
+[mybranch 85bb07d] 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%)
@@ -519647,7 +519852,7 @@
 		remotes/git-svn..mybranch2
 
 Switched to a new branch 'mybranch2'
-[mybranch2 42d14b0] detect node change from directory to file #1
+[mybranch2 45881d9] 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%)
@@ -519671,7 +519876,7 @@
 	test -e "$SVN_TREE"/bar/zzz/yyy
 
 Switched to a new branch 'mybranch3'
-[mybranch3 57031b9] detect node change from file to directory #2
+[mybranch3 6f18449] 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
@@ -519680,7 +519885,7 @@
 	A	bar/zzz/yyy
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 2bbcf5e34c75b576ff739c0c7afd7c80638ec4cf (refs/remotes/git-svn)
+r3 = 1ad3d888693942ab8b2c5161b21ffe45406e2d32 (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
@@ -519702,13 +519907,13 @@
 		remotes/git-svn..mybranch4
 
 Switched to a new branch 'mybranch4'
-[mybranch4 afd4d8e] detect node change from directory to file #2
+[mybranch4 9937cc2] 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 '48d81e0f-d317-46ee-801c-4814ebc11949', transaction '3-5', path '/dir' at /build/reproducible-path/git-2.47.2/perl/build/lib/Git/SVN.pm line 2079.
+Item already exists in filesystem: File already exists: filesystem '9c76beb4-5947-4a62-99b2-e837441e9785', transaction '3-5', path '/dir' at /build/reproducible-path/git-2.47.2/perl/build/lib/Git/SVN.pm line 2079.
 
 ok 10 - detect node change from directory to file #2
 
@@ -519723,13 +519928,13 @@
 	svn_cmd up "$SVN_TREE" &&
 	test ! -x "$SVN_TREE"/exec.sh
 Switched to a new branch 'mybranch5'
-[mybranch5 84dce76] remove executable bit from a file
+[mybranch5 e5703bb] 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 = ab0572b2694f9c3f4c7ef0c1534f5b60789256ae (refs/remotes/git-svn)
+r4 = 1a3161c7baa72c38507116ccf957c24b84c1a89e (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
@@ -519744,13 +519949,13 @@
 		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/exec.sh
-[mybranch5 0a3ac7e] add executable bit back file
+[mybranch5 4b2776b] 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 = 1ba1967a6f5c29014d6fd5529c215946eef457db (refs/remotes/git-svn)
+r5 = 6b0a194051b8a309cd90ee0c5253a53e4d24363f (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
@@ -519776,7 +519981,7 @@
 		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -h "$SVN_TREE"/exec.sh
-[mybranch5 bbba6eb] executable file becomes a symlink to file
+[mybranch5 6499bc8] 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
@@ -519785,7 +519990,7 @@
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 9cd8817711b49b528f85b9464bba0e3fce75bc24 (refs/remotes/git-svn)
+r6 = 217560402dd45264c045160e839d7d2debb1c1e8 (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
@@ -519803,7 +520008,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/file &&
 	test -h "$SVN_TREE"/exec-2.sh
-[mybranch5 ee5a713] new symlink is added to a file that was also just made executable
+[mybranch5 5ec1f21] 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
@@ -519812,7 +520017,7 @@
 	M	file
 	A	exec-2.sh
 	M	file
-r7 = 1ddf53d44fab5258c32e853b231c1dbe08c28e89 (refs/remotes/git-svn)
+r7 = 73e36e7c5507de5d20c1bdc720481a9e348df9af (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
@@ -519832,7 +520037,7 @@
 	test -f "$SVN_TREE"/exec-2.sh &&
 	test ! -h "$SVN_TREE"/exec-2.sh &&
 	test_cmp help "$SVN_TREE"/exec-2.sh
-[mybranch5 7385e38] modify a symlink to become a file
+[mybranch5 b20c7b3] 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
@@ -519841,7 +520046,7 @@
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 2f4742cda2ec826299b6ab1e2b8e8a0d7a859a82 (refs/remotes/git-svn)
+r8 = 87c43a6b5664a4435399baff0694dcdfa4657e1c (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
@@ -519854,12 +520059,12 @@
 	git update-index exec-2.sh &&
 	git commit -m 'éï�' &&
 	git svn set-tree HEAD
-[mybranch5 1dddbe5] éï�
+[mybranch5 3d9b202] éï�
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	M	exec-2.sh
 	M	exec-2.sh
-r9 = 16b27c4c2d0a42e84bfca6a34f586b84e4d919ac (refs/remotes/git-svn)
+r9 = 19d0e47f98ff7733e26d8e212de194d81ddac083 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 ok 16 - commit with UTF-8 message: locale: C.utf8
 
@@ -519874,33 +520079,33 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 4be3a625b43fa27931bd5aa64e966043eb05dbc7 (refs/remotes/alt)
+r1 = d208bf9c5c62344bc18e91c8a74687283d72f80d (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 = 82a9d7df14f49f0a0bfeb81c06398e5a6b999025 (refs/remotes/alt)
+r2 = 4a2bb1a05c8e87993f32d40379ddc253f9a13725 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 938a3c628599b99a00d61957397bfb98d6e9a55c (refs/remotes/alt)
+r3 = 539a0ffc37e62df69ef6e7579f978d444ed62bb1 (refs/remotes/alt)
 	M	exec.sh
-r4 = 813c169387ceef19b3503375eca5d43417acabc8 (refs/remotes/alt)
+r4 = d5a4d30d3eb2ba1145b1e8c93ae5d1f2196fd240 (refs/remotes/alt)
 	M	exec.sh
-r5 = c300c5feaaacc48a60f3b90126c69971654e8e7e (refs/remotes/alt)
+r5 = 81f09adc72b225ec1f49de1fb80aeb1cc30d482e (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 34a2a99a20d527b9147a7d112aa33d2ff4c7a427 (refs/remotes/alt)
+r6 = 150ce21d2bcc832a8fc0f8822c79f0885f49c42f (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = b29f514a4ad1130b4a0688d94f1070b44ecf93ab (refs/remotes/alt)
+r7 = c57f52acc33655e4353fbbc383337e0df5e28ca8 (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 702e60a486da5e5e1bcd129d19a9d07ac226d484 (refs/remotes/alt)
+r8 = 8edf506a87e96ba0fd526093539155bbd134167e (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 398ccf42ec05a8b3122f175eb90b723a1614b956 (refs/remotes/alt)
+r9 = 7936cb1c589a8030416a473c7fa38126e00c71d8 (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': 
@@ -519967,16 +520172,16 @@
 	git branch -D my-bar
 	
 	A	zzz
-r1 = 81d41f4e4726d99d787849333eca6b86d7f71053 (refs/remotes/bar)
+r1 = bccb01c33c83007bb1dc94d24e59a801521a3694 (refs/remotes/bar)
 	D	zzz
 	A	zzz/yyy
-r3 = a0aede90c3202c400d4c1c75b183782e85cc244b (refs/remotes/bar)
+r3 = 18524e1997a84e2b28b210aaa75a99374900e467 (refs/remotes/bar)
 Switched to a new branch 'my-bar'
-[my-bar 5f26c3a] change 1
+[my-bar 170e491] change 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
-[my-bar 45d9a58] change 2
+[my-bar c794e1d] change 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -519984,14 +520189,14 @@
 	A	foo
 Committed r10
 	A	foo
-r10 = cf138940977d2935b1f8e5be4adc3278a5ed32ab (refs/remotes/bar)
-No changes between 5f26c3a256114e8601e48606062e5df04ce74539 and refs/remotes/bar
+r10 = 8f30cc46f0e625459c330fbc5d0cb358d3f21b4a (refs/remotes/bar)
+No changes between 170e491c5a4e7a6220b91b99fada571911a3f3e6 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: cf138940977d2935b1f8e5be4adc3278a5ed32ab
+The rewritten commit is: 8f30cc46f0e625459c330fbc5d0cb358d3f21b4a
     change 1
 Switched to branch 'main'
-Deleted branch my-bar (was 45d9a58).
+Deleted branch my-bar (was c794e1d).
 ok 22 - dcommit $rev does not clobber current branch
 
 expecting success of 9100.23 'able to dcommit to a subdirectory': 
@@ -520015,9 +520220,9 @@
 	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
 	A	bar/foo
-r10 = 1a157121cb95d0d25aa18021308ff44b1a52fe4d (refs/remotes/alt)
+r10 = 7d163d04828db6b50555033c5c3cc12e8a1f30c0 (refs/remotes/alt)
 Switched to a new branch 'my-bar'
-[my-bar ee3f386] /bar/d should be in the log
+[my-bar 90cab04] /bar/d should be in the log
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 d
@@ -520026,10 +520231,10 @@
 	A	d
 Committed r11
 	A	d
-r11 = 8d73704a72f77feb4b3c4443e7fab5d79428dc69 (refs/remotes/bar)
-No changes between ee3f3868f94bc1d188c8277fc452c7a7d501c5ec and refs/remotes/bar
+r11 = 98eaae7dcbc8041737989c4d35d6615e38c4c90d (refs/remotes/bar)
+No changes between 90cab0488bf0dd73aba0e26aef1e4aafda57c95e and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
-[my-bar e9bf867] add a new directory
+[my-bar fe204e3] add a new directory
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 newdir/dir
@@ -520038,10 +520243,10 @@
 	A	newdir/dir
 Committed r12
 	A	newdir/dir
-r12 = a51a10fce4e50121887bbced44908ee5f6146ba6 (refs/remotes/bar)
-No changes between e9bf8677676de811dad2d6d52d45d7347847e1a9 and refs/remotes/bar
+r12 = 0e0aa004a4b30e2ede49f1626b7a14415fd610aa (refs/remotes/bar)
+No changes between fe204e357658d6f1d23db06b0765df701f596b6c and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
-[my-bar a9b9a82] modify a file in new directory
+[my-bar ab4ef61] 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"
@@ -520049,8 +520254,8 @@
 	M	newdir/dir
 Committed r13
 	M	newdir/dir
-r13 = 0d951b90cfe491e4e20395415169b5585658b887 (refs/remotes/bar)
-No changes between a9b9a82e5407de17dbff745bada6ebb93e239712 and refs/remotes/bar
+r13 = 66de341871ec30a15c223285319ca533cc0197e1 (refs/remotes/bar)
+No changes between ab4ef61b6d7bd8ffd2935fa9d978146fa4f1a427 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 ok 23 - able to dcommit to a subdirectory
 
@@ -520059,7 +520264,7 @@
 	test-tool chmtime =-60 foo &&
 	git svn dcommit
 
-[my-bar 797bae2] commit-new-file-foo2
+[my-bar ed009db] commit-new-file-foo2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo2
@@ -520068,8 +520273,8 @@
 	A	foo2
 Committed r14
 	A	foo2
-r14 = 75ff1730e0854c78c13e47c48029162034f5491d (refs/remotes/bar)
-No changes between 797bae2cfc212c488e6a2e571e6025a6cfc70103 and refs/remotes/bar
+r14 = e6d87a2c9fe95c588e8b6abb59f2699ae16cc0d1 (refs/remotes/bar)
+No changes between ed009db587a9113132c1effc82d0c2d1aa830774 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 ok 24 - dcommit should not fail with a touched file
 
@@ -520087,12 +520292,12 @@
 	git svn set-tree -i bar HEAD &&
 	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
-[my-bar 4fe06d0] update /bar/d
+[my-bar 11b702d] update /bar/d
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 	M	d
 	M	d
-r15 = ab202972eb50e05336d883874549e42c7b0e99ed (refs/remotes/bar)
+r15 = 12c158a45c826e57190da6ce8cc4e2be3f9cb965 (refs/remotes/bar)
 Done committing 1 revisions to SVN
 ok 26 - able to set-tree to a subdirectory
 
@@ -520110,45 +520315,45 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 4be3a625b43fa27931bd5aa64e966043eb05dbc7 (refs/remotes/alt)
+r1 = d208bf9c5c62344bc18e91c8a74687283d72f80d (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 = 82a9d7df14f49f0a0bfeb81c06398e5a6b999025 (refs/remotes/alt)
+r2 = 4a2bb1a05c8e87993f32d40379ddc253f9a13725 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 938a3c628599b99a00d61957397bfb98d6e9a55c (refs/remotes/alt)
+r3 = 539a0ffc37e62df69ef6e7579f978d444ed62bb1 (refs/remotes/alt)
 	M	exec.sh
-r4 = 813c169387ceef19b3503375eca5d43417acabc8 (refs/remotes/alt)
+r4 = d5a4d30d3eb2ba1145b1e8c93ae5d1f2196fd240 (refs/remotes/alt)
 	M	exec.sh
-r5 = c300c5feaaacc48a60f3b90126c69971654e8e7e (refs/remotes/alt)
+r5 = 81f09adc72b225ec1f49de1fb80aeb1cc30d482e (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 34a2a99a20d527b9147a7d112aa33d2ff4c7a427 (refs/remotes/alt)
+r6 = 150ce21d2bcc832a8fc0f8822c79f0885f49c42f (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = b29f514a4ad1130b4a0688d94f1070b44ecf93ab (refs/remotes/alt)
+r7 = c57f52acc33655e4353fbbc383337e0df5e28ca8 (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 702e60a486da5e5e1bcd129d19a9d07ac226d484 (refs/remotes/alt)
+r8 = 8edf506a87e96ba0fd526093539155bbd134167e (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 398ccf42ec05a8b3122f175eb90b723a1614b956 (refs/remotes/alt)
+r9 = 7936cb1c589a8030416a473c7fa38126e00c71d8 (refs/remotes/alt)
 	A	bar/foo
-r10 = 1a157121cb95d0d25aa18021308ff44b1a52fe4d (refs/remotes/alt)
+r10 = 7d163d04828db6b50555033c5c3cc12e8a1f30c0 (refs/remotes/alt)
 	A	bar/d
-r11 = 317f90c42c5029786742ba1d98351297f4cfc50f (refs/remotes/alt)
+r11 = e84de7db4b5a3771422f23806b253545d4bc4eb0 (refs/remotes/alt)
 	A	bar/newdir/dir
-r12 = 30041e3dc73591b1c9d9fe18e12d6ebfa52320d4 (refs/remotes/alt)
+r12 = ec988f4f0b81d051bd31d8fd1a82001caf3d46fb (refs/remotes/alt)
 	M	bar/newdir/dir
-r13 = ac00f12b8d924e6988258ed1996de8eb35ddf112 (refs/remotes/alt)
+r13 = dab162f886d4da342c57f9d591334aa4fd8d4308 (refs/remotes/alt)
 	A	bar/foo2
-r14 = c5f31b3ff1fef4f8188e706d94b8f46a92ceb262 (refs/remotes/alt)
+r14 = 9f8247b3987aba3ccce01281ade8c978417f9eae (refs/remotes/alt)
 	M	bar/d
-r15 = c00f40e3b3c63bebc130ef7147dc9cda234b29bf (refs/remotes/alt)
+r15 = 23a46d5c716a98d5d4eab349f087e4e5c93435ad (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': 
@@ -520166,278 +520371,51 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 4be3a625b43fa27931bd5aa64e966043eb05dbc7 (refs/remotes/alt)
+r1 = d208bf9c5c62344bc18e91c8a74687283d72f80d (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 = 82a9d7df14f49f0a0bfeb81c06398e5a6b999025 (refs/remotes/alt)
+r2 = 4a2bb1a05c8e87993f32d40379ddc253f9a13725 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 938a3c628599b99a00d61957397bfb98d6e9a55c (refs/remotes/alt)
+r3 = 539a0ffc37e62df69ef6e7579f978d444ed62bb1 (refs/remotes/alt)
 	M	exec.sh
-r4 = 813c169387ceef19b3503375eca5d43417acabc8 (refs/remotes/alt)
+r4 = d5a4d30d3eb2ba1145b1e8c93ae5d1f2196fd240 (refs/remotes/alt)
 	M	exec.sh
-r5 = c300c5feaaacc48a60f3b90126c69971654e8e7e (refs/remotes/alt)
+r5 = 81f09adc72b225ec1f49de1fb80aeb1cc30d482e (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 34a2a99a20d527b9147a7d112aa33d2ff4c7a427 (refs/remotes/alt)
+r6 = 150ce21d2bcc832a8fc0f8822c79f0885f49c42f (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = b29f514a4ad1130b4a0688d94f1070b44ecf93ab (refs/remotes/alt)
+r7 = c57f52acc33655e4353fbbc383337e0df5e28ca8 (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 702e60a486da5e5e1bcd129d19a9d07ac226d484 (refs/remotes/alt)
+r8 = 8edf506a87e96ba0fd526093539155bbd134167e (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 398ccf42ec05a8b3122f175eb90b723a1614b956 (refs/remotes/alt)
+r9 = 7936cb1c589a8030416a473c7fa38126e00c71d8 (refs/remotes/alt)
 	A	bar/foo
-r10 = 1a157121cb95d0d25aa18021308ff44b1a52fe4d (refs/remotes/alt)
+r10 = 7d163d04828db6b50555033c5c3cc12e8a1f30c0 (refs/remotes/alt)
 	A	bar/d
-r11 = 317f90c42c5029786742ba1d98351297f4cfc50f (refs/remotes/alt)
+r11 = e84de7db4b5a3771422f23806b253545d4bc4eb0 (refs/remotes/alt)
 	A	bar/newdir/dir
-r12 = 30041e3dc73591b1c9d9fe18e12d6ebfa52320d4 (refs/remotes/alt)
+r12 = ec988f4f0b81d051bd31d8fd1a82001caf3d46fb (refs/remotes/alt)
 	M	bar/newdir/dir
-r13 = ac00f12b8d924e6988258ed1996de8eb35ddf112 (refs/remotes/alt)
+r13 = dab162f886d4da342c57f9d591334aa4fd8d4308 (refs/remotes/alt)
 	A	bar/foo2
-r14 = c5f31b3ff1fef4f8188e706d94b8f46a92ceb262 (refs/remotes/alt)
+r14 = 9f8247b3987aba3ccce01281ade8c978417f9eae (refs/remotes/alt)
 	M	bar/d
-r15 = c00f40e3b3c63bebc130ef7147dc9cda234b29bf (refs/remotes/alt)
+r15 = 23a46d5c716a98d5d4eab349f087e4e5c93435ad (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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9134-git-svn-ignore-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9134-git-svn-ignore-paths/.git/
-expecting success of 9134.1 'setup test repository': 
-	svn_cmd co "$svnrepo" s &&
-	(
-		cd s &&
-		mkdir qqq www &&
-		echo test_qqq > qqq/test_qqq.txt &&
-		echo test_www > www/test_www.txt &&
-		svn_cmd add qqq &&
-		svn_cmd add www &&
-		svn_cmd commit -m "create some files" &&
-		svn_cmd up &&
-		echo hi >> www/test_www.txt &&
-		svn_cmd commit -m "modify www/test_www.txt" &&
-		svn_cmd up
-	)
-
-Checked out revision 0.
-A         qqq
-A         qqq/test_qqq.txt
-A         www
-A         www/test_www.txt
-Adding         qqq
-Adding         qqq/test_qqq.txt
-Adding         www
-Adding         www/test_www.txt
-Transmitting file data ..done
-Committing transaction...
-Committed revision 1.
-Updating '.':
-At revision 1.
-Sending        www/test_www.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-ok 1 - setup test repository
-
-expecting success of 9134.2 'clone an SVN repository with ignored www directory': 
-	git svn clone --ignore-paths="^www" "$svnrepo" g &&
-	echo test_qqq > expect &&
-	for i in g/*/*.txt; do cat $i >> expect2 || return 1; done &&
-	test_cmp expect expect2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9134-git-svn-ignore-paths/g/.git/
-	A	qqq/test_qqq.txt
-r1 = 0d5ee5e62d107ae916fe6453ecb31c81df057ae0 (refs/remotes/git-svn)
-r2 = fbf570f6103a79bce53b63c468a4f8f6ade78efe (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t9134-git-svn-ignore-paths/c/.git/
-	A	qqq/test_qqq.txt
-r1 = 0d5ee5e62d107ae916fe6453ecb31c81df057ae0 (refs/remotes/git-svn)
-r2 = fbf570f6103a79bce53b63c468a4f8f6ade78efe (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
-ok 3 - init+fetch an SVN repository with ignored www directory
-
-expecting success of 9134.4 'verify ignore-paths config saved by clone': 
-	(
-	    cd g &&
-	    git config --get svn-remote.svn.ignore-paths | grep www
-	)
-
-^www
-ok 4 - verify ignore-paths config saved by clone
-
-expecting success of 9134.5 'SVN-side change outside of www': 
-	(
-		cd s &&
-		echo b >> qqq/test_qqq.txt &&
-		svn_cmd commit -m "SVN-side change outside of www" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep "SVN-side change outside of www"
-	)
-
-Sending        qqq/test_qqq.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Updating '.':
-At revision 3.
-SVN-side change outside of www
-ok 5 - SVN-side change outside of www
-
-expecting success of 9134.6 'update git svn-cloned repo (config ignore)': 
-	(
-		cd g &&
-		git svn rebase &&
-		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-
-	M	qqq/test_qqq.txt
-r3 = 481979153df2b654d3d9a6d97de766c5ca3fb22f (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 = 481979153df2b654d3d9a6d97de766c5ca3fb22f (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 7 - update git svn-cloned repo (option ignore)
-
-expecting success of 9134.8 'SVN-side change inside of ignored www': 
-	(
-		cd s &&
-		echo zaq >> www/test_www.txt &&
-		svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep -F "SVN-side change inside of www/test_www.txt"
-	)
-
-Sending        www/test_www.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 4.
-Updating '.':
-At revision 4.
-SVN-side change inside of www/test_www.txt
-ok 8 - SVN-side change inside of ignored www
-
-expecting success of 9134.9 'update git svn-cloned repo (config ignore)': 
-	(
-		cd g &&
-		git svn rebase &&
-		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-
-r4 = daaeeff5de90e41ed418b7ba591a9c4523b3d927 (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 = daaeeff5de90e41ed418b7ba591a9c4523b3d927 (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 = eed0e7b30dd5206424fbdc8b18cc3437945c9437 (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 = eed0e7b30dd5206424fbdc8b18cc3437945c9437 (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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9143-git-svn-gc.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9143-git-svn-gc/.git/
 expecting success of 9143.1 'setup directories and test repo': 
@@ -520470,9 +520448,9 @@
 
 expecting success of 9143.5 'Fetch repo': git svn fetch
 	A	test.txt
-r1 = cfca0ac6740eabee7457a8e90298bf959da06b0b (refs/remotes/git-svn)
+r1 = f42fef8718e662ba41cdae7289a855ebd6eef9eb (refs/remotes/git-svn)
 	M	test.txt
-r2 = 470bf1012a8ff1d7077be50dcd9bb5e30b6e2fc7 (refs/remotes/git-svn)
+r2 = f077b82ad765ceecb97a906b2bc657cbdb5f52a7 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9143-git-svn-gc/svnrepo r2
 ok 5 - Fetch repo
@@ -520515,7 +520493,7 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9139-git-svn-non-utf8-commitencoding/ISO8859-1/.git/
-r1 = 24fef90d82c2f5855dfe9609d09186d8573210fd (refs/remotes/git-svn)
+r1 = f71e3733cb60f97c1ce3106fe6d70a48a24933ae (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 r1
 ok 1 - ISO8859-1 setup
@@ -520528,7 +520506,7 @@
 Committing transaction...
 Committed revision 2.
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9139-git-svn-non-utf8-commitencoding/eucJP/.git/
-r2 = 34162e8361731de917857a60141dda801b804e5d (refs/remotes/git-svn)
+r2 = 5fc69f693bcef5015b81aefc8ea32d9aa31d147d (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP r2
 ok 2 - eucJP setup
@@ -520546,7 +520524,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 8bb724a] ÄËÑÏÖ
+[t c644e67] ÄËÑÏÖ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -520565,7 +520543,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 3f00815] ¤Ï¤ì¤Ò¤Û¤Õ
+[t 3611574] ¤Ï¤ì¤Ò¤Û¤Õ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -520640,11 +520618,11 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9145-git-svn-master-branch/g/.git/
 	A	a
-r1 = 7510e4fc50a8b268de970b4e27249ffd75d226f2 (refs/remotes/origin/trunk)
+r1 = 0047ee6f68f6a595e00c52411a97c489f2e1ec5c (refs/remotes/origin/trunk)
 	A	a
-r2 = d142a5a83b528b6e65d5a4c32b321cbdaee7687c (refs/remotes/origin/a)
+r2 = 1f738638b82968c9a38c1c325d380eb491801c1d (refs/remotes/origin/a)
 	A	a
-r3 = 570668af7432c97fde09f9bbfa8f222980d31f2a (refs/remotes/origin/b)
+r3 = cc5aa844034c8ba84b5c3d9723fc35c827b0518f (refs/remotes/origin/b)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9145-git-svn-master-branch/svnrepo/trunk r1
 ok 2 - git svn clone --stdlayout sets up trunk as main
@@ -520704,10 +520682,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9140-git-svn-reset/g/.git/
 	A	vis/vis.txt
-r1 = 4337899084fc4ddfefd758160afce75a33d5b670 (refs/remotes/git-svn)
-r2 = d9d41f6a19f94a491f37b67b96cc72506479330e (refs/remotes/git-svn)
+r1 = 4ef02217f3c706de560d84aa271ce3f0fc4236c7 (refs/remotes/git-svn)
+r2 = 16ed5970be6d3ec2ef3d829d58d181f241b29ea0 (refs/remotes/git-svn)
 	M	vis/vis.txt
-r3 = 13910f4d3e4b2380547f07bcb135ea2c83e511dd (refs/remotes/git-svn)
+r3 = dfa865038cd0ba38fbe02cfc036c375465389adc (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9140-git-svn-reset/svnrepo r3
 ok 2 - clone SVN repository with hidden directory
@@ -520735,7 +520713,7 @@
 	grep "not found in commit" errors &&
 	test_cmp expect expect2
 
-hid/hid.txt was not found in commit 13910f4d3e4b2380547f07bcb135ea2c83e511dd (r3)
+hid/hid.txt was not found in commit dfa865038cd0ba38fbe02cfc036c375465389adc (r3)
 ok 4 - fetch fails on modified hidden file
 
 expecting success of 9140.5 'reset unwinds back to r1': 
@@ -520745,7 +520723,7 @@
 	echo 1 >expect &&
 	test_cmp expect expect2
 
-r1 = 4337899084fc4ddfefd758160afce75a33d5b670 (refs/remotes/git-svn)
+r1 = 4ef02217f3c706de560d84aa271ce3f0fc4236c7 (refs/remotes/git-svn)
 ok 5 - reset unwinds back to r1
 
 expecting success of 9140.6 'refetch succeeds not ignoring any files': 
@@ -520756,14 +520734,14 @@
 	)
 
 Index mismatch: a4b5c203f79112e92d530cb82366ca4d706fa4a8 != 6b5a1244749c8cdb5442eefd0abc3689d666322d
-rereading 4337899084fc4ddfefd758160afce75a33d5b670
+rereading 4ef02217f3c706de560d84aa271ce3f0fc4236c7
 	A	hid/hid.txt
-r2 = 9867e64ef579ce5ecde2f13572450be8e7325872 (refs/remotes/git-svn)
+r2 = 884dce3d190dfb02fb320fa08fdc01a65d646c86 (refs/remotes/git-svn)
 	M	vis/vis.txt
-r3 = 5e7fe60f23f58a80ec07d86bc05d53e5c7f23ea9 (refs/remotes/git-svn)
+r3 = 13915bcc917c5e0192feab8b9eaefc6a34e1a6e3 (refs/remotes/git-svn)
 	M	hid/hid.txt
-r4 = 51ff92fbf856d2c5fdc716ce93464ca89de5d62d (refs/remotes/git-svn)
-warning: skipped previously applied commit 13910f4
+r4 = d97f84e56baac1d1b2d809bd8800aec955fe95c5 (refs/remotes/git-svn)
+warning: skipped previously applied commit dfa8650
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config advice.skippedCherryPicks false"
 Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
@@ -520774,6 +520752,98 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9144-git-svn-old-rev_map.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 = 9cfef5310d078eb0d37e46ed944ee7c2c920b73d (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/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 = 035fba66653c651f65e94e82577c000ef746925f (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+[master 73bf7fd] -
+ 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.47.2/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
+	M	b/a
+Committed r3
+	M	b/a
+r3 = 5f11b2c398c7d064b43f25c148624510ed5163c9 (refs/remotes/git-svn)
+No changes between 73bf7fd27b576bd486fb1596b1a5fbf7faf90fd1 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9150-svk-mergetickets.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9150-svk-mergetickets/.git/
+expecting success of 9150.1 'load svk depot': 
+	svnadmin load -q '/build/reproducible-path/git-2.47.2/t/trash directory.t9150-svk-mergetickets/svnrepo' 	  < '/build/reproducible-path/git-2.47.2/t/t9150/svk-merge.dump' &&
+	git svn init --minimize-url -R svkmerge 	  --rewrite-root=http://svn.example.org 	  -T trunk -b branches 'file:///build/reproducible-path/git-2.47.2/t/trash directory.t9150-svk-mergetickets/svnrepo' &&
+	git svn fetch --all
+	
+r1 = b53c4e1a175ef8929e6e4aab56280e58a0de64a8 (refs/remotes/origin/trunk)
+	A	Makefile
+r2 = 90f5e8071f5b77e35b17e90dec357e5c88edec7f (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9150-svk-mergetickets/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9150-svk-mergetickets/svnrepo/branches/left, 2
+Found branch parent: (refs/remotes/origin/left) 90f5e8071f5b77e35b17e90dec357e5c88edec7f
+Following parent with do_switch
+Successfully followed parent
+r3 = 79d9656e5bf2f11fc8ec4e9a20e1cea4615a760a (refs/remotes/origin/left)
+	M	Makefile
+r4 = 86c978a5a9e208309128c39af65ada54e20c81ab (refs/remotes/origin/left)
+	M	Makefile
+r5 = 242969651859ed31ccc35c99fab280c17353acd2 (refs/remotes/origin/trunk)
+	M	Makefile
+r6 = 9682859fd9aa34c6573af588d38b75aaaeaa1918 (refs/remotes/origin/left)
+	M	Makefile
+Found merge parent (svk:merge ticket): 9682859fd9aa34c6573af588d38b75aaaeaa1918
+r7 = 8f305e8c49bb2f343a16bd4f0bd3386700698bf5 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9150-svk-mergetickets/svnrepo/trunk r7
+ok 1 - load svk depot
+
+expecting success of 9150.2 'svk merges were represented coming in': 
+	[ 2 -eq 2 ]
+	
+ok 2 - svk merges were represented coming in
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9001-send-email.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9001-send-email/.git/
 expecting success of 9001.1 'prepare reference tree': 
@@ -520851,8 +520921,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:22 +0000
-Message-ID: <20260304080322.878659-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:44 +0000
+Message-ID: <20250130021744.2113364-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -520891,8 +520961,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:22 +0000
-Message-ID: <20260304080322.879026-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:44 +0000
+Message-ID: <20250130021744.2113690-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -520933,8 +521003,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:23 +0000
-Message-ID: <20260304080323.879373-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:45 +0000
+Message-ID: <20250130021745.2113966-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521000,7 +521070,7 @@
  Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
  create mode 100644 cc-trailer.t
-/tmp/P7WM9mjOeq/0001-Test-Cc-trailers.patch
+/tmp/QTjJXyCH3Y/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'
@@ -521020,8 +521090,8 @@
 	five@example.com,
 	six@example.com
 Subject: [PATCH] Test Cc: trailers.
-Date: Wed,  4 Mar 2026 08:03:23 +0000
-Message-ID: <20260304080323.879792-1-author@example.com>
+Date: Thu, 30 Jan 2025 02:17:45 +0000
+Message-ID: <20250130021745.2114393-1-author@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521049,7 +521119,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" &&
 	test_cmp expected-cc commandline1
 
-/tmp/7lUgbcSgOT/0001-Second.patch
+/tmp/wjleZ82gJS/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'
@@ -521069,8 +521139,8 @@
 	five@example.com (open list:FOR THING (FOO/bar)),
 	six@example.com (open list)
 Subject: [PATCH] Second.
-Date: Wed,  4 Mar 2026 08:03:24 +0000
-Message-ID: <20260304080324.880132-1-author@example.com>
+Date: Thu, 30 Jan 2025 02:17:46 +0000
+Message-ID: <20250130021746.2114683-1-author@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521132,8 +521202,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,  4 Mar 2026 08:03:24 +0000
-Message-ID: <20260304080324.880632-1-author@example.com>
+Date: Thu, 30 Jan 2025 02:17:47 +0000
+Message-ID: <20250130021747.2115106-1-author@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521160,8 +521230,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,  4 Mar 2026 08:03:25 +0000
-Message-ID: <20260304080325.881102-1-author@example.com>
+Date: Thu, 30 Jan 2025 02:17:47 +0000
+Message-ID: <20250130021747.2115554-1-author@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521188,8 +521258,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,  4 Mar 2026 08:03:25 +0000
-Message-ID: <20260304080325.881625-1-odd_?=mail@example.com>
+Date: Thu, 30 Jan 2025 02:17:48 +0000
+Message-ID: <20250130021748.2115974-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -521217,8 +521287,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,  4 Mar 2026 08:03:26 +0000
-Message-ID: <20260304080326.882117-1-odd_?=mail@example.com>
+Date: Thu, 30 Jan 2025 02:17:49 +0000
+Message-ID: <20250130021749.2116386-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -521246,8 +521316,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,  4 Mar 2026 08:03:26 +0000
-Message-ID: <20260304080327.882643-1-author@example.com>
+Date: Thu, 30 Jan 2025 02:17:49 +0000
+Message-ID: <20250130021749.2116811-1-author@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521299,8 +521369,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:27 +0000
-Message-ID: <20260304080327.883191-1-author@example.com>
+Date: Thu, 30 Jan 2025 02:17:50 +0000
+Message-ID: <20250130021750.2117381-1-author@example.com>
 X-Mailer: git-send-email 2.47.2
 In-Reply-To: <my-message-id@example.com>
 References: <my-message-id@example.com>
@@ -521323,38 +521393,44 @@
 	git var GIT_AUTHOR_IDENT
 
 )
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink03-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-ok 28 # skip implicit ident is allowed (missing AUTOIDENT of PERL,AUTOIDENT)
-
-expecting success of 9001.29 'broken implicit ident aborts send-email': 
+second user <pbuilder2@codethink04-arm64.debian.net> 1112912293 -0700
+prerequisite AUTOIDENT ok
+expecting success of 9001.28 'implicit ident is allowed': 
 	clean_fake_sendmail &&
 	(sane_unset GIT_AUTHOR_NAME &&
 	sane_unset GIT_AUTHOR_EMAIL &&
 	sane_unset GIT_COMMITTER_NAME &&
 	sane_unset GIT_COMMITTER_EMAIL &&
-	GIT_SEND_EMAIL_NOTTY=1 && export GIT_SEND_EMAIL_NOTTY &&
-	test_must_fail git send-email \
+	GIT_SEND_EMAIL_NOTTY=1 git send-email \
 		--smtp-server="$(pwd)/fake.sendmail" \
 		--to=to@example.com \
-		$patches </dev/null 2>errors &&
-	test_grep "tell me who you are" errors
+		$patches </dev/null 2>errors
 	)
 
-*** Please tell me who you are.
-ok 29 - broken implicit ident aborts send-email
+0001-Second.patch
+(mbox) Adding cc: A <author@example.com> from line 'From: A <author@example.com>'
+(mbox) Adding cc: One <one@example.com> from line 'Cc: One <one@example.com>, two@example.com'
+(mbox) Adding cc: two@example.com from line 'Cc: One <one@example.com>, two@example.com'
+(body) Adding cc: C O Mitter <committer@example.com> from line 'Signed-off-by: C O Mitter <committer@example.com>'
+OK. Log says:
+Sendmail: /build/reproducible-path/git-2.47.2/t/trash directory.t9001-send-email/fake.sendmail -i to@example.com author@example.com one@example.com two@example.com committer@example.com
+From: second user <pbuilder2@codethink04-arm64.debian.net>
+To: to@example.com
+Cc: A <author@example.com>,
+	One <one@example.com>,
+	two@example.com,
+	C O Mitter <committer@example.com>
+Subject: [PATCH 1/1] Second.
+Date: Thu, 30 Jan 2025 02:17:51 +0000
+Message-ID: <20250130021751.2117689-1-pbuilder2@codethink04-arm64.debian.net>
+X-Mailer: git-send-email 2.47.2
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Result: OK
+ok 28 - implicit ident is allowed
+
+ok 29 # skip broken implicit ident aborts send-email (missing !AUTOIDENT of PERL,!AUTOIDENT)
 
 expecting success of 9001.30 'setup cmd scripts': 
 	write_script tocmd-sed <<-\EOF &&
@@ -521396,8 +521472,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:28 +0000
-Message-ID: <20260304080328.883868-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:51 +0000
+Message-ID: <20250130021751.2118047-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521435,8 +521511,8 @@
 	C O Mitter <committer@example.com>,
 	cccmd@example.com
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:28 +0000
-Message-ID: <20260304080328.884162-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:52 +0000
+Message-ID: <20250130021752.2118347-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521472,8 +521548,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:29 +0000
-Message-ID: <20260304080329.884516-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:52 +0000
+Message-ID: <20250130021752.2118656-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 X-Debbugs-CC: dummy@example.com
@@ -521511,8 +521587,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:29 +0000
-Message-ID: <20260304080329.884847-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:53 +0000
+Message-ID: <20250130021753.2118888-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521551,8 +521627,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:29 +0000
-Message-ID: <20260304080329.885093-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:53 +0000
+Message-ID: <20250130021753.2119142-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 X-Debbugs-CC: someone@example.com
@@ -521639,8 +521715,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:30 +0000
-Message-ID: <20260304080330.885839-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:54 +0000
+Message-ID: <20250130021755.2119898-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521673,8 +521749,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:31 +0000
-Message-ID: <20260304080331.886111-1-author@example.com>
+Date: Thu, 30 Jan 2025 02:17:55 +0000
+Message-ID: <20250130021755.2120217-1-author@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521706,8 +521782,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:30 +0000
-Message-ID: <20260304080331.886321-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:54 +0000
+Message-ID: <20250130021755.2120523-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521726,11 +521802,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:31 +0000
-Message-ID: <20260304080331.886321-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:55 +0000
+Message-ID: <20250130021755.2120523-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080331.886321-1-nobody@example.com>
-References: <20260304080331.886321-1-nobody@example.com>
+In-Reply-To: <20250130021755.2120523-1-nobody@example.com>
+References: <20250130021755.2120523-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -521761,8 +521837,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:31 +0000
-Message-ID: <20260304080331.886555-1-author@example.com>
+Date: Thu, 30 Jan 2025 02:17:56 +0000
+Message-ID: <20250130021756.2120713-1-author@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521796,8 +521872,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:32 +0000
-Message-ID: <20260304080332.886799-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:56 +0000
+Message-ID: <20250130021756.2120927-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -521833,8 +521909,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:32 +0000
-Message-ID: <20260304080332.887036-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:56 +0000
+Message-ID: <20250130021756.2121130-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -521867,8 +521943,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:31 +0000
-Message-ID: <20260304080332.887253-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:56 +0000
+Message-ID: <20250130021757.2121311-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -521887,11 +521963,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:32 +0000
-Message-ID: <20260304080332.887253-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:57 +0000
+Message-ID: <20250130021757.2121311-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080332.887253-1-nobody@example.com>
-References: <20260304080332.887253-1-nobody@example.com>
+In-Reply-To: <20250130021757.2121311-1-nobody@example.com>
+References: <20250130021757.2121311-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -521922,8 +521998,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:31 +0000
-Message-ID: <20260304080332.887512-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:56 +0000
+Message-ID: <20250130021757.2121568-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -521942,11 +522018,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:32 +0000
-Message-ID: <20260304080332.887512-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:57 +0000
+Message-ID: <20250130021757.2121568-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080332.887512-1-nobody@example.com>
-References: <20260304080332.887512-1-nobody@example.com>
+In-Reply-To: <20250130021757.2121568-1-nobody@example.com>
+References: <20250130021757.2121568-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -521977,8 +522053,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:32 +0000
-Message-ID: <20260304080333.887749-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:57 +0000
+Message-ID: <20250130021758.2121796-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -521997,11 +522073,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:33 +0000
-Message-ID: <20260304080333.887749-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:17:58 +0000
+Message-ID: <20250130021758.2121796-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080333.887749-1-nobody@example.com>
-References: <20260304080333.887749-1-nobody@example.com>
+In-Reply-To: <20250130021758.2121796-1-nobody@example.com>
+References: <20250130021758.2121796-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
 
@@ -522108,8 +522184,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:35 +0000
-Message-ID: <20260304080334.889098-2-author@example.com>
+Date: Thu, 30 Jan 2025 02:18:01 +0000
+Message-ID: <20250130021800.2123104-2-author@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 X-test-header: v1.0
@@ -522146,8 +522222,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:36 +0000
-Message-ID: <20260304080335.889464-2-author@example.com>
+Date: Thu, 30 Jan 2025 02:18:01 +0000
+Message-ID: <20250130021800.2123403-2-author@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -522162,8 +522238,8 @@
 Cc: A <author@example.com>,
 	C O Mitter <committer@example.com>
 Subject: [PATCH] Second.
-Date: Wed,  4 Mar 2026 08:03:37 +0000
-Message-ID: <60cacbfe300cd164f7b9f1654d3409ba2f8d8d0e.1772611401.git.committer@example.com>
+Date: Thu, 30 Jan 2025 02:18:02 +0000
+Message-ID: <60cacbfe300cd164f7b9f1654d3409ba2f8d8d0e.1738203462.git.committer@example.com>
 X-Mailer: git-send-email 2.47.2
 In-Reply-To: <format>
 References: <format>
@@ -522197,8 +522273,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:35 +0000
-Message-ID: <20260304080335.889865-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:01 +0000
+Message-ID: <20250130021801.2123771-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -522231,8 +522307,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:35 +0000
-Message-ID: <20260304080335.890129-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:01 +0000
+Message-ID: <20250130021801.2124004-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -522265,8 +522341,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:36 +0000
-Message-ID: <20260304080336.890396-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:02 +0000
+Message-ID: <20250130021802.2124240-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -522299,8 +522375,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:36 +0000
-Message-ID: <20260304080336.890620-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:02 +0000
+Message-ID: <20250130021802.2124524-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -522334,8 +522410,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:36 +0000
-Message-ID: <20260304080336.890876-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:03 +0000
+Message-ID: <20250130021803.2124748-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -522367,8 +522443,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:36 +0000
-Message-ID: <20260304080336.891129-1-author@example.com>
+Date: Thu, 30 Jan 2025 02:18:03 +0000
+Message-ID: <20250130021803.2124994-1-author@example.com>
 X-Mailer: git-send-email 2.47.2
 In-Reply-To: <To Example <to@example.com>
 References: <To Example <to@example.com>
@@ -522415,8 +522491,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:35 +0000
-Message-ID: <20260304080337.891409-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:01 +0000
+Message-ID: <20250130021804.2125248-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -522437,12 +522513,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:36 +0000
-Message-ID: <20260304080337.891409-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:02 +0000
+Message-ID: <20250130021804.2125248-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080337.891409-1-nobody@example.com>
+In-Reply-To: <20250130021804.2125248-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20260304080337.891409-1-nobody@example.com>
+ <20250130021804.2125248-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -522460,12 +522536,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:37 +0000
-Message-ID: <20260304080337.891409-3-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:03 +0000
+Message-ID: <20250130021804.2125248-3-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080337.891409-1-nobody@example.com>
+In-Reply-To: <20250130021804.2125248-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20260304080337.891409-1-nobody@example.com>
+ <20250130021804.2125248-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -522508,8 +522584,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:35 +0000
-Message-ID: <20260304080337.891848-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:02 +0000
+Message-ID: <20250130021804.2125629-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -522530,12 +522606,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:36 +0000
-Message-ID: <20260304080337.891848-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:03 +0000
+Message-ID: <20250130021804.2125629-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080337.891848-1-nobody@example.com>
+In-Reply-To: <20250130021804.2125629-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20260304080337.891848-1-nobody@example.com>
+ <20250130021804.2125629-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -522553,13 +522629,13 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:37 +0000
-Message-ID: <20260304080337.891848-3-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:04 +0000
+Message-ID: <20250130021804.2125629-3-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080337.891848-2-nobody@example.com>
+In-Reply-To: <20250130021804.2125629-2-nobody@example.com>
 References: <unique-message-id@example.com>
- <20260304080337.891848-1-nobody@example.com>
- <20260304080337.891848-2-nobody@example.com>
+ <20250130021804.2125629-1-nobody@example.com>
+ <20250130021804.2125629-2-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -522613,8 +522689,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed,  4 Mar 2026 08:03:38 +0000
-Message-ID: <20260304080338.892495-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:05 +0000
+Message-ID: <20250130021805.2126290-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -522633,11 +522709,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:39 +0000
-Message-ID: <20260304080338.892495-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:06 +0000
+Message-ID: <20250130021805.2126290-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080338.892495-1-nobody@example.com>
-References: <20260304080338.892495-1-nobody@example.com>
+In-Reply-To: <20250130021805.2126290-1-nobody@example.com>
+References: <20250130021805.2126290-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -523039,8 +523115,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Wed,  4 Mar 2026 08:03:42 +0000
-Message-ID: <20260304080343.896874-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:12 +0000
+Message-ID: <20250130021813.2130879-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -523062,8 +523138,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Wed,  4 Mar 2026 08:03:42 +0000
-Message-ID: <20260304080343.896874-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:12 +0000
+Message-ID: <20250130021813.2130879-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -523075,11 +523151,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Wed,  4 Mar 2026 08:03:43 +0000
-Message-ID: <20260304080343.896874-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:13 +0000
+Message-ID: <20250130021813.2130879-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080343.896874-1-nobody@example.com>
-References: <20260304080343.896874-1-nobody@example.com>
+In-Reply-To: <20250130021813.2130879-1-nobody@example.com>
+References: <20250130021813.2130879-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -523090,11 +523166,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Wed,  4 Mar 2026 08:03:43 +0000
-Message-ID: <20260304080343.896874-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:13 +0000
+Message-ID: <20250130021813.2130879-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080343.896874-1-nobody@example.com>
-References: <20260304080343.896874-1-nobody@example.com>
+In-Reply-To: <20250130021813.2130879-1-nobody@example.com>
+References: <20250130021813.2130879-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -523125,8 +523201,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:44 +0000
-Message-ID: <20260304080344.897185-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:13 +0000
+Message-ID: <20250130021813.2131181-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -523159,8 +523235,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:44 +0000
-Message-ID: <20260304080344.897425-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:14 +0000
+Message-ID: <20250130021814.2131439-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -523191,8 +523267,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,  4 Mar 2026 08:03:44 +0000
-Message-ID: <20260304080344.897714-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:14 +0000
+Message-ID: <20250130021814.2131683-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -523222,8 +523298,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed,  4 Mar 2026 08:03:45 +0000
-Message-ID: <20260304080345.897949-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:15 +0000
+Message-ID: <20250130021815.2132056-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -523243,11 +523319,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:46 +0000
-Message-ID: <20260304080345.897949-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:16 +0000
+Message-ID: <20250130021815.2132056-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080345.897949-1-nobody@example.com>
-References: <20260304080345.897949-1-nobody@example.com>
+In-Reply-To: <20250130021815.2132056-1-nobody@example.com>
+References: <20250130021815.2132056-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -523285,8 +523361,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed,  4 Mar 2026 08:03:45 +0000
-Message-ID: <20260304080345.898325-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:15 +0000
+Message-ID: <20250130021816.2132506-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -523306,11 +523382,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:46 +0000
-Message-ID: <20260304080345.898325-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:16 +0000
+Message-ID: <20250130021816.2132506-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080345.898325-1-nobody@example.com>
-References: <20260304080345.898325-1-nobody@example.com>
+In-Reply-To: <20250130021816.2132506-1-nobody@example.com>
+References: <20250130021816.2132506-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -523337,8 +523413,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?UTF-8?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Wed,  4 Mar 2026 08:03:46 +0000
-Message-ID: <20260304080346.898726-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:16 +0000
+Message-ID: <20250130021816.2133008-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -523358,11 +523434,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:47 +0000
-Message-ID: <20260304080346.898726-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:17 +0000
+Message-ID: <20250130021816.2133008-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080346.898726-1-nobody@example.com>
-References: <20260304080346.898726-1-nobody@example.com>
+In-Reply-To: <20250130021816.2133008-1-nobody@example.com>
+References: <20250130021816.2133008-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -523400,8 +523476,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,  4 Mar 2026 08:03:46 +0000
-Message-ID: <20260304080346.899190-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:17 +0000
+Message-ID: <20250130021817.2133524-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -523442,8 +523518,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,  4 Mar 2026 08:03:47 +0000
-Message-ID: <20260304080347.899571-1-odd_?=mail@example.com>
+Date: Thu, 30 Jan 2025 02:18:17 +0000
+Message-ID: <20250130021817.2133838-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -523536,8 +523612,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed,  4 Mar 2026 08:03:48 +0000
-Message-ID: <20260304080348.900332-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:19 +0000
+Message-ID: <20250130021819.2134807-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -523557,11 +523633,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:49 +0000
-Message-ID: <20260304080348.900332-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:20 +0000
+Message-ID: <20250130021819.2134807-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080348.900332-1-nobody@example.com>
-References: <20260304080348.900332-1-nobody@example.com>
+In-Reply-To: <20250130021819.2134807-1-nobody@example.com>
+References: <20250130021819.2134807-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -523592,8 +523668,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed,  4 Mar 2026 08:03:48 +0000
-Message-ID: <20260304080348.900716-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:20 +0000
+Message-ID: <20250130021820.2135193-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -523613,11 +523689,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:49 +0000
-Message-ID: <20260304080348.900716-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:21 +0000
+Message-ID: <20250130021820.2135193-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080348.900716-1-nobody@example.com>
-References: <20260304080348.900716-1-nobody@example.com>
+In-Reply-To: <20250130021820.2135193-1-nobody@example.com>
+References: <20250130021820.2135193-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -523649,8 +523725,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Wed,  4 Mar 2026 08:03:49 +0000
-Message-ID: <20260304080349.901083-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:20 +0000
+Message-ID: <20250130021821.2135559-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -523670,11 +523746,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:50 +0000
-Message-ID: <20260304080349.901083-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:21 +0000
+Message-ID: <20250130021821.2135559-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080349.901083-1-nobody@example.com>
-References: <20260304080349.901083-1-nobody@example.com>
+In-Reply-To: <20250130021821.2135559-1-nobody@example.com>
+References: <20250130021821.2135559-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -523702,8 +523778,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?iso-8859-2?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Wed,  4 Mar 2026 08:03:49 +0000
-Message-ID: <20260304080349.901462-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:21 +0000
+Message-ID: <20250130021821.2135949-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -523723,11 +523799,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Wed,  4 Mar 2026 08:03:50 +0000
-Message-ID: <20260304080349.901462-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:18:22 +0000
+Message-ID: <20250130021821.2135949-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080349.901462-1-nobody@example.com>
-References: <20260304080349.901462-1-nobody@example.com>
+In-Reply-To: <20250130021821.2135949-1-nobody@example.com>
+References: <20250130021821.2135949-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -523800,7 +523876,7 @@
 		$patches $patches >stdout &&
 	grep "In-Reply-To: " stdout
 
-In-Reply-To: <20260304080351.902525-1-nobody@example.com>
+In-Reply-To: <20250130021823.2137007-1-nobody@example.com>
 ok 110 - threading but no chain-reply-to
 
 expecting success of 9001.111 'override in-reply-to if no threading': 
@@ -524888,6 +524964,7 @@
 	>actual-list &&
 	test_cmp expected-list actual-list
 
+./test-lib.sh: line 1060: warning: command substitution: ignored null byte in input
 ok 193 - leading and trailing whitespaces are removed
 
 expecting success of 9001.194 'mailmap support with --to': 
@@ -525036,7 +525113,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/OwPnDKwoT4/0001-add-main.patch
+/tmp/EmH9duP7AU/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
@@ -525045,8 +525122,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed,  4 Mar 2026 08:04:18 +0000
-Message-ID: <20260304080418.926074-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:19:05 +0000
+Message-ID: <20250130021905.2162762-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525063,7 +525140,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/YalQFW_VNp/0001-add-main.patch
+/tmp/1owRZap0qM/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
@@ -525072,8 +525149,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed,  4 Mar 2026 08:04:18 +0000
-Message-ID: <20260304080418.926420-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:19:05 +0000
+Message-ID: <20250130021905.2163049-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525090,7 +525167,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/12KP4dSx28/0001-add-main.patch
+/tmp/1ln4LwKbjL/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
@@ -525099,8 +525176,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed,  4 Mar 2026 08:04:18 +0000
-Message-ID: <20260304080418.926856-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:19:05 +0000
+Message-ID: <20250130021905.2163314-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525149,7 +525226,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch with in-reply-to
-Date: Wed,  4 Mar 2026 08:04:18 +0000
+Date: Thu, 30 Jan 2025 02:19:05 +0000
 Message-ID: <patch.with.in.reply.to@example.com>
 X-Mailer: git-send-email 2.47.2
 In-Reply-To: <replied.to@example.com>
@@ -525166,7 +525243,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch without in-reply-to
-Date: Wed,  4 Mar 2026 08:04:19 +0000
+Date: Thu, 30 Jan 2025 02:19:06 +0000
 Message-ID: <patch.without.in.reply.to@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
@@ -525200,7 +525277,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch with in-reply-to
-Date: Wed,  4 Mar 2026 08:04:18 +0000
+Date: Thu, 30 Jan 2025 02:19:05 +0000
 Message-ID: <patch.with.in.reply.to@example.com>
 X-Mailer: git-send-email 2.47.2
 In-Reply-To: <cmdline.reply@example.com>
@@ -525217,7 +525294,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch without in-reply-to
-Date: Wed,  4 Mar 2026 08:04:19 +0000
+Date: Thu, 30 Jan 2025 02:19:06 +0000
 Message-ID: <patch.without.in.reply.to@example.com>
 X-Mailer: git-send-email 2.47.2
 In-Reply-To: <cmdline.reply@example.com>
@@ -525279,8 +525356,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed,  4 Mar 2026 08:04:20 +0000
-Message-ID: <20260304080419.927954-2-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:19:08 +0000
+Message-ID: <20250130021907.2164278-2-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525310,10 +525387,10 @@
 		--validate -3 --cover-letter --force &&
 	test_cmp expect my-hooks.log
 
-/tmp/ze2l13oY5a/0000-cover-letter.patch
-/tmp/ze2l13oY5a/0001-Initial.patch
-/tmp/ze2l13oY5a/0002-Second.patch
-/tmp/ze2l13oY5a/0003-add-main.patch
+/tmp/a86w1YLI72/0000-cover-letter.patch
+/tmp/a86w1YLI72/0001-Initial.patch
+/tmp/a86w1YLI72/0002-Second.patch
+/tmp/a86w1YLI72/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.47.2/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com committer@example.com other@ex.com
@@ -525322,8 +525399,8 @@
 Cc: Somebody <somebody@ex.com>,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 0/3] *** SUBJECT HERE ***
-Date: Wed,  4 Mar 2026 08:04:21 +0000
-Message-ID: <20260304080420.928641-5-from@example.com>
+Date: Thu, 30 Jan 2025 02:19:09 +0000
+Message-ID: <20250130021908.2164910-5-from@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525337,11 +525414,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A <author@example.com>
 Subject: [PATCH 1/3] Initial.
-Date: Wed,  4 Mar 2026 08:04:22 +0000
-Message-ID: <20260304080420.928641-6-from@example.com>
+Date: Thu, 30 Jan 2025 02:19:10 +0000
+Message-ID: <20250130021908.2164910-6-from@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080420.928641-5-from@example.com>
-References: <20260304080420.928641-5-from@example.com>
+In-Reply-To: <20250130021908.2164910-5-from@example.com>
+References: <20250130021908.2164910-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -525354,11 +525431,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A <author@example.com>
 Subject: [PATCH 2/3] Second.
-Date: Wed,  4 Mar 2026 08:04:23 +0000
-Message-ID: <20260304080420.928641-7-from@example.com>
+Date: Thu, 30 Jan 2025 02:19:11 +0000
+Message-ID: <20250130021908.2164910-7-from@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080420.928641-5-from@example.com>
-References: <20260304080420.928641-5-from@example.com>
+In-Reply-To: <20250130021908.2164910-5-from@example.com>
+References: <20250130021908.2164910-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -525371,11 +525448,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH 3/3] add main
-Date: Wed,  4 Mar 2026 08:04:24 +0000
-Message-ID: <20260304080420.928641-8-from@example.com>
+Date: Thu, 30 Jan 2025 02:19:12 +0000
+Message-ID: <20250130021908.2164910-8-from@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080420.928641-5-from@example.com>
-References: <20260304080420.928641-5-from@example.com>
+In-Reply-To: <20250130021908.2164910-5-from@example.com>
+References: <20250130021908.2164910-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -525396,8 +525473,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed,  4 Mar 2026 08:04:21 +0000
-Message-ID: <20260304080421.929095-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:19:08 +0000
+Message-ID: <20250130021908.2165489-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525419,8 +525496,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed,  4 Mar 2026 08:04:21 +0000
-Message-ID: <20260304080421.929095-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:19:08 +0000
+Message-ID: <20250130021908.2165489-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525456,7 +525533,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" \
 		HEAD^
 
-/tmp/06oasYUbVq/0001-add-main.patch
+/tmp/Lth7wGxvCM/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.47.2/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -525465,8 +525542,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed,  4 Mar 2026 08:04:22 +0000
-Message-ID: <20260304080422.929799-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:19:10 +0000
+Message-ID: <20250130021910.2166260-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525483,7 +525560,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" \
 		HEAD^
 
-/tmp/g9xSFR1QYH/0001-add-main.patch
+/tmp/5v4rLuImW5/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.47.2/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -525492,8 +525569,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed,  4 Mar 2026 08:04:22 +0000
-Message-ID: <20260304080423.930140-1-nobody@example.com>
+Date: Thu, 30 Jan 2025 02:19:10 +0000
+Message-ID: <20250130021910.2166542-1-nobody@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525515,7 +525592,7 @@
 		HEAD^ &&
 	grep "From: edited-from@example.com" msgtxt1
 
-/tmp/KyzU9oxRYQ/0001-add-main.patch
+/tmp/4SZOtDODkW/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:
@@ -525525,8 +525602,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed,  4 Mar 2026 08:04:23 +0000
-Message-ID: <20260304080423.930606-1-edited-from@example.com>
+Date: Thu, 30 Jan 2025 02:19:11 +0000
+Message-ID: <20250130021911.2166826-1-edited-from@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525560,7 +525637,7 @@
 	grep -A1 "^To:" msgtxt2 >msgtxt2.to &&
 	test_cmp expect msgtxt2.to
 
-/tmp/kwLaBL0pI5/0001-add-main.patch
+/tmp/n3TCspRsJf/0001-add-main.patch
 OK. Log says:
 Sendmail: /build/reproducible-path/git-2.47.2/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com edited-to@example.com somebody@ex.com
 From: Example <from@example.com>
@@ -525568,8 +525645,8 @@
 	edited-to@example.com
 Cc: Somebody <somebody@ex.com>
 Subject: 
-Date: Wed,  4 Mar 2026 08:04:24 +0000
-Message-ID: <20260304080424.931024-1-from@example.com>
+Date: Thu, 30 Jan 2025 02:19:11 +0000
+Message-ID: <20250130021911.2167198-1-from@example.com>
 X-Mailer: git-send-email 2.47.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -525584,11 +525661,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Wed,  4 Mar 2026 08:04:25 +0000
-Message-ID: <20260304080424.931024-2-from@example.com>
+Date: Thu, 30 Jan 2025 02:19:12 +0000
+Message-ID: <20250130021911.2167198-2-from@example.com>
 X-Mailer: git-send-email 2.47.2
-In-Reply-To: <20260304080424.931024-1-from@example.com>
-References: <20260304080424.931024-1-from@example.com>
+In-Reply-To: <20250130021911.2167198-1-from@example.com>
+References: <20250130021911.2167198-1-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -525599,98 +525676,6 @@
 1..215
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9144-git-svn-old-rev_map.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 = 99fc05f1eb1e099843ca850a30732b2480f2b92e (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/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 = 760c2e9d45ab46da41a0f3f3fbe1193b5a6df36d (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-[master 79cf79b] -
- 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.47.2/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
-	M	b/a
-Committed r3
-	M	b/a
-r3 = f7012beee2e66f256235a7cbc79781b7dca223cb (refs/remotes/git-svn)
-No changes between 79cf79b74b079e533411519996be0fb1428faea5 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9150-svk-mergetickets.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9150-svk-mergetickets/.git/
-expecting success of 9150.1 'load svk depot': 
-	svnadmin load -q '/build/reproducible-path/git-2.47.2/t/trash directory.t9150-svk-mergetickets/svnrepo' 	  < '/build/reproducible-path/git-2.47.2/t/t9150/svk-merge.dump' &&
-	git svn init --minimize-url -R svkmerge 	  --rewrite-root=http://svn.example.org 	  -T trunk -b branches 'file:///build/reproducible-path/git-2.47.2/t/trash directory.t9150-svk-mergetickets/svnrepo' &&
-	git svn fetch --all
-	
-r1 = b53c4e1a175ef8929e6e4aab56280e58a0de64a8 (refs/remotes/origin/trunk)
-	A	Makefile
-r2 = 90f5e8071f5b77e35b17e90dec357e5c88edec7f (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9150-svk-mergetickets/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9150-svk-mergetickets/svnrepo/branches/left, 2
-Found branch parent: (refs/remotes/origin/left) 90f5e8071f5b77e35b17e90dec357e5c88edec7f
-Following parent with do_switch
-Successfully followed parent
-r3 = 79d9656e5bf2f11fc8ec4e9a20e1cea4615a760a (refs/remotes/origin/left)
-	M	Makefile
-r4 = 86c978a5a9e208309128c39af65ada54e20c81ab (refs/remotes/origin/left)
-	M	Makefile
-r5 = 242969651859ed31ccc35c99fab280c17353acd2 (refs/remotes/origin/trunk)
-	M	Makefile
-r6 = 9682859fd9aa34c6573af588d38b75aaaeaa1918 (refs/remotes/origin/left)
-	M	Makefile
-Found merge parent (svk:merge ticket): 9682859fd9aa34c6573af588d38b75aaaeaa1918
-r7 = 8f305e8c49bb2f343a16bd4f0bd3386700698bf5 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9150-svk-mergetickets/svnrepo/trunk r7
-ok 1 - load svk depot
-
-expecting success of 9150.2 'svk merges were represented coming in': 
-	[ 2 -eq 2 ]
-	
-ok 2 - svk merges were represented coming in
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9153-git-svn-rewrite-uuid.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9153-git-svn-rewrite-uuid/.git/
 expecting success of 9153.1 'load svn repo': 
@@ -525747,19 +525732,19 @@
 expecting success of 9152.2 'clone': git svn clone "$svnrepo" cloned
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9152-svn-empty-dirs-after-gc/cloned/.git/
 W: +empty_dir: a
-r1 = ae6e6b4774b030a488f6f7e453680cc00030c483 (refs/remotes/git-svn)
+r1 = f4ff631ac6b48f3a8e8bb6159f12266a0fc0af1f (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 80522bb9a3a814309d0903ad698635530b7a80f6 (refs/remotes/git-svn)
+r2 = 6abeb180c8878e1a4eee7b0edc9e0d831dfe7617 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = d7befd27c323a23cb6454ecb86c1cb01e9c12adb (refs/remotes/git-svn)
+r3 = d326a7e55503a773b1ad1ed7eab870d6d7bc47ff (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = 395b73eee5d95a0d42ce92cbd54ffce1ba997117 (refs/remotes/git-svn)
+r4 = 6784508c5f54a2c1c6bb3ea8fba1fea67b614969 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = e2eb66eb3574b9801ebfc133f786e5330ecc8415 (refs/remotes/git-svn)
+r5 = efc53765106458b995e6ed590ce4e90adac84837 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = 5dd5afbf72b3927cd3c665719c6454b04993f48c (refs/remotes/git-svn)
+r6 = bef93ec63d79c3924c4f1d16728e95e1649256e7 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 89ada342f155c0895faf6ad821f85cd31200ac58 (refs/remotes/git-svn)
+r7 = 9306026f34f894b8801de552a80659fbb93ff376 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9152-svn-empty-dirs-after-gc/svnrepo r7
 creating empty directory: a
@@ -525868,14 +525853,14 @@
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
 Initializing parent: refs/remotes/thunk@2
 	A	readme
-r1 = a3dd58689b10d1a30295ba4cf860941edef05733 (refs/remotes/thunk@2)
+r1 = d0beccaddd6eb9be4624316281abc80a2f9cc72e (refs/remotes/thunk@2)
 	M	readme
-r2 = 123df9df9df867df393eeef3fd131c3b16b6054f (refs/remotes/thunk@2)
-Found branch parent: (refs/remotes/thunk) 123df9df9df867df393eeef3fd131c3b16b6054f
+r2 = 32d1aef253976c8ea0a14d89f1bd13963dc1a84f (refs/remotes/thunk@2)
+Found branch parent: (refs/remotes/thunk) 32d1aef253976c8ea0a14d89f1bd13963dc1a84f
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = c26e8e36defa7839c8913da193b31c061e58184f (refs/remotes/thunk)
+r3 = 9ef2a08ecdd29903329dbacd2f1edfaba82deb7c (refs/remotes/thunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk r3
 ok 2 - init and fetch a moved directory
@@ -525893,15 +525878,15 @@
 	test "$(sed -n -e "3p" actual)" = goodbye
 
 	A	readme
-r1 = a3dd58689b10d1a30295ba4cf860941edef05733 (refs/remotes/svn/trunk)
+r1 = d0beccaddd6eb9be4624316281abc80a2f9cc72e (refs/remotes/svn/trunk)
 	M	readme
-r2 = 123df9df9df867df393eeef3fd131c3b16b6054f (refs/remotes/svn/trunk)
+r2 = 32d1aef253976c8ea0a14d89f1bd13963dc1a84f (refs/remotes/svn/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) 123df9df9df867df393eeef3fd131c3b16b6054f
+Found branch parent: (refs/remotes/svn/thunk) 32d1aef253976c8ea0a14d89f1bd13963dc1a84f
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = c26e8e36defa7839c8913da193b31c061e58184f (refs/remotes/svn/thunk)
+r3 = 9ef2a08ecdd29903329dbacd2f1edfaba82deb7c (refs/remotes/svn/thunk)
 ok 3 - init and fetch from one svn-remote
 
 expecting success of 9104.4 'follow deleted parent': 
@@ -525920,10 +525905,10 @@
 Committing transaction...
 Committed revision 4.
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) 123df9df9df867df393eeef3fd131c3b16b6054f
+Found branch parent: (refs/remotes/svn/junk) 32d1aef253976c8ea0a14d89f1bd13963dc1a84f
 Following parent with do_switch
 Successfully followed parent
-r4 = a6c8dba9a37dcc1d8800f4e970a4639e4f2b894d (refs/remotes/svn/junk)
+r4 = 133f9d82ee86b92edaaebf3a4fcc67c76e236781 (refs/remotes/svn/junk)
 ok 4 - follow deleted parent
 
 expecting success of 9104.5 'follow larger parent': 
@@ -525958,17 +525943,17 @@
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	file
-r5 = 4ef17ff7f25054e26ee4e98e084f4979dec6f582 (refs/remotes/larger)
+r5 = 725aacdb74367c40e9dc27037393d26b7eb9ebf6 (refs/remotes/larger)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.47.2/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.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) 4ef17ff7f25054e26ee4e98e084f4979dec6f582
+Found branch parent: (refs/remotes/larger-parent) 725aacdb74367c40e9dc27037393d26b7eb9ebf6
 Following parent with do_switch
 Successfully followed parent
-r6 = 379624a216ff63de3a37729945aa61520e2b4abc (refs/remotes/larger-parent)
-4ef17ff7f25054e26ee4e98e084f4979dec6f582
-379624a216ff63de3a37729945aa61520e2b4abc
+r6 = 38c39a1ff4aaf956f7816f952cfdc25fd404eafd (refs/remotes/larger-parent)
+725aacdb74367c40e9dc27037393d26b7eb9ebf6
+38c39a1ff4aaf956f7816f952cfdc25fd404eafd
 ok 5 - follow larger parent
 
 expecting success of 9104.6 'follow higher-level parent': 
@@ -526001,13 +525986,13 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
 Initializing parent: refs/remotes/blob@9
-r7 = 3e8178b6bd24f541e2365db58dac28ba31b247c5 (refs/remotes/blob@9)
+r7 = 4d081bcae2ca51579d76306651ebb6102ac2df2a (refs/remotes/blob@9)
 	A	hi
-r8 = bd2fbe89f57081a1c286f55cbcda2e20e6468485 (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) bd2fbe89f57081a1c286f55cbcda2e20e6468485
+r8 = 66f019a9a30e848cd83f01fa4459382820d9f3be (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) 66f019a9a30e848cd83f01fa4459382820d9f3be
 Following parent with do_switch
 Successfully followed parent
-r10 = f87331fd1d001fbf44d4073ab6482d1581d523cf (refs/remotes/blob)
+r10 = 6d2aaf55f6b36c16570543adccfd08b59d80b324 (refs/remotes/blob)
 ok 6 - follow higher-level parent
 
 expecting success of 9104.7 'follow deleted directory': 
@@ -526025,17 +526010,17 @@
 Committed revision 12.
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-r9 = 484a8a6cb95d9b82471c54fc37c08e10f0430744 (refs/remotes/glob)
+r9 = 0fe98f07acb54a4f94c93826b977b43f1d58f27d (refs/remotes/glob)
 	A	blob/hi
-r10 = 14219eadecb8f59348fd814fe053f0f3a212f92e (refs/remotes/glob)
+r10 = fbd68909c6cd5d7007c038a70fbda0ff13bc2830 (refs/remotes/glob)
 	D	hi
 	A	bye
 W: -empty_dir: glob/blob/hi
-r11 = a24f66be9999783af85e02fc36d9e71794569efa (refs/remotes/blob)
+r11 = 293ca0d6205a28bcb24f8066c566486144611d15 (refs/remotes/blob)
 	D	blob/hi
 	A	blob/bye
 W: -empty_dir: glob/blob/hi
-r11 = 3dbeecc313d2654c1421212bc00d5755639c9c63 (refs/remotes/glob)
+r11 = 31e57132e1e86e0662ac233c1053e4ae5b74902d (refs/remotes/glob)
 ok 7 - follow deleted directory
 
 expecting success of 9104.8 'follow-parent avoids deleting relevant info': 
@@ -526137,12 +526122,12 @@
 	A	b.t
 	A	c.t
 	A	larger-parent
-r13 = 440d6d17e9d6132155237ce85e4d4039199f2b42 (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 440d6d17e9d6132155237ce85e4d4039199f2b42
+r13 = 67cf82b49bf5feb4d8f8541e1da9ca6ea9bf2b34 (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) 67cf82b49bf5feb4d8f8541e1da9ca6ea9bf2b34
 Following parent with do_switch
 	M	c.t
 Successfully followed parent
-r14 = 787df87c9fc78031070f6f37eb23d3e912c92d55 (refs/remotes/r9270-t)
+r14 = ebfea0c2630218617479b1a962a94cc99096a06b (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': 
@@ -526162,10 +526147,10 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.47.2/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.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.47.2/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) 787df87c9fc78031070f6f37eb23d3e912c92d55
+Found branch parent: (refs/remotes/r9270-d) ebfea0c2630218617479b1a962a94cc99096a06b
 Following parent with do_switch
 Successfully followed parent
-r15 = f7ed9accd0dca38d42eea854955be0c136137ba3 (refs/remotes/r9270-d)
+r15 = 86da61ebaee713cce2d45d657168e0a4b1b6910b (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': 
@@ -526291,41 +526276,41 @@
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	readme
-r16 = ec6ec5cd312bfc5d13dfcd65a307ad6a0011ae05 (refs/remotes/stunk)
+r16 = 7958b160496d71273178f5980dfa2ffbc3046535 (refs/remotes/stunk)
 	M	readme
-r17 = 3caa787f99c30c51ca808c4b66ab3b96a728c448 (refs/remotes/stunk)
+r17 = b9fa7e3a7e1cf668f44d94694ad31b15ddf6a992 (refs/remotes/stunk)
 	M	readme
-r18 = c172ba2b7c8b183bb0a215847b8bdb9d52b40ba3 (refs/remotes/stunk)
+r18 = d1ae3fa05b3d82eed14ea2350ec396a21e76d06e (refs/remotes/stunk)
 1+0 records in
 1+0 records out
-24 bytes copied, 2.588e-05 s, 927 kB/s
+24 bytes copied, 2.704e-05 s, 888 kB/s
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
 Initializing parent: refs/remotes/flunk@18
 	M	readme
-r17 = 3caa787f99c30c51ca808c4b66ab3b96a728c448 (refs/remotes/flunk@18)
+r17 = b9fa7e3a7e1cf668f44d94694ad31b15ddf6a992 (refs/remotes/flunk@18)
 	M	readme
-r18 = c172ba2b7c8b183bb0a215847b8bdb9d52b40ba3 (refs/remotes/flunk@18)
-Found branch parent: (refs/remotes/flunk) c172ba2b7c8b183bb0a215847b8bdb9d52b40ba3
+r18 = d1ae3fa05b3d82eed14ea2350ec396a21e76d06e (refs/remotes/flunk@18)
+Found branch parent: (refs/remotes/flunk) d1ae3fa05b3d82eed14ea2350ec396a21e76d06e
 Following parent with do_switch
 Successfully followed parent
-r19 = a27bf4c49b6959cdd9736930efd4813bc88dd840 (refs/remotes/flunk)
+r19 = 3b327ec5cfdcbbae89841705d19366bac6a25cb3 (refs/remotes/flunk)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	readme
-r16 = ec6ec5cd312bfc5d13dfcd65a307ad6a0011ae05 (refs/remotes/stunk)
+r16 = 7958b160496d71273178f5980dfa2ffbc3046535 (refs/remotes/stunk)
 	M	readme
-r17 = 3caa787f99c30c51ca808c4b66ab3b96a728c448 (refs/remotes/stunk)
+r17 = b9fa7e3a7e1cf668f44d94694ad31b15ddf6a992 (refs/remotes/stunk)
 	M	readme
-r18 = c172ba2b7c8b183bb0a215847b8bdb9d52b40ba3 (refs/remotes/stunk)
+r18 = d1ae3fa05b3d82eed14ea2350ec396a21e76d06e (refs/remotes/stunk)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 3caa787f99c30c51ca808c4b66ab3b96a728c448
+Found branch parent: (refs/remotes/flunked) b9fa7e3a7e1cf668f44d94694ad31b15ddf6a992
 Following parent with do_switch
 Successfully followed parent
-r20 = ccf68bce3412debd9b7b040106b8a97eddeb7ae1 (refs/remotes/flunked)
+r20 = 3cd44294cc6514afc4d0a4251a6939730e63dc62 (refs/remotes/flunked)
 ok 10 - follow-parent is atomic
 
 expecting success of 9104.11 'track multi-parent paths': 
@@ -526349,7 +526334,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 = d8df2640a595fcdd0f2b0e4f47403e5ae25736e8 (refs/remotes/glob@20)
+r13 = b0baf43481108710b1e1786d3902f39399db7154 (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
@@ -526369,7 +526354,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 = 9c956f57137f8b7c61692e8bbf904048cc4257ed (refs/remotes/glob@20)
+r14 = 90bcee97b9bcef3a2efc72825fef149d758e8d0f (refs/remotes/glob@20)
 	A	drunk/readme
 	A	drunk/subversion/bindings/swig/perl/another-larger
 	A	drunk/subversion/bindings/swig/perl/native/a.pm
@@ -526380,13 +526365,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 = a311366f10d8eb77c59685233ded1076469bff4e (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) a311366f10d8eb77c59685233ded1076469bff4e
+r15 = bbb7503a8c0e1458bce102d8e44a77b9963e3692 (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) bbb7503a8c0e1458bce102d8e44a77b9963e3692
 Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading a311366f10d8eb77c59685233ded1076469bff4e
+rereading bbb7503a8c0e1458bce102d8e44a77b9963e3692
 Following parent with do_switch
 Successfully followed parent
-r21 = 078f1b2ad51117e6f7233605a7829e7a2d2344cb (refs/remotes/glob)
+r21 = ad656299e9e5281ff1b536f839fb0721c0624453 (refs/remotes/glob)
 ok 11 - track multi-parent paths
 
 expecting success of 9104.12 'multi-fetch continues to work': 
@@ -526403,82 +526388,82 @@
 	git svn multi-fetch
 	
 	A	readme
-r1 = a3dd58689b10d1a30295ba4cf860941edef05733 (refs/remotes/svn/trunk)
+r1 = d0beccaddd6eb9be4624316281abc80a2f9cc72e (refs/remotes/svn/trunk)
 	M	readme
-r2 = 123df9df9df867df393eeef3fd131c3b16b6054f (refs/remotes/svn/trunk)
+r2 = 32d1aef253976c8ea0a14d89f1bd13963dc1a84f (refs/remotes/svn/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) 123df9df9df867df393eeef3fd131c3b16b6054f
+Found branch parent: (refs/remotes/svn/thunk) 32d1aef253976c8ea0a14d89f1bd13963dc1a84f
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = c26e8e36defa7839c8913da193b31c061e58184f (refs/remotes/svn/thunk)
+r3 = 9ef2a08ecdd29903329dbacd2f1edfaba82deb7c (refs/remotes/svn/thunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) 123df9df9df867df393eeef3fd131c3b16b6054f
+Found branch parent: (refs/remotes/svn/junk) 32d1aef253976c8ea0a14d89f1bd13963dc1a84f
 Following parent with do_switch
 Successfully followed parent
-r4 = a6c8dba9a37dcc1d8800f4e970a4639e4f2b894d (refs/remotes/svn/junk)
+r4 = 133f9d82ee86b92edaaebf3a4fcc67c76e236781 (refs/remotes/svn/junk)
 	A	file
-r5 = 4ef17ff7f25054e26ee4e98e084f4979dec6f582 (refs/remotes/larger)
+r5 = 725aacdb74367c40e9dc27037393d26b7eb9ebf6 (refs/remotes/larger)
 branch_from: /larger-parent => /larger-parent/trunk/thunk/bump/thud
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) 4ef17ff7f25054e26ee4e98e084f4979dec6f582
+Found branch parent: (refs/remotes/larger-parent) 725aacdb74367c40e9dc27037393d26b7eb9ebf6
 Following parent with do_switch
 Successfully followed parent
-r6 = 379624a216ff63de3a37729945aa61520e2b4abc (refs/remotes/larger-parent)
-r9 = 484a8a6cb95d9b82471c54fc37c08e10f0430744 (refs/remotes/glob)
+r6 = 38c39a1ff4aaf956f7816f952cfdc25fd404eafd (refs/remotes/larger-parent)
+r9 = 0fe98f07acb54a4f94c93826b977b43f1d58f27d (refs/remotes/glob)
+	A	blob/hi
+r10 = fbd68909c6cd5d7007c038a70fbda0ff13bc2830 (refs/remotes/glob)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
 Initializing parent: refs/remotes/blob@9
-r7 = 3e8178b6bd24f541e2365db58dac28ba31b247c5 (refs/remotes/blob@9)
+r7 = 4d081bcae2ca51579d76306651ebb6102ac2df2a (refs/remotes/blob@9)
 	A	hi
-r8 = bd2fbe89f57081a1c286f55cbcda2e20e6468485 (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) bd2fbe89f57081a1c286f55cbcda2e20e6468485
+r8 = 66f019a9a30e848cd83f01fa4459382820d9f3be (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) 66f019a9a30e848cd83f01fa4459382820d9f3be
 Following parent with do_switch
 Successfully followed parent
-r10 = f87331fd1d001fbf44d4073ab6482d1581d523cf (refs/remotes/blob)
-	A	blob/hi
-r10 = 14219eadecb8f59348fd814fe053f0f3a212f92e (refs/remotes/glob)
-	D	hi
-	A	bye
-W: -empty_dir: glob/blob/hi
-r11 = a24f66be9999783af85e02fc36d9e71794569efa (refs/remotes/blob)
+r10 = 6d2aaf55f6b36c16570543adccfd08b59d80b324 (refs/remotes/blob)
 	D	blob/hi
 	A	blob/bye
 W: -empty_dir: glob/blob/hi
-r11 = 3dbeecc313d2654c1421212bc00d5755639c9c63 (refs/remotes/glob)
+r11 = 31e57132e1e86e0662ac233c1053e4ae5b74902d (refs/remotes/glob)
+	D	hi
+	A	bye
+W: -empty_dir: glob/blob/hi
+r11 = 293ca0d6205a28bcb24f8066c566486144611d15 (refs/remotes/blob)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/t => file:///build/reproducible-path/git-2.47.2/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 = 440d6d17e9d6132155237ce85e4d4039199f2b42 (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 440d6d17e9d6132155237ce85e4d4039199f2b42
+r13 = 67cf82b49bf5feb4d8f8541e1da9ca6ea9bf2b34 (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) 67cf82b49bf5feb4d8f8541e1da9ca6ea9bf2b34
 Following parent with do_switch
 	M	c.t
 Successfully followed parent
-r14 = 787df87c9fc78031070f6f37eb23d3e912c92d55 (refs/remotes/r9270-t)
+r14 = ebfea0c2630218617479b1a962a94cc99096a06b (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.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.47.2/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) 787df87c9fc78031070f6f37eb23d3e912c92d55
+Found branch parent: (refs/remotes/r9270-d) ebfea0c2630218617479b1a962a94cc99096a06b
 Following parent with do_switch
 Successfully followed parent
-r15 = f7ed9accd0dca38d42eea854955be0c136137ba3 (refs/remotes/r9270-d)
+r15 = 86da61ebaee713cce2d45d657168e0a4b1b6910b (refs/remotes/r9270-d)
 	A	readme
-r16 = ec6ec5cd312bfc5d13dfcd65a307ad6a0011ae05 (refs/remotes/stunk)
+r16 = 7958b160496d71273178f5980dfa2ffbc3046535 (refs/remotes/stunk)
 	M	readme
-r17 = 3caa787f99c30c51ca808c4b66ab3b96a728c448 (refs/remotes/stunk)
+r17 = b9fa7e3a7e1cf668f44d94694ad31b15ddf6a992 (refs/remotes/stunk)
 	M	readme
-r18 = c172ba2b7c8b183bb0a215847b8bdb9d52b40ba3 (refs/remotes/stunk)
+r18 = d1ae3fa05b3d82eed14ea2350ec396a21e76d06e (refs/remotes/stunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
-Found branch parent: (refs/remotes/flunk) c172ba2b7c8b183bb0a215847b8bdb9d52b40ba3
+Found branch parent: (refs/remotes/flunk) d1ae3fa05b3d82eed14ea2350ec396a21e76d06e
 Following parent with do_switch
 Successfully followed parent
-r19 = a27bf4c49b6959cdd9736930efd4813bc88dd840 (refs/remotes/flunk)
+r19 = 3b327ec5cfdcbbae89841705d19366bac6a25cb3 (refs/remotes/flunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 3caa787f99c30c51ca808c4b66ab3b96a728c448
+Found branch parent: (refs/remotes/flunked) b9fa7e3a7e1cf668f44d94694ad31b15ddf6a992
 Following parent with do_switch
 Successfully followed parent
-r20 = ccf68bce3412debd9b7b040106b8a97eddeb7ae1 (refs/remotes/flunked)
+r20 = 3cd44294cc6514afc4d0a4251a6939730e63dc62 (refs/remotes/flunked)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob, 20
 Initializing parent: refs/remotes/glob@20
 	A	trunk/readme
@@ -526491,7 +526476,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 = d8df2640a595fcdd0f2b0e4f47403e5ae25736e8 (refs/remotes/glob@20)
+r13 = b0baf43481108710b1e1786d3902f39399db7154 (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
@@ -526511,7 +526496,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 = 9c956f57137f8b7c61692e8bbf904048cc4257ed (refs/remotes/glob@20)
+r14 = 90bcee97b9bcef3a2efc72825fef149d758e8d0f (refs/remotes/glob@20)
 	A	drunk/readme
 	A	drunk/subversion/bindings/swig/perl/another-larger
 	A	drunk/subversion/bindings/swig/perl/native/a.pm
@@ -526522,133 +526507,19 @@
 	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 = a311366f10d8eb77c59685233ded1076469bff4e (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) a311366f10d8eb77c59685233ded1076469bff4e
+r15 = bbb7503a8c0e1458bce102d8e44a77b9963e3692 (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) bbb7503a8c0e1458bce102d8e44a77b9963e3692
 Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading a311366f10d8eb77c59685233ded1076469bff4e
+rereading bbb7503a8c0e1458bce102d8e44a77b9963e3692
 Following parent with do_switch
 Successfully followed parent
-r21 = 078f1b2ad51117e6f7233605a7829e7a2d2344cb (refs/remotes/glob)
+r21 = ad656299e9e5281ff1b536f839fb0721c0624453 (refs/remotes/glob)
 ok 13 - multi-fetch works off a 'clean' repository
 
 # passed all 13 test(s)
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9155-git-svn-fetch-deleted-tag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9155-git-svn-fetch-deleted-tag/.git/
-expecting success of 9155.1 'setup svn repo': 
-	mkdir -p import/trunk/subdir &&
-	mkdir -p import/branches &&
-	mkdir -p import/tags &&
-	echo "base" >import/trunk/subdir/file &&
-	svn_cmd import -m "import for git svn" import "$svnrepo" &&
-	rm -rf import &&
-
-	svn_cmd mkdir -m "create mybranch directory" "$svnrepo/branches/mybranch" &&
-	svn_cmd cp -m "create branch mybranch" "$svnrepo/trunk" "$svnrepo/branches/mybranch/trunk" &&
-
-	svn_cmd co "$svnrepo/trunk" svn_project &&
-	(cd svn_project &&
-		echo "trunk change" >>subdir/file &&
-		svn_cmd ci -m "trunk change" subdir/file &&
-
-		svn_cmd switch "$svnrepo/branches/mybranch/trunk" &&
-		echo "branch change" >>subdir/file &&
-		svn_cmd ci -m "branch change" subdir/file
-	) &&
-
-	svn_cmd cp -m "create mytag attempt 1" -r5 "$svnrepo/trunk/subdir" "$svnrepo/tags/mytag" &&
-	svn_cmd rm -m "delete mytag attempt 1" "$svnrepo/tags/mytag" &&
-	svn_cmd cp -m "create mytag attempt 2" -r5 "$svnrepo/branches/mybranch/trunk/subdir" "$svnrepo/tags/mytag"
-
-Adding         import/branches
-Adding         import/tags
-Adding         import/trunk
-Adding         import/trunk/subdir
-Adding         import/trunk/subdir/file
-Committing transaction...
-Committed revision 1.
-Committing transaction...
-Committed revision 2.
-Committing transaction...
-Committed revision 3.
-A    svn_project/subdir
-A    svn_project/subdir/file
-Checked out revision 3.
-Sending        subdir/file
-Transmitting file data .done
-Committing transaction...
-Committed revision 4.
-U    subdir/file
-Updated to revision 4.
-Sending        subdir/file
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-Committing transaction...
-Committed revision 6.
-Committing transaction...
-Committed revision 7.
-Committing transaction...
-Committed revision 8.
-ok 1 - setup svn repo
-
-expecting success of 9155.2 'fetch deleted tags from same revision with checksum error': 
-	git svn init --stdlayout "$svnrepo" git_project &&
-	cd git_project &&
-	git svn fetch &&
-
-	git diff --exit-code origin/mybranch:trunk/subdir/file origin/tags/mytag:file &&
-	git diff --exit-code main:subdir/file origin/tags/mytag^:file
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9155-git-svn-fetch-deleted-tag/git_project/.git/
-	A	subdir/file
-r1 = 7bc56f03498bfdb5c410c9cc25dee66ce93481d0 (refs/remotes/origin/trunk)
-r2 = f52168af550891489ca7e9cbfd9dfb5f27d45fe2 (refs/remotes/origin/mybranch)
-	A	trunk/subdir/file
-r3 = d83d47641c75eecab22daabe768cc716fddea7cc (refs/remotes/origin/mybranch)
-	M	subdir/file
-r4 = 49a6eaf1b021d27f4a3b42223726375bc6ac3257 (refs/remotes/origin/trunk)
-	M	trunk/subdir/file
-r5 = 1ea0c2820f065abdb4738fad98e806084517a818 (refs/remotes/origin/mybranch)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
-Initializing parent: refs/remotes/origin/tags/mytag@5
-	A	file
-r1 = 7cb4fd73c414fab79cf366ed30487da890e39467 (refs/remotes/origin/tags/mytag@5)
-	M	file
-r4 = 468b24e600a75c69f2157df305c61168632399ae (refs/remotes/origin/tags/mytag@5)
-Found branch parent: (refs/remotes/origin/tags/mytag) 468b24e600a75c69f2157df305c61168632399ae
-Following parent with do_switch
-Successfully followed parent
-r6 = 55d6d3c4765ea99dc76e5014064985395892d7e1 (refs/remotes/origin/tags/mytag)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir => file:///build/reproducible-path/git-2.47.2/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.47.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.47.2/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 = 7cb4fd73c414fab79cf366ed30487da890e39467 (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag@5-) 7cb4fd73c414fab79cf366ed30487da890e39467
-Following parent with do_switch
-Successfully followed parent
-r3 = 44be96e89434f602d637d66cf4c1a55235a04fdc (refs/remotes/origin/tags/mytag@5-)
-	M	file
-r5 = e3367dfa98f503e84a06487df1d0565854075abe (refs/remotes/origin/tags/mytag@5-)
-Found branch parent: (refs/remotes/origin/tags/mytag) e3367dfa98f503e84a06487df1d0565854075abe
-Index mismatch: 13f9c6ca01f81b94d8eca8eba510eafa2445e890 != 343cf4718d6a013cf33cf3cea8e0dc0a8efa64dc
-rereading e3367dfa98f503e84a06487df1d0565854075abe
-Following parent with do_switch
-Successfully followed parent
-r8 = bc00b0b77b6e933c66fa8991be98da8d7bc285f0 (refs/remotes/origin/tags/mytag)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk r4
-ok 2 - fetch deleted tags from same revision with checksum error
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9148-git-svn-propset.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9148-git-svn-propset/.git/
 expecting success of 9148.1 'setup propset via import': 
@@ -526687,7 +526558,7 @@
 	A	foo
 	A	subdir/foo_subdir
 	A	subdir/subdir2/foo_subdir2
-r1 = 2e725d5179fdcc800ba2eb45e9efdd185a268962 (refs/remotes/git-svn)
+r1 = 793517469df38ff9fab676793b7c37fa0afce70d (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9148-git-svn-propset/svnrepo r1
 ok 3 - fetch revisions from svn
@@ -526699,7 +526570,7 @@
 	confirm_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
 	rm -rf svn_project
 	
-[master 50001d2] testing propset
+[master 1924a2b] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -526707,8 +526578,8 @@
 	M	foo
 Committed r2
 	M	foo
-r2 = 522bb8b3a27d3d68bde55eae0ad3a956e5243675 (refs/remotes/git-svn)
-No changes between 50001d2bd8a5f1ee0f6758631b7a75edd9d7c78f and refs/remotes/git-svn
+r2 = 612cc3e1655ca6e516416718c2a0cde7c29c724a (refs/remotes/git-svn)
+No changes between 1924a2b469cc07d8ecdf7bae686f4e656d54a7b8 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -526727,7 +526598,7 @@
 		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
 	rm -rf svn_project
 	
-[master 2a0e41b] testing propset
+[master a90619c] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -526735,8 +526606,8 @@
 	M	foo
 Committed r3
 	M	foo
-r3 = 4ccd8950c231e9cfeb17e27b7ec52891fe4dacdc (refs/remotes/git-svn)
-No changes between 2a0e41b605ef2d3027029e71dc81f59f83938c21 and refs/remotes/git-svn
+r3 = a62875c94816a1f16045e57f1843d9db320373b8 (refs/remotes/git-svn)
+No changes between a90619c648ab464b5fd6388d56fc1ea942f089e4 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -526753,7 +526624,7 @@
 	confirm_props "." "$foo_subdir2" "svn:keywords" "FreeBSD=%H" &&
 	rm -rf svn_project
 	
-[master 5498f18] testing propset
+[master 082a00b] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -526761,8 +526632,8 @@
 	M	subdir/subdir2/foo_subdir2
 Committed r4
 	M	subdir/subdir2/foo_subdir2
-r4 = a7b5979625935c94addb6d493da22e06f8d3fea8 (refs/remotes/git-svn)
-No changes between 5498f18bde8da85347bcf4b73ef0f1ea0f6b7307 and refs/remotes/git-svn
+r4 = 6ff7e44c1b35055a1a275aba8b4b44d2ff143fd6 (refs/remotes/git-svn)
+No changes between 082a00b8b167e473158ba8f18ac516770a9fe2a5 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -526781,7 +526652,7 @@
 		svn:keywords "FreeBSD=%H" &&
 	rm -rf svn_project
 	
-[master ae02e22] testing propset
+[master dc360fe] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -526789,8 +526660,8 @@
 	M	subdir/foo_subdir
 Committed r5
 	M	subdir/foo_subdir
-r5 = 516de05a30f6e23607af553b785ff00bebddfd4c (refs/remotes/git-svn)
-No changes between ae02e222ce1813a49e99f4460980e408b22f1d46 and refs/remotes/git-svn
+r5 = db1ccdf55cc67a7b3a208cc70f4c1d9610088cc1 (refs/remotes/git-svn)
+No changes between dc360fec81f1ee97d6b2656b541de5310abf6ab3 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -526804,125 +526675,115 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9156-git-svn-fetch-deleted-tag-2.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/.git/
-expecting success of 9156.1 'setup svn repo': 
+*** t9155-git-svn-fetch-deleted-tag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9155-git-svn-fetch-deleted-tag/.git/
+expecting success of 9155.1 'setup svn repo': 
+	mkdir -p import/trunk/subdir &&
 	mkdir -p import/branches &&
 	mkdir -p import/tags &&
-	mkdir -p import/trunk/subdir1 &&
-	mkdir -p import/trunk/subdir2 &&
-	mkdir -p import/trunk/subdir3 &&
-	echo "file1" >import/trunk/subdir1/file &&
-	echo "file2" >import/trunk/subdir2/file &&
-	echo "file3" >import/trunk/subdir3/file &&
+	echo "base" >import/trunk/subdir/file &&
 	svn_cmd import -m "import for git svn" import "$svnrepo" &&
 	rm -rf import &&
 
+	svn_cmd mkdir -m "create mybranch directory" "$svnrepo/branches/mybranch" &&
+	svn_cmd cp -m "create branch mybranch" "$svnrepo/trunk" "$svnrepo/branches/mybranch/trunk" &&
+
 	svn_cmd co "$svnrepo/trunk" svn_project &&
 	(cd svn_project &&
-		echo "change1" >>subdir1/file &&
-		echo "change2" >>subdir2/file &&
-		echo "change3" >>subdir3/file &&
-		svn_cmd ci -m "change" .
+		echo "trunk change" >>subdir/file &&
+		svn_cmd ci -m "trunk change" subdir/file &&
+
+		svn_cmd switch "$svnrepo/branches/mybranch/trunk" &&
+		echo "branch change" >>subdir/file &&
+		svn_cmd ci -m "branch change" subdir/file
 	) &&
 
-	svn_cmd cp -m "create mytag 1" -r2 "$svnrepo/trunk/subdir1" "$svnrepo/tags/mytag" &&
-	svn_cmd rm -m "delete mytag 1" "$svnrepo/tags/mytag" &&
-	svn_cmd cp -m "create mytag 2" -r2 "$svnrepo/trunk/subdir2" "$svnrepo/tags/mytag" &&
-	svn_cmd rm -m "delete mytag 2" "$svnrepo/tags/mytag" &&
-	svn_cmd cp -m "create mytag 3" -r2 "$svnrepo/trunk/subdir3" "$svnrepo/tags/mytag"
+	svn_cmd cp -m "create mytag attempt 1" -r5 "$svnrepo/trunk/subdir" "$svnrepo/tags/mytag" &&
+	svn_cmd rm -m "delete mytag attempt 1" "$svnrepo/tags/mytag" &&
+	svn_cmd cp -m "create mytag attempt 2" -r5 "$svnrepo/branches/mybranch/trunk/subdir" "$svnrepo/tags/mytag"
 
 Adding         import/branches
 Adding         import/tags
 Adding         import/trunk
-Adding         import/trunk/subdir1
-Adding         import/trunk/subdir1/file
-Adding         import/trunk/subdir2
-Adding         import/trunk/subdir2/file
-Adding         import/trunk/subdir3
-Adding         import/trunk/subdir3/file
+Adding         import/trunk/subdir
+Adding         import/trunk/subdir/file
 Committing transaction...
 Committed revision 1.
-A    svn_project/subdir1
-A    svn_project/subdir1/file
-A    svn_project/subdir2
-A    svn_project/subdir2/file
-A    svn_project/subdir3
-A    svn_project/subdir3/file
-Checked out revision 1.
-Sending        subdir1/file
-Sending        subdir2/file
-Sending        subdir3/file
-Transmitting file data ...done
 Committing transaction...
 Committed revision 2.
 Committing transaction...
 Committed revision 3.
+A    svn_project/subdir
+A    svn_project/subdir/file
+Checked out revision 3.
+Sending        subdir/file
+Transmitting file data .done
 Committing transaction...
 Committed revision 4.
+U    subdir/file
+Updated to revision 4.
+Sending        subdir/file
+Transmitting file data .done
 Committing transaction...
 Committed revision 5.
 Committing transaction...
 Committed revision 6.
 Committing transaction...
 Committed revision 7.
+Committing transaction...
+Committed revision 8.
 ok 1 - setup svn repo
 
-expecting success of 9156.2 'fetch deleted tags from same revision with no checksum error': 
+expecting success of 9155.2 'fetch deleted tags from same revision with checksum error': 
 	git svn init --stdlayout "$svnrepo" git_project &&
 	cd git_project &&
 	git svn fetch &&
 
-	git diff --exit-code main:subdir3/file origin/tags/mytag:file &&
-	git diff --exit-code main:subdir2/file origin/tags/mytag^:file &&
-	git diff --exit-code main:subdir1/file origin/tags/mytag^^:file
+	git diff --exit-code origin/mybranch:trunk/subdir/file origin/tags/mytag:file &&
+	git diff --exit-code main:subdir/file origin/tags/mytag^:file
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/git_project/.git/
-	A	subdir1/file
-	A	subdir2/file
-	A	subdir3/file
-r1 = 801e732e2ce6040b643d631f57c9750eb90fa0c5 (refs/remotes/origin/trunk)
-	M	subdir1/file
-	M	subdir2/file
-	M	subdir3/file
-r2 = 8887b2db3a0dbe677f78e402dbc968ca8804e495 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir1 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/tags/mytag, 2
-Initializing parent: refs/remotes/origin/tags/mytag@2
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9155-git-svn-fetch-deleted-tag/git_project/.git/
+	A	subdir/file
+r1 = 6e55c1cf30a1a31ba8a10fc734c431792d960ed4 (refs/remotes/origin/trunk)
+r2 = 6ba3a9525cca1de8f52ee019a3aeb6688ffff9b7 (refs/remotes/origin/mybranch)
+	A	trunk/subdir/file
+r3 = fc92d5c32598a53e248d1d54a9600b945d72427e (refs/remotes/origin/mybranch)
+	M	subdir/file
+r4 = 25250d0809c4dabf423a718c272b3bf8320d3165 (refs/remotes/origin/trunk)
+	M	trunk/subdir/file
+r5 = 095ae05a296ec76ba24d2c0a2af25633de40f75e (refs/remotes/origin/mybranch)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
+Initializing parent: refs/remotes/origin/tags/mytag@5
 	A	file
-r1 = 2411fb11221870821ab818194fb1b4180d3809e4 (refs/remotes/origin/tags/mytag@2)
+r1 = 38dcd432f37922accc7581caa34ddec806d76373 (refs/remotes/origin/tags/mytag@5)
 	M	file
-r2 = fccd553d91d3a08c6ae018ffcbeb4ccc42e1a630 (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag) fccd553d91d3a08c6ae018ffcbeb4ccc42e1a630
+r4 = df9999421a2adeee136bdc2f4c3e80a36646e7aa (refs/remotes/origin/tags/mytag@5)
+Found branch parent: (refs/remotes/origin/tags/mytag) df9999421a2adeee136bdc2f4c3e80a36646e7aa
 Following parent with do_switch
 Successfully followed parent
-r3 = a58668b1d98f5024787499909f71173b5308f5a5 (refs/remotes/origin/tags/mytag)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir2 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/tags/mytag, 2
-Initializing parent: refs/remotes/origin/tags/mytag@2-
+r6 = 37515e90a6fa38ab90e0ed2b452640e2964e6913 (refs/remotes/origin/tags/mytag)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir => file:///build/reproducible-path/git-2.47.2/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.47.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.47.2/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 = 3d68d86b64ad98f767ac30290ecb8d13712be1c0 (refs/remotes/origin/tags/mytag@2-)
-	M	file
-r2 = c7f684096278498c24996a9e3a88d36079586d3d (refs/remotes/origin/tags/mytag@2-)
-Found branch parent: (refs/remotes/origin/tags/mytag) c7f684096278498c24996a9e3a88d36079586d3d
-Index mismatch: 03a4eca29b077f8b0867e84854a2c6e71eeac380 != 7745dab6988f4d78b3241eec1b66b56c15e67e83
-rereading c7f684096278498c24996a9e3a88d36079586d3d
+r1 = 38dcd432f37922accc7581caa34ddec806d76373 (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag@5-) 38dcd432f37922accc7581caa34ddec806d76373
 Following parent with do_switch
 Successfully followed parent
-r5 = a3f78f4da31dd2025f835b292e38c8714761b7b1 (refs/remotes/origin/tags/mytag)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir3 => file:///build/reproducible-path/git-2.47.2/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 = 6d22255444765e833aab5ebfee6c61433d3d9b02 (refs/remotes/origin/tags/mytag@2--)
+r3 = a6d191feb6962050b190da99172d97348cc8ce67 (refs/remotes/origin/tags/mytag@5-)
 	M	file
-r2 = 40ca675bc21e7f1ae7540aa7f78705d288c6fefa (refs/remotes/origin/tags/mytag@2--)
-Found branch parent: (refs/remotes/origin/tags/mytag) 40ca675bc21e7f1ae7540aa7f78705d288c6fefa
-Index mismatch: de577018db9919b0130637aa9ac28b5dabe70913 != 03a4eca29b077f8b0867e84854a2c6e71eeac380
-rereading 40ca675bc21e7f1ae7540aa7f78705d288c6fefa
+r5 = e5c33d86ca86c462a9cdf61782a63c08495043a2 (refs/remotes/origin/tags/mytag@5-)
+Found branch parent: (refs/remotes/origin/tags/mytag) e5c33d86ca86c462a9cdf61782a63c08495043a2
+Index mismatch: 13f9c6ca01f81b94d8eca8eba510eafa2445e890 != 343cf4718d6a013cf33cf3cea8e0dc0a8efa64dc
+rereading e5c33d86ca86c462a9cdf61782a63c08495043a2
 Following parent with do_switch
 Successfully followed parent
-r7 = bcec4c0bc6e134c3a866da9126e53d459fce1ffe (refs/remotes/origin/tags/mytag)
+r8 = 91e7c0b10406ef5287ac07bb29b3d4bfec0be767 (refs/remotes/origin/tags/mytag)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/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
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk r4
+ok 2 - fetch deleted tags from same revision with checksum error
 
 # passed all 2 test(s)
 1..2
@@ -526982,8 +526843,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9147-git-svn-include-paths/g/.git/
 	A	qqq/test_qqq.txt
-r1 = 211671b3403ff1eba3182474aa1a3ebbda4fcab0 (refs/remotes/git-svn)
-r2 = 925057d5b426a1a9fd186f07591cada96cdc2c27 (refs/remotes/git-svn)
+r1 = 92fb0e65b4d604dc32fe59f7b3544db4610fc61e (refs/remotes/git-svn)
+r2 = 4f3b1963f46ec2dbeb5e2251386f18b23128be9a (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
 ok 2 - clone an SVN repository with filter to include qqq directory
@@ -526998,8 +526859,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9147-git-svn-include-paths/c/.git/
 	A	qqq/test_qqq.txt
-r1 = 211671b3403ff1eba3182474aa1a3ebbda4fcab0 (refs/remotes/git-svn)
-r2 = 925057d5b426a1a9fd186f07591cada96cdc2c27 (refs/remotes/git-svn)
+r1 = 92fb0e65b4d604dc32fe59f7b3544db4610fc61e (refs/remotes/git-svn)
+r2 = 4f3b1963f46ec2dbeb5e2251386f18b23128be9a (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
 ok 3 - init+fetch an SVN repository with included qqq directory
@@ -527042,7 +526903,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = b073e3beeb9071913d67c9a6eae194aa1ddd29b3 (refs/remotes/git-svn)
+r3 = 77b6ca247d66f5fbde7615901fb5d0ae7d21dd19 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 6 - update git svn-cloned repo (config include)
 
@@ -527057,7 +526918,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = b073e3beeb9071913d67c9a6eae194aa1ddd29b3 (refs/remotes/git-svn)
+r3 = 77b6ca247d66f5fbde7615901fb5d0ae7d21dd19 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 7 - update git svn-cloned repo (option include)
 
@@ -527089,7 +526950,7 @@
 		rm expect expect2
 	)
 
-r4 = f15141aa9e0e9c0a419af377909b89742e09212c (refs/remotes/git-svn)
+r4 = 5c3472d3e5a96004a07adb9781cdb48567747e55 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 9 - update git svn-cloned repo (config include)
 
@@ -527103,7 +526964,7 @@
 		rm expect expect2
 	)
 
-r4 = f15141aa9e0e9c0a419af377909b89742e09212c (refs/remotes/git-svn)
+r4 = 5c3472d3e5a96004a07adb9781cdb48567747e55 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 10 - update git svn-cloned repo (option include)
 
@@ -527138,7 +526999,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = e8a040a69bf5f628b985ae6625e77622f91b9f6f (refs/remotes/git-svn)
+r5 = 7669dea0d3f11c9e29d2ce428e2eacae3260721a (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 12 - update git svn-cloned repo again (config include)
 
@@ -527153,7 +527014,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = e8a040a69bf5f628b985ae6625e77622f91b9f6f (refs/remotes/git-svn)
+r5 = 7669dea0d3f11c9e29d2ce428e2eacae3260721a (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 13 - update git svn-cloned repo again (option include)
 
@@ -527161,6 +527022,226 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9156-git-svn-fetch-deleted-tag-2.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/.git/
+expecting success of 9156.1 'setup svn repo': 
+	mkdir -p import/branches &&
+	mkdir -p import/tags &&
+	mkdir -p import/trunk/subdir1 &&
+	mkdir -p import/trunk/subdir2 &&
+	mkdir -p import/trunk/subdir3 &&
+	echo "file1" >import/trunk/subdir1/file &&
+	echo "file2" >import/trunk/subdir2/file &&
+	echo "file3" >import/trunk/subdir3/file &&
+	svn_cmd import -m "import for git svn" import "$svnrepo" &&
+	rm -rf import &&
+
+	svn_cmd co "$svnrepo/trunk" svn_project &&
+	(cd svn_project &&
+		echo "change1" >>subdir1/file &&
+		echo "change2" >>subdir2/file &&
+		echo "change3" >>subdir3/file &&
+		svn_cmd ci -m "change" .
+	) &&
+
+	svn_cmd cp -m "create mytag 1" -r2 "$svnrepo/trunk/subdir1" "$svnrepo/tags/mytag" &&
+	svn_cmd rm -m "delete mytag 1" "$svnrepo/tags/mytag" &&
+	svn_cmd cp -m "create mytag 2" -r2 "$svnrepo/trunk/subdir2" "$svnrepo/tags/mytag" &&
+	svn_cmd rm -m "delete mytag 2" "$svnrepo/tags/mytag" &&
+	svn_cmd cp -m "create mytag 3" -r2 "$svnrepo/trunk/subdir3" "$svnrepo/tags/mytag"
+
+Adding         import/branches
+Adding         import/tags
+Adding         import/trunk
+Adding         import/trunk/subdir1
+Adding         import/trunk/subdir1/file
+Adding         import/trunk/subdir2
+Adding         import/trunk/subdir2/file
+Adding         import/trunk/subdir3
+Adding         import/trunk/subdir3/file
+Committing transaction...
+Committed revision 1.
+A    svn_project/subdir1
+A    svn_project/subdir1/file
+A    svn_project/subdir2
+A    svn_project/subdir2/file
+A    svn_project/subdir3
+A    svn_project/subdir3/file
+Checked out revision 1.
+Sending        subdir1/file
+Sending        subdir2/file
+Sending        subdir3/file
+Transmitting file data ...done
+Committing transaction...
+Committed revision 2.
+Committing transaction...
+Committed revision 3.
+Committing transaction...
+Committed revision 4.
+Committing transaction...
+Committed revision 5.
+Committing transaction...
+Committed revision 6.
+Committing transaction...
+Committed revision 7.
+ok 1 - setup svn repo
+
+expecting success of 9156.2 'fetch deleted tags from same revision with no checksum error': 
+	git svn init --stdlayout "$svnrepo" git_project &&
+	cd git_project &&
+	git svn fetch &&
+
+	git diff --exit-code main:subdir3/file origin/tags/mytag:file &&
+	git diff --exit-code main:subdir2/file origin/tags/mytag^:file &&
+	git diff --exit-code main:subdir1/file origin/tags/mytag^^:file
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/git_project/.git/
+	A	subdir1/file
+	A	subdir2/file
+	A	subdir3/file
+r1 = 31a83a86f0d286af1efc6158458d5bf523db244a (refs/remotes/origin/trunk)
+	M	subdir1/file
+	M	subdir2/file
+	M	subdir3/file
+r2 = d2d757061738b632cc6ce6c4721fed8e17033041 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir1 => file:///build/reproducible-path/git-2.47.2/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 = ba0b82ac351a7704049ce90e5d936765d6d6cb21 (refs/remotes/origin/tags/mytag@2)
+	M	file
+r2 = 797d0ef69d56612291be79dfdc41a2bf26e8c18f (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag) 797d0ef69d56612291be79dfdc41a2bf26e8c18f
+Following parent with do_switch
+Successfully followed parent
+r3 = d94bd1ffd7a3ca4fd81ad9211de6ba26cc7695a2 (refs/remotes/origin/tags/mytag)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir2 => file:///build/reproducible-path/git-2.47.2/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 = 0321e5cda96e004a9c4c84a5eb1de1eb71662d9c (refs/remotes/origin/tags/mytag@2-)
+	M	file
+r2 = 67b7c5dd2a06be5acf36905923d7416e1f53f042 (refs/remotes/origin/tags/mytag@2-)
+Found branch parent: (refs/remotes/origin/tags/mytag) 67b7c5dd2a06be5acf36905923d7416e1f53f042
+Index mismatch: 03a4eca29b077f8b0867e84854a2c6e71eeac380 != 7745dab6988f4d78b3241eec1b66b56c15e67e83
+rereading 67b7c5dd2a06be5acf36905923d7416e1f53f042
+Following parent with do_switch
+Successfully followed parent
+r5 = 1546cc7fed8a49c9fb8d43d507c5d2937f1ce6b0 (refs/remotes/origin/tags/mytag)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir3 => file:///build/reproducible-path/git-2.47.2/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 = 525df04803566386f9cf22e891838a4c0377616b (refs/remotes/origin/tags/mytag@2--)
+	M	file
+r2 = 10a95d2ddb51393cf15bb7659b1b3912cfd5cfbd (refs/remotes/origin/tags/mytag@2--)
+Found branch parent: (refs/remotes/origin/tags/mytag) 10a95d2ddb51393cf15bb7659b1b3912cfd5cfbd
+Index mismatch: de577018db9919b0130637aa9ac28b5dabe70913 != 03a4eca29b077f8b0867e84854a2c6e71eeac380
+rereading 10a95d2ddb51393cf15bb7659b1b3912cfd5cfbd
+Following parent with do_switch
+Successfully followed parent
+r7 = 383bbe2a4795d40499c4d242b8621e925438f642 (refs/remotes/origin/tags/mytag)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/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
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9158-git-svn-mergeinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 = 7f1ad8b22fdbc4a1846df279a980bef29c4f32ed (refs/remotes/git-svn)
+	A	foo
+r2 = 97540d508e421e693accbfd761448fdcf666a90f (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/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 8499913] 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.47.2/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.47.2/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
+r3 = d5b5ca4c19d9d40009cb972ecc42b2d258ea358a (refs/remotes/git-svn)
+No changes between 849991361c37a970e8afc2d6633a07de3261ee89 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 83cfafb] 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.47.2/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.47.2/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
+Couldn't find revmap for file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
+r4 = 33834d9e1be809941fa29f3632e8798a9b94875f (refs/remotes/git-svn)
+No changes between 83cfafbdea2276df1d24e8878000b16c22fc4a6e 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9157-git-svn-fetch-merge.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9157-git-svn-fetch-merge/.git/
 expecting success of 9157.1 'initialize source svn repo': 
@@ -527268,142 +527349,46 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = 9e12be7cebd8a1d62fe77c668c5059caa492a50b (refs/remotes/origin/trunk)
+r1 = 237b23b0ad3ac83710e2e6047a803a8acd3493b1 (refs/remotes/origin/trunk)
 	A	foo
-r3 = 5ac7918d47b8a758f9dfa97ba16dbb67bcce36dd (refs/remotes/origin/trunk)
+r3 = b9719691216577c296dafb71e667dfa717a75a94 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 5ac7918d47b8a758f9dfa97ba16dbb67bcce36dd
+Found branch parent: (refs/remotes/origin/branch1) b9719691216577c296dafb71e667dfa717a75a94
 Following parent with do_switch
 Successfully followed parent
-r4 = 0b856cc1d279ca93445849a6cd2305229a814d59 (refs/remotes/origin/branch1)
+r4 = ac9cf4b72217d63cdfb2865dffb16760e11a4551 (refs/remotes/origin/branch1)
 	A	bar
-r5 = d52fccbbbe71e89919d86ada4036dedaee689e8a (refs/remotes/origin/trunk)
+r5 = 100c9a57537fa5abb6c583d05da0f265d58f355c (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) d52fccbbbe71e89919d86ada4036dedaee689e8a
+Found branch parent: (refs/remotes/origin/branch2) 100c9a57537fa5abb6c583d05da0f265d58f355c
 Following parent with do_switch
 Successfully followed parent
-r6 = 983c822245dfe78dd1178a508f33f7937a987682 (refs/remotes/origin/branch2)
+r6 = 70cd41bb92b3809951bf593dbc3be6ec83b316ba (refs/remotes/origin/branch2)
 	A	baz
-r7 = e441158491ff28dab9bb35a2cb8a0ffbf1506d6d (refs/remotes/origin/branch1)
+r7 = eb6437b091b342c0822b9fc4aa8c7280fb89fab2 (refs/remotes/origin/branch1)
 	A	baz
 Checking svn:mergeinfo changes since r5: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-7): e441158491ff28dab9bb35a2cb8a0ffbf1506d6d
-r8 = b827846862f631fb8912a80825f7f7b333357476 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-7): eb6437b091b342c0822b9fc4aa8c7280fb89fab2
+r8 = 57cb08f5fd25aa05af6a43a294fb297e9611d5f1 (refs/remotes/origin/trunk)
 	A	baz
 Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-8): e441158491ff28dab9bb35a2cb8a0ffbf1506d6d
-r9 = 1be5060ce7dfb80bd8ccb31b7d95af07673a283f (refs/remotes/origin/branch2)
+Found merge parent (/branches/branch1:4-8): eb6437b091b342c0822b9fc4aa8c7280fb89fab2
+r9 = 618c3509a2feeaa5670053dca51cea2461815402 (refs/remotes/origin/branch2)
 Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
-Found merge parent (/branches/branch2:6-9): 1be5060ce7dfb80bd8ccb31b7d95af07673a283f
-r10 = d4d8f2d19497841ffa83a1c9a0d2396d715a4b12 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch2:6-9): 618c3509a2feeaa5670053dca51cea2461815402
+r10 = f4680e3207636ebdb891c77f5c49abc2040177f0 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/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
-1be5060ce7dfb80bd8ccb31b7d95af07673a283f
+618c3509a2feeaa5670053dca51cea2461815402
 ok 3 - verify merge commit
 
 # passed all 3 test(s)
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9158-git-svn-mergeinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 = 83e8f2072e7548fe9897ac0c1e835b1b91db0621 (refs/remotes/git-svn)
-	A	foo
-r2 = 8c8158f7d813568d90bdbfa078ac6247f4044674 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/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 7c78d04] 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.47.2/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.47.2/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
-r3 = 8cb5a993a56e39122d2912a557ef3f30fb64db0c (refs/remotes/git-svn)
-No changes between 7c78d0484dda448c43c0832e0a02d1eb100d6405 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 82fa2b5] 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.47.2/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.47.2/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
-Couldn't find revmap for file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
-r4 = 4a03e76678301e91056640550bd93af8d7581a74 (refs/remotes/git-svn)
-No changes between 82fa2b594a55024fa4d92965c02cceed93d661e7 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9154-git-svn-fancy-glob.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9154-git-svn-fancy-glob/.git/
 expecting success of 9154.1 'load svn repo': 
@@ -527510,6 +527495,111 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9159-git-svn-no-parent-mergeinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9159-git-svn-no-parent-mergeinfo/.git/
+expecting success of 9159.1 'test handling of root commits in merge ranges': 
+	mkdir -p init/trunk init/branches init/tags &&
+	echo "r1" > init/trunk/file.txt &&
+	svn_cmd import -m "initial import" init "$svnrepo" &&
+	svn_cmd co "$svnrepo" tmp &&
+	(
+		cd tmp &&
+		echo "r2" > trunk/file.txt &&
+		svn_cmd commit -m "Modify file.txt on trunk" &&
+		svn_cmd cp trunk@1 branches/a &&
+		svn_cmd commit -m "Create branch a from trunk r1" &&
+		svn_cmd propset svn:mergeinfo /trunk:1-2 branches/a &&
+		svn_cmd commit -m "Fake merge of trunk r2 into branch a" &&
+		mkdir branches/b &&
+		echo "r5" > branches/b/file2.txt &&
+		svn_cmd add branches/b &&
+		svn_cmd commit -m "Create branch b from thin air" &&
+		echo "r6" > branches/b/file2.txt &&
+		svn_cmd commit -m "Modify file2.txt on branch b" &&
+		svn_cmd cp branches/b@5 branches/c &&
+		svn_cmd commit -m "Create branch c from branch b r5" &&
+		svn_cmd propset svn:mergeinfo /branches/b:5-6 branches/c &&
+		svn_cmd commit -m "Fake merge of branch b r6 into branch c"
+	) &&
+	git svn init -s "$svnrepo" &&
+	git svn fetch
+	
+Adding         init/branches
+Adding         init/tags
+Adding         init/trunk
+Adding         init/trunk/file.txt
+Committing transaction...
+Committed revision 1.
+A    tmp/branches
+A    tmp/tags
+A    tmp/trunk
+A    tmp/trunk/file.txt
+Checked out revision 1.
+Sending        trunk/file.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+A         branches/a
+A         branches/a/file.txt
+Adding         branches/a
+Committing transaction...
+Committed revision 3.
+property 'svn:mergeinfo' set on 'branches/a'
+Sending        branches/a
+Committing transaction...
+Committed revision 4.
+A         branches/b
+A         branches/b/file2.txt
+Adding         branches/b
+Adding         branches/b/file2.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 5.
+Sending        branches/b/file2.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 6.
+A         branches/c
+A         branches/c/file2.txt
+Adding         branches/c
+Committing transaction...
+Committed revision 7.
+property 'svn:mergeinfo' set on 'branches/c'
+Sending        branches/c
+Committing transaction...
+Committed revision 8.
+	A	file.txt
+r1 = 12f72fd011e8daa0fa660db9e00acfe74ccc9efc (refs/remotes/origin/trunk)
+	M	file.txt
+r2 = a296430e3127c43ee86e475f8c8576c5448b4cd7 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
+Found branch parent: (refs/remotes/origin/a) 12f72fd011e8daa0fa660db9e00acfe74ccc9efc
+Following parent with do_switch
+Successfully followed parent
+r3 = 45b0734057ea7a48211331b5b85cc230dec7d9df (refs/remotes/origin/a)
+Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
+Found merge parent (/trunk:1-2): a296430e3127c43ee86e475f8c8576c5448b4cd7
+r4 = e659a4b295169db5ed08ea53317cbccebf9a7565 (refs/remotes/origin/a)
+	A	file2.txt
+r5 = 10af49621a2ac7dedaf93d80cd42289b87f3b87a (refs/remotes/origin/b)
+	M	file2.txt
+r6 = bd2540018776309ee629f5baa611e83ebb321523 (refs/remotes/origin/b)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
+Found branch parent: (refs/remotes/origin/c) 10af49621a2ac7dedaf93d80cd42289b87f3b87a
+Following parent with do_switch
+Successfully followed parent
+r7 = d8ed0191782edf851be8d557d03fe9401b7a50c7 (refs/remotes/origin/c)
+Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
+Found merge parent (/branches/b:5-6): bd2540018776309ee629f5baa611e83ebb321523
+r8 = a583b59fc2ef0078283c4a86a1e5a01f1b3d999f (refs/remotes/origin/c)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk r2
+ok 1 - test handling of root commits in merge ranges
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9146-git-svn-empty-dirs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9146-git-svn-empty-dirs/.git/
 expecting success of 9146.1 'initialize repo': 
@@ -527537,19 +527627,19 @@
 expecting success of 9146.2 'clone': git svn clone "$svnrepo" cloned
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9146-git-svn-empty-dirs/cloned/.git/
 W: +empty_dir: a
-r1 = 1d708cfc5ac368f3e3b5012fd74930cd3d627f15 (refs/remotes/git-svn)
+r1 = 21e523606a083b93ded756ae96522f33b95c1234 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 28449976fbcbd82df9c5ea10cbd8274cb41130e3 (refs/remotes/git-svn)
+r2 = 8dbfb0403507a52506aa6fdcd56735ec52bb3c7f (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = bfb78fa8b2a73fe35c33060ed59072c6b56f0666 (refs/remotes/git-svn)
+r3 = eec8b507a8c36dcdd5030e83376f7f5b64773d19 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = ea568542e0582ef8bb2ed3d004a09e7f53d7db10 (refs/remotes/git-svn)
+r4 = 323861ee4ce4bd884ca965ed65e01f087f9e2a2b (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = 23c092fcd7339a77ef1fa4491a9e330a78de23fb (refs/remotes/git-svn)
+r5 = 312a6027e08eb9699d3d75b11b9f3d59910da00f (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = e1d9db25dd39ea6acf2d0c7e347d4853ea10cd6f (refs/remotes/git-svn)
+r6 = f6579674d5f8738829aeb3fb3d26ebd927f302be (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 39817f04b5dc061a794deaeff940d88717c359ea (refs/remotes/git-svn)
+r7 = df715bcb6bd4567fc2760c007ca160acce2673f8 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
 creating empty directory: a
@@ -527586,19 +527676,19 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9146-git-svn-empty-dirs/cloned-no-mkdirs/.git/
 W: +empty_dir: a
-r1 = 1d708cfc5ac368f3e3b5012fd74930cd3d627f15 (refs/remotes/git-svn)
+r1 = 21e523606a083b93ded756ae96522f33b95c1234 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 28449976fbcbd82df9c5ea10cbd8274cb41130e3 (refs/remotes/git-svn)
+r2 = 8dbfb0403507a52506aa6fdcd56735ec52bb3c7f (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = bfb78fa8b2a73fe35c33060ed59072c6b56f0666 (refs/remotes/git-svn)
+r3 = eec8b507a8c36dcdd5030e83376f7f5b64773d19 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = ea568542e0582ef8bb2ed3d004a09e7f53d7db10 (refs/remotes/git-svn)
+r4 = 323861ee4ce4bd884ca965ed65e01f087f9e2a2b (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = 23c092fcd7339a77ef1fa4491a9e330a78de23fb (refs/remotes/git-svn)
+r5 = 312a6027e08eb9699d3d75b11b9f3d59910da00f (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = e1d9db25dd39ea6acf2d0c7e347d4853ea10cd6f (refs/remotes/git-svn)
+r6 = f6579674d5f8738829aeb3fb3d26ebd927f302be (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 39817f04b5dc061a794deaeff940d88717c359ea (refs/remotes/git-svn)
+r7 = df715bcb6bd4567fc2760c007ca160acce2673f8 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
 ok 4 - option automkdirs set to false
@@ -527615,7 +527705,7 @@
 	test_path_is_dir cloned/"! !"
 
 W: +empty_dir: ! !
-r8 = e0a6fee9b78d7d5e6d27b3aa2b469ae8b12c06d6 (refs/remotes/git-svn)
+r8 = 67068af5a13ce704e67ebad5c4eb9386cb51de65 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 creating empty directory: ! !
 ok 6 - git svn rebase creates empty directory
@@ -527683,11 +527773,11 @@
 
 expecting success of 9146.10 'clone trunk': git svn clone -s "$svnrepo" trunk
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9146-git-svn-empty-dirs/trunk/.git/
-r9 = aede1f439824dde3d35cba4fd45f3003f4e2f698 (refs/remotes/origin/trunk)
+r9 = 1b8efe555877695086ec7afb1f07f4d563910fe5 (refs/remotes/origin/trunk)
 W: +empty_dir: trunk/a
-r10 = 4c524f2ac5025a4fe18751f9e18430f724cdbb31 (refs/remotes/origin/trunk)
+r10 = 61f2524b593e8cc3829d65bff412a54dc9c1ab10 (refs/remotes/origin/trunk)
 W: +empty_dir: trunk/weird file name
-r11 = f957af065a745f5ee40882ca29462b27bf74e6e0 (refs/remotes/origin/trunk)
+r11 = 9c16635e99dd292107bd0e744bcb50a19839d091 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo/trunk r11
 creating empty directory: a
@@ -527719,30 +527809,30 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9146-git-svn-empty-dirs/removed/.git/
 W: +empty_dir: a
-r1 = 1d708cfc5ac368f3e3b5012fd74930cd3d627f15 (refs/remotes/git-svn)
+r1 = 21e523606a083b93ded756ae96522f33b95c1234 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 28449976fbcbd82df9c5ea10cbd8274cb41130e3 (refs/remotes/git-svn)
+r2 = 8dbfb0403507a52506aa6fdcd56735ec52bb3c7f (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = bfb78fa8b2a73fe35c33060ed59072c6b56f0666 (refs/remotes/git-svn)
+r3 = eec8b507a8c36dcdd5030e83376f7f5b64773d19 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = ea568542e0582ef8bb2ed3d004a09e7f53d7db10 (refs/remotes/git-svn)
+r4 = 323861ee4ce4bd884ca965ed65e01f087f9e2a2b (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = 23c092fcd7339a77ef1fa4491a9e330a78de23fb (refs/remotes/git-svn)
+r5 = 312a6027e08eb9699d3d75b11b9f3d59910da00f (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = e1d9db25dd39ea6acf2d0c7e347d4853ea10cd6f (refs/remotes/git-svn)
+r6 = f6579674d5f8738829aeb3fb3d26ebd927f302be (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 39817f04b5dc061a794deaeff940d88717c359ea (refs/remotes/git-svn)
+r7 = df715bcb6bd4567fc2760c007ca160acce2673f8 (refs/remotes/git-svn)
 W: +empty_dir: ! !
-r8 = e0a6fee9b78d7d5e6d27b3aa2b469ae8b12c06d6 (refs/remotes/git-svn)
+r8 = 67068af5a13ce704e67ebad5c4eb9386cb51de65 (refs/remotes/git-svn)
 W: +empty_dir: trunk
-r9 = c10bd020f77b858c10fba74070de34a9183dc855 (refs/remotes/git-svn)
+r9 = 9552286ce797562528e8d9d17ee472e5367af488 (refs/remotes/git-svn)
 W: +empty_dir: trunk/a
-r10 = b3bc56563acac3a6b68771d8ff91585f47dbc64c (refs/remotes/git-svn)
+r10 = 8fc61e805dcb9962a79346f891ec8b85fa134fc8 (refs/remotes/git-svn)
 W: +empty_dir: trunk/weird file name
-r11 = d1edb4673c08ca68062b0bee026c741651efa73e (refs/remotes/git-svn)
+r11 = 29dda92c1d9054eaf36d32f3a8445054353819a7 (refs/remotes/git-svn)
 	D	d
 W: -empty_dir: d
-r12 = 485a72f7eb4530dc40d26759e6a70d363f0c22e7 (refs/remotes/git-svn)
+r12 = 72d125323eb7663d5ea5187b7adb2f824d9befea (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r12
 creating empty directory: ! !
@@ -527776,9 +527866,9 @@
 
 Committing transaction...
 Committed revision 13.
-HEAD is now at 1d708cf mkdir a
+HEAD is now at 21e5236 mkdir a
 W: +empty_dir: gz
-r13 = 5306d782bbc577865f1d9fee9b38851fb09f3795 (refs/remotes/git-svn)
+r13 = cc0f6c49e5cfee61fcf5b5d322ba6639623255f2 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 creating empty directory: gz
 ok 14 - git svn gc-ed files work
@@ -527957,95 +528047,95 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9141-git-svn-multiple-branches/git_project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo
 	A	a.file
-r1 = 563daffb6d09ba2e68f2a8cd94aae20d8166a40e (refs/remotes/origin/trunk)
+r1 = 2eb636910d0330a0519e103afd9b63e8c979e5fa (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first, 1
-Found branch parent: (refs/remotes/origin/first) 563daffb6d09ba2e68f2a8cd94aae20d8166a40e
+Found branch parent: (refs/remotes/origin/first) 2eb636910d0330a0519e103afd9b63e8c979e5fa
 Following parent with do_switch
 Successfully followed parent
-r2 = f2b7611593f2df33b81f4ec446d7aab80bc2dbfc (refs/remotes/origin/first)
+r2 = 8ea80726d9565183f2cb9771bde083caa07023f8 (refs/remotes/origin/first)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/1.0, 2
-Found branch parent: (refs/remotes/origin/tags/1.0) 563daffb6d09ba2e68f2a8cd94aae20d8166a40e
+Found branch parent: (refs/remotes/origin/tags/1.0) 2eb636910d0330a0519e103afd9b63e8c979e5fa
 Following parent with do_switch
 Successfully followed parent
-r3 = 011c7e19910be41d7545e2503eb7f41eccf7024a (refs/remotes/origin/tags/1.0)
+r3 = 1db27ec8df51753b47e59cf76147d6d64916b375 (refs/remotes/origin/tags/1.0)
 	M	a.file
-r4 = a8408940e9207d9ff571cfbed0170286bd4a29a6 (refs/remotes/origin/trunk)
+r4 = 45c77bffcf07e8e79c07d4e49540f54b23a97ad4 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second, 4
-Found branch parent: (refs/remotes/origin/second) a8408940e9207d9ff571cfbed0170286bd4a29a6
+Found branch parent: (refs/remotes/origin/second) 45c77bffcf07e8e79c07d4e49540f54b23a97ad4
 Following parent with do_switch
 Successfully followed parent
-r5 = c2933e3a136a685008c026aa8228e3ada68918fd (refs/remotes/origin/second)
+r5 = 9784ab47d9878e5bed91b45cc9425818ea90a9d1 (refs/remotes/origin/second)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/2.0, 5
-Found branch parent: (refs/remotes/origin/tags/2.0) a8408940e9207d9ff571cfbed0170286bd4a29a6
+Found branch parent: (refs/remotes/origin/tags/2.0) 45c77bffcf07e8e79c07d4e49540f54b23a97ad4
 Following parent with do_switch
 Successfully followed parent
-r6 = e6465d9b9a2a30291327392c7b755a12899bb413 (refs/remotes/origin/tags/2.0)
+r6 = e0193e1e8c3552af54d78157e79e5d6d0ec793fd (refs/remotes/origin/tags/2.0)
 	M	a.file
-r7 = 5d19a7b3f49422451c2fce2298c4f53cb60cd470 (refs/remotes/origin/trunk)
+r7 = fdadd6ebfc436b2af32999a540064eb0022e7050 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1, 7
-Found branch parent: (refs/remotes/origin/1) 5d19a7b3f49422451c2fce2298c4f53cb60cd470
+Found branch parent: (refs/remotes/origin/1) fdadd6ebfc436b2af32999a540064eb0022e7050
 Following parent with do_switch
 Successfully followed parent
-r8 = 45584393e5622d773d6591bb89206200f5ed2b6b (refs/remotes/origin/1)
+r8 = 3c51363306bbedd9af4731bf53e5634f055da9c9 (refs/remotes/origin/1)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/3.0, 8
-Found branch parent: (refs/remotes/origin/tags/3.0) 5d19a7b3f49422451c2fce2298c4f53cb60cd470
+Found branch parent: (refs/remotes/origin/tags/3.0) fdadd6ebfc436b2af32999a540064eb0022e7050
 Following parent with do_switch
 Successfully followed parent
-r9 = 86c324df9cd0c4cc845b06577c4be82ad2c66302 (refs/remotes/origin/tags/3.0)
+r9 = a50472230d0e0017753d7b9f33a1147faea2a281 (refs/remotes/origin/tags/3.0)
 	M	a.file
-r10 = e501b658d9f51235badf7bee7b6515f4a8d76bed (refs/remotes/origin/trunk)
+r10 = 69de6ec9999036a47feb4348f2fb1540b9b70330 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2, 10
-Found branch parent: (refs/remotes/origin/2) e501b658d9f51235badf7bee7b6515f4a8d76bed
+Found branch parent: (refs/remotes/origin/2) 69de6ec9999036a47feb4348f2fb1540b9b70330
 Following parent with do_switch
 Successfully followed parent
-r11 = 780a7f8b13b97000c00412c2fc8bde74e085b22c (refs/remotes/origin/2)
+r11 = 73dd7850f387f2e3a5fd49718a64b7b94a959b94 (refs/remotes/origin/2)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/4.0, 11
-Found branch parent: (refs/remotes/origin/tags/4.0) e501b658d9f51235badf7bee7b6515f4a8d76bed
+Found branch parent: (refs/remotes/origin/tags/4.0) 69de6ec9999036a47feb4348f2fb1540b9b70330
 Following parent with do_switch
 Successfully followed parent
-r12 = c936219f3d2cd28a73809e6bab45741026a0924e (refs/remotes/origin/tags/4.0)
+r12 = 1a35948462c479b1f26afd6cad0a15a8c4cd70f8 (refs/remotes/origin/tags/4.0)
 	M	a.file
-r13 = c03418fff822603e594b67779118c8982fe9cf72 (refs/remotes/origin/first)
+r13 = 5303817248fc5219ffa2aada56440ec087b3296f (refs/remotes/origin/first)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v5, 13
-Found branch parent: (refs/remotes/origin/tags/v5) c03418fff822603e594b67779118c8982fe9cf72
+Found branch parent: (refs/remotes/origin/tags/v5) 5303817248fc5219ffa2aada56440ec087b3296f
 Following parent with do_switch
 Successfully followed parent
-r14 = 69b2525fae02abedc35838614c30a61d29d6858c (refs/remotes/origin/tags/v5)
+r14 = f91ee8ed3bfa68801a7f153e61870a7b057b349e (refs/remotes/origin/tags/v5)
 	M	a.file
-r15 = 5711fabc0d281784f055b6f814b3127f3ac71064 (refs/remotes/origin/second)
+r15 = 3df9cd34d6d7f62334ca0a860ed197f46b67a200 (refs/remotes/origin/second)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v6, 15
-Found branch parent: (refs/remotes/origin/tags/v6) 5711fabc0d281784f055b6f814b3127f3ac71064
+Found branch parent: (refs/remotes/origin/tags/v6) 3df9cd34d6d7f62334ca0a860ed197f46b67a200
 Following parent with do_switch
 Successfully followed parent
-r16 = bb4a6bb167683dad75391d4c4ecf3814c1fcce1a (refs/remotes/origin/tags/v6)
+r16 = ea929d1123ade50e1721c7289c9e59b5ad7e0ce3 (refs/remotes/origin/tags/v6)
 	M	a.file
-r17 = 010afddec49f255685741faa2652a6fa53491450 (refs/remotes/origin/1)
+r17 = d713bd14381cca8a40ba80562733cc395d21a549 (refs/remotes/origin/1)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v7, 17
-Found branch parent: (refs/remotes/origin/tags/v7) 010afddec49f255685741faa2652a6fa53491450
+Found branch parent: (refs/remotes/origin/tags/v7) d713bd14381cca8a40ba80562733cc395d21a549
 Following parent with do_switch
 Successfully followed parent
-r18 = c53810b8847b2f4ccdafec5f867aa37833b2ceab (refs/remotes/origin/tags/v7)
+r18 = f99d76189062417f17a32ab419d6b211a9c61112 (refs/remotes/origin/tags/v7)
 	M	a.file
-r19 = e3815b979315ff8aff91a82c4b6eb9ecd1da5568 (refs/remotes/origin/2)
+r19 = 1a2ac359c7f65eb79280a32249510060d4dbc275 (refs/remotes/origin/2)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v8, 19
-Found branch parent: (refs/remotes/origin/tags/v8) e3815b979315ff8aff91a82c4b6eb9ecd1da5568
+Found branch parent: (refs/remotes/origin/tags/v8) 1a2ac359c7f65eb79280a32249510060d4dbc275
 Following parent with do_switch
 Successfully followed parent
-r20 = 25709dd64862f55e0d5a201d2feb9e550c701c6e (refs/remotes/origin/tags/v8)
+r20 = ed2c21d44a23c24dc66ff4a2ca78d89d9025e9a2 (refs/remotes/origin/tags/v8)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk r10
-c03418fff822603e594b67779118c8982fe9cf72
-5711fabc0d281784f055b6f814b3127f3ac71064
-010afddec49f255685741faa2652a6fa53491450
-e3815b979315ff8aff91a82c4b6eb9ecd1da5568
-011c7e19910be41d7545e2503eb7f41eccf7024a
-e6465d9b9a2a30291327392c7b755a12899bb413
-86c324df9cd0c4cc845b06577c4be82ad2c66302
-c936219f3d2cd28a73809e6bab45741026a0924e
-69b2525fae02abedc35838614c30a61d29d6858c
-bb4a6bb167683dad75391d4c4ecf3814c1fcce1a
-c53810b8847b2f4ccdafec5f867aa37833b2ceab
-25709dd64862f55e0d5a201d2feb9e550c701c6e
+5303817248fc5219ffa2aada56440ec087b3296f
+3df9cd34d6d7f62334ca0a860ed197f46b67a200
+d713bd14381cca8a40ba80562733cc395d21a549
+1a2ac359c7f65eb79280a32249510060d4dbc275
+1db27ec8df51753b47e59cf76147d6d64916b375
+e0193e1e8c3552af54d78157e79e5d6d0ec793fd
+a50472230d0e0017753d7b9f33a1147faea2a281
+1a35948462c479b1f26afd6cad0a15a8c4cd70f8
+f91ee8ed3bfa68801a7f153e61870a7b057b349e
+ea929d1123ade50e1721c7289c9e59b5ad7e0ce3
+f99d76189062417f17a32ab419d6b211a9c61112
+ed2c21d44a23c24dc66ff4a2ca78d89d9025e9a2
 ok 2 - clone multiple branch and tag paths
 
 expecting success of 9141.3 'Multiple branch or tag paths require -d': 
@@ -528112,40 +528202,40 @@
 
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1, 10
-Found branch parent: (refs/remotes/origin/New1) e501b658d9f51235badf7bee7b6515f4a8d76bed
+Found branch parent: (refs/remotes/origin/New1) 69de6ec9999036a47feb4348f2fb1540b9b70330
 Following parent with do_switch
 Successfully followed parent
-r21 = e92cceb8cd6bdc0d1d13c1066de9b8a200a507ea (refs/remotes/origin/New1)
+r21 = 0e2d71b4df2cb6247eec693ece8f4b3a8da535d5 (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.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2, 10
-Found branch parent: (refs/remotes/origin/New2) e501b658d9f51235badf7bee7b6515f4a8d76bed
+Found branch parent: (refs/remotes/origin/New2) 69de6ec9999036a47feb4348f2fb1540b9b70330
 Following parent with do_switch
 Successfully followed parent
-r22 = ee3626c2cffacddd1190b8f18cbc95c81596ec94 (refs/remotes/origin/New2)
+r22 = 3bd58cbba3a63350d42a51d4e587183eb79b46ae (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.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1, 10
-Found branch parent: (refs/remotes/origin/tags/Tag1) e501b658d9f51235badf7bee7b6515f4a8d76bed
+Found branch parent: (refs/remotes/origin/tags/Tag1) 69de6ec9999036a47feb4348f2fb1540b9b70330
 Following parent with do_switch
 Successfully followed parent
-r23 = 92cc499533d5a20a6cb12d78e023d11d7ed9bf42 (refs/remotes/origin/tags/Tag1)
+r23 = 368e5a659658d27d59497fbbcd794bfc2c72967a (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.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2, 10
-Found branch parent: (refs/remotes/origin/tags/Tag2) e501b658d9f51235badf7bee7b6515f4a8d76bed
+Found branch parent: (refs/remotes/origin/tags/Tag2) 69de6ec9999036a47feb4348f2fb1540b9b70330
 Following parent with do_switch
 Successfully followed parent
-r24 = 9433800e6766f1c193b6500d77fbd7a3449af6f9 (refs/remotes/origin/tags/Tag2)
+r24 = e1fa70a58af8445252b63b80012f8ee0e25d2d81 (refs/remotes/origin/tags/Tag2)
 Updating '.':
 A    tags_B/Tag2
 A    tags_B/Tag2/a.file
@@ -528156,111 +528246,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9159-git-svn-no-parent-mergeinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9159-git-svn-no-parent-mergeinfo/.git/
-expecting success of 9159.1 'test handling of root commits in merge ranges': 
-	mkdir -p init/trunk init/branches init/tags &&
-	echo "r1" > init/trunk/file.txt &&
-	svn_cmd import -m "initial import" init "$svnrepo" &&
-	svn_cmd co "$svnrepo" tmp &&
-	(
-		cd tmp &&
-		echo "r2" > trunk/file.txt &&
-		svn_cmd commit -m "Modify file.txt on trunk" &&
-		svn_cmd cp trunk@1 branches/a &&
-		svn_cmd commit -m "Create branch a from trunk r1" &&
-		svn_cmd propset svn:mergeinfo /trunk:1-2 branches/a &&
-		svn_cmd commit -m "Fake merge of trunk r2 into branch a" &&
-		mkdir branches/b &&
-		echo "r5" > branches/b/file2.txt &&
-		svn_cmd add branches/b &&
-		svn_cmd commit -m "Create branch b from thin air" &&
-		echo "r6" > branches/b/file2.txt &&
-		svn_cmd commit -m "Modify file2.txt on branch b" &&
-		svn_cmd cp branches/b@5 branches/c &&
-		svn_cmd commit -m "Create branch c from branch b r5" &&
-		svn_cmd propset svn:mergeinfo /branches/b:5-6 branches/c &&
-		svn_cmd commit -m "Fake merge of branch b r6 into branch c"
-	) &&
-	git svn init -s "$svnrepo" &&
-	git svn fetch
-	
-Adding         init/branches
-Adding         init/tags
-Adding         init/trunk
-Adding         init/trunk/file.txt
-Committing transaction...
-Committed revision 1.
-A    tmp/branches
-A    tmp/tags
-A    tmp/trunk
-A    tmp/trunk/file.txt
-Checked out revision 1.
-Sending        trunk/file.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-A         branches/a
-A         branches/a/file.txt
-Adding         branches/a
-Committing transaction...
-Committed revision 3.
-property 'svn:mergeinfo' set on 'branches/a'
-Sending        branches/a
-Committing transaction...
-Committed revision 4.
-A         branches/b
-A         branches/b/file2.txt
-Adding         branches/b
-Adding         branches/b/file2.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-Sending        branches/b/file2.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 6.
-A         branches/c
-A         branches/c/file2.txt
-Adding         branches/c
-Committing transaction...
-Committed revision 7.
-property 'svn:mergeinfo' set on 'branches/c'
-Sending        branches/c
-Committing transaction...
-Committed revision 8.
-	A	file.txt
-r1 = 44fd13a22392c4947ddddfe5592712887fb9742f (refs/remotes/origin/trunk)
-	M	file.txt
-r2 = aa097f7886d951788057a0df18749deae12e60cf (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 44fd13a22392c4947ddddfe5592712887fb9742f
-Following parent with do_switch
-Successfully followed parent
-r3 = 00355c34aad4bf50f947f8ae37d423d56e364b5d (refs/remotes/origin/a)
-Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
-Found merge parent (/trunk:1-2): aa097f7886d951788057a0df18749deae12e60cf
-r4 = fd4c68fda59743e0552d3c4887ebfdfea059132b (refs/remotes/origin/a)
-	A	file2.txt
-r5 = 1049f97f63927ae367302b2e9c34981f53dc08a9 (refs/remotes/origin/b)
-	M	file2.txt
-r6 = c19c15e9e826e355cf88be4c3a365b733756c8a5 (refs/remotes/origin/b)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
-Found branch parent: (refs/remotes/origin/c) 1049f97f63927ae367302b2e9c34981f53dc08a9
-Following parent with do_switch
-Successfully followed parent
-r7 = 7ea68a0dd8d96dc4672b94be3f2641b541187f55 (refs/remotes/origin/c)
-Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/branches/b:5-6): c19c15e9e826e355cf88be4c3a365b733756c8a5
-r8 = 5de7fc8ffbd8a3c576345a3bc69c6b746b6f6810 (refs/remotes/origin/c)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk r2
-ok 1 - test handling of root commits in merge ranges
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9166-git-svn-fetch-merge-branch-of-branch2.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9166-git-svn-fetch-merge-branch-of-branch2/.git/
 expecting success of 9166.1 'initialize source svn repo': 
@@ -528333,29 +528318,29 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = b5f2664cc91eb191ed32e5978929861a356b15a3 (refs/remotes/origin/trunk)
+r1 = 00c48c3cba65dfebd6b7ddd8b0f36036efba625b (refs/remotes/origin/trunk)
 	A	foo
-r3 = 50ac4bb21d2419d839982d9885c8e1aa70d61ef0 (refs/remotes/origin/trunk)
+r3 = a0a8d11bc8d8305342401070d5f7656f5065bde3 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 50ac4bb21d2419d839982d9885c8e1aa70d61ef0
+Found branch parent: (refs/remotes/origin/branch1) a0a8d11bc8d8305342401070d5f7656f5065bde3
 Following parent with do_switch
 Successfully followed parent
-r4 = 3534eb5a5a19d6d4d3f223bcf5d5082dc7660a4e (refs/remotes/origin/branch1)
+r4 = d15d77949c67b3e491d9facaeb6a5c39f3e48efe (refs/remotes/origin/branch1)
 	A	bar
-r5 = 7cc543743a996a2014f4915925d1f3365915697a (refs/remotes/origin/branch1)
+r5 = fa2324d55bc5d4a741a0f5b584026f04392a191f (refs/remotes/origin/branch1)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 7cc543743a996a2014f4915925d1f3365915697a
+Found branch parent: (refs/remotes/origin/branch2) fa2324d55bc5d4a741a0f5b584026f04392a191f
 Following parent with do_switch
 Successfully followed parent
-r6 = 8b0f46d116cbe3f766b0d4a7d2acc690b3ba829c (refs/remotes/origin/branch2)
+r6 = 412dc36e185323037588131638ea7f373ac00f24 (refs/remotes/origin/branch2)
 	A	baz
-r7 = b0dd8e0ac3bcdaeb5a063716a6228a01522fd74f (refs/remotes/origin/branch2)
+r7 = 58a3eca289fa8cb3b882cb877c5b32110511ac59 (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): 7cc543743a996a2014f4915925d1f3365915697a
-Found merge parent (/branches/branch2:6-7): b0dd8e0ac3bcdaeb5a063716a6228a01522fd74f
-r8 = 50c162144b0de20c354dc9b84518025676cec1a2 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-5): fa2324d55bc5d4a741a0f5b584026f04392a191f
+Found merge parent (/branches/branch2:6-7): 58a3eca289fa8cb3b882cb877c5b32110511ac59
+r8 = 3d3d0baab534632e1690a780b1fc4498b11b6d77 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk r8
 ok 2 - clone svn repo
@@ -528370,6 +528355,50 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9169-git-svn-dcommit-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t9169-git-svn-dcommit-crlf/work/.git/
+W: +empty_dir: dir
+r1 = d28fed698b924fe612a64a99cc76c86a76cfca62 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/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.47.2/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo ...
+	A	foo
+Committed r2
+	A	foo
+r2 = 57a3df77d0c2d42c1f231b4d9fbd52c3951c2aa5 (refs/remotes/git-svn)
+No changes between c565658b5b49fba5a17fbd08224f5d428d6f63d1 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9151-svn-mergeinfo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9151-svn-mergeinfo/.git/
 expecting success of 9151.1 'load svn dump': 
@@ -528705,35 +528734,35 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = af9e9ef2f6f2e43a7d1a33233be9fa740a5e7f50 (refs/remotes/origin/trunk)
+r1 = 7ac930057dd4eac6497f025315faf9a37f72f4bb (refs/remotes/origin/trunk)
 	A	foo
-r3 = a5ba533ef7d06c2ae1433d6ccda0407280460563 (refs/remotes/origin/trunk)
+r3 = 8fcdfadf7341a5a8f51fe47ed080389264bcab8e (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) a5ba533ef7d06c2ae1433d6ccda0407280460563
+Found branch parent: (refs/remotes/origin/branch1) 8fcdfadf7341a5a8f51fe47ed080389264bcab8e
 Following parent with do_switch
 Successfully followed parent
-r4 = 193769a215392c2429193347c0394a827e6ad89c (refs/remotes/origin/branch1)
+r4 = f823a839baf14f651bbe7da4a839c9b2cb76ef68 (refs/remotes/origin/branch1)
 	A	bar
-r5 = b77a3c683b4494fea8ceaafb850006cdc6ffc6a0 (refs/remotes/origin/branch1)
+r5 = 37b7009205adc51a4f9177bc8b12f257f078f3ff (refs/remotes/origin/branch1)
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) b77a3c683b4494fea8ceaafb850006cdc6ffc6a0
+Found branch parent: (refs/remotes/origin/branch2) 37b7009205adc51a4f9177bc8b12f257f078f3ff
 Following parent with do_switch
 Successfully followed parent
-r6 = 4a1ab7c588ed33b66c22868ea00c61d131560bc2 (refs/remotes/origin/branch2)
+r6 = a4a9f0f14ea1cb2e570633346ef9e6f139233888 (refs/remotes/origin/branch2)
 	A	baz
-r7 = b09f057c238c4d7cc4064f12a4bebc311229422e (refs/remotes/origin/branch2)
+r7 = e9d280fe486d1b65ec5d60ae68a891bff389105c (refs/remotes/origin/branch2)
 	A	bar2
-r8 = 9eb20904c200d4023c855e8999648fbd19b45fb4 (refs/remotes/origin/trunk)
+r8 = a7689d37e9007d35a0935c81769cdaec5444dd15 (refs/remotes/origin/trunk)
 	A	bar2
 Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/trunk:4-8): 9eb20904c200d4023c855e8999648fbd19b45fb4
-r9 = f7b20d7a14fe5fe75ac9a0bd25af9ffd35798d90 (refs/remotes/origin/branch2)
+Found merge parent (/trunk:4-8): a7689d37e9007d35a0935c81769cdaec5444dd15
+r9 = 46ca3907e73a1edc36f1b21948f8a8768fe18f96 (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): b77a3c683b4494fea8ceaafb850006cdc6ffc6a0
-Found merge parent (/branches/branch2:6-9): f7b20d7a14fe5fe75ac9a0bd25af9ffd35798d90
-r10 = ab0f1082fc38bd5140d3661d7d7a3b654db7c185 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-5): 37b7009205adc51a4f9177bc8b12f257f078f3ff
+Found merge parent (/branches/branch2:6-9): 46ca3907e73a1edc36f1b21948f8a8768fe18f96
+r10 = 76f0cdb992863d55a6653739b7216f213dc1c27d (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk r10
 ok 2 - clone svn repo
@@ -528748,50 +528777,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9169-git-svn-dcommit-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t9169-git-svn-dcommit-crlf/work/.git/
-W: +empty_dir: dir
-r1 = 9e165be644dd1f3042e1f1c234c6e08443e5141a (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/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.47.2/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo ...
-	A	foo
-Committed r2
-	A	foo
-r2 = 5e55cac01cc502da3c619742fa0cf4eb35915c86 (refs/remotes/git-svn)
-No changes between 0c30a939660f73fb425afc5e2158c8c9c80a9bbd 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9160-git-svn-preserve-empty-dirs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9160-git-svn-preserve-empty-dirs/.git/
 expecting success of 9160.1 'initialize source svn repo containing empty dirs': 
@@ -528909,43 +528894,43 @@
 	git svn clone "$svnrepo"/trunk --preserve-empty-dirs "$GIT_REPO"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = 740a4d81ea155e8e9cc15f0125550cccc8da2d94 (refs/remotes/git-svn)
+r1 = ee6ef12825d3ab1530652650a5d513e362f5f577 (refs/remotes/git-svn)
 	A	2/file1.txt
 	A	2/file2.txt
 	A	3/a/file1.txt
 	A	3/b/file1.txt
-r2 = 32bfe55ab35d7d4fd8cefa37dc4d7167a7f90edd (refs/remotes/git-svn)
+r2 = 6280a86f93b2f87ba306b50e06b133cd0bb6cc27 (refs/remotes/git-svn)
 	D	4/.gitignore
 W: -empty_dir: 4/.gitignore
-r3 = 06ce6fbb86938fde5ae065f2106853c23dbfe2a5 (refs/remotes/git-svn)
+r3 = 411629912dde093d226fc83972247f28cdf578b5 (refs/remotes/git-svn)
 	D	4/a/.gitignore
 W: -empty_dir: 4/a/.gitignore
-r4 = 9705ff8654bccd9e96bd6fb548fa90953a151b9f (refs/remotes/git-svn)
+r4 = 9cbfce068216f9e728795061148da66da0f6795b (refs/remotes/git-svn)
 	D	4/a/b/.gitignore
 W: -empty_dir: 4/a/b/.gitignore
-r5 = 24a630777b7e79648b6216c357b2a87a11ff9f15 (refs/remotes/git-svn)
+r5 = a0eb210a5bbbaed8ccdc0710b7da2f1ebba79d3d (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 = 4d8c3ad26ced0812b268b3026d7a90785ae5ea42 (refs/remotes/git-svn)
+r6 = 4034135a9193351b438daf0455dc8fc511dccb8c (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 = 6dad64ee7a0078d3fcc9fef2ee21ee27b471b13d (refs/remotes/git-svn)
+r7 = 0c1e68047b33fda96baf21ec66ee62038fd53ef9 (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 = bff07a0d10d8486b52ddf68c18528b9bb092347f (refs/remotes/git-svn)
+r8 = f40f7132f0d807801118156f20802187bfff7aa2 (refs/remotes/git-svn)
 	D	5/.gitignore
 	A	5/.placeholder
 	D	6/.gitignore
 W: -empty_dir: 5/.gitignore
 W: -empty_dir: 6/.gitignore
-r9 = e4747487fc216e9e41dc7f6a210abfdac6e5ff10 (refs/remotes/git-svn)
+r9 = 03036fdd23f06a1dc189c0ae6f1c121368bd5c67 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
 ok 2 - clone svn repo with --preserve-empty-dirs
@@ -528995,7 +528980,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 6dad64e delete non-last entry in directory
+HEAD is now at 0c1e680 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': 
@@ -529006,40 +528991,40 @@
 	test $(find "$GIT_REPO" -type f -name ".placeholder" | wc -l) = "5"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = 740a4d81ea155e8e9cc15f0125550cccc8da2d94 (refs/remotes/git-svn)
+r1 = ee6ef12825d3ab1530652650a5d513e362f5f577 (refs/remotes/git-svn)
 	A	2/file1.txt
 	A	2/file2.txt
 	A	3/a/file1.txt
 	A	3/b/file1.txt
-r2 = b2ba4630ab8a148fcbbeb37f8c759592f7bfbe53 (refs/remotes/git-svn)
+r2 = f826e05cf63fec76557e707f6845571fa37a2bed (refs/remotes/git-svn)
 	D	4/.placeholder
 W: -empty_dir: 4/.placeholder
-r3 = 5c7b828ec0918d4e79f1ae82cd1f299a92b12bdd (refs/remotes/git-svn)
+r3 = e9da233e0c658fff6b77072f933e183af571ca76 (refs/remotes/git-svn)
 	D	4/a/.placeholder
 W: -empty_dir: 4/a/.placeholder
-r4 = 874fcb4638fcdcc68c9a2af2b1800043ce8299f9 (refs/remotes/git-svn)
+r4 = e80cb8d3cfc74d939186749429d90f8f8472e92d (refs/remotes/git-svn)
 	D	4/a/b/.placeholder
 W: -empty_dir: 4/a/b/.placeholder
-r5 = 8e20718a397b93db353e09b2fd72739dcbc02dcf (refs/remotes/git-svn)
+r5 = 85547f8c36f349541ed9a77c675a1e5e849395f3 (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 = a58fecb70e1162a5b553f5c2c1cc1d7d04e82f63 (refs/remotes/git-svn)
+r6 = cf71b81b1629a0fd583424df94f292e6781d0641 (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 = 9520ab0048db955a8affe9dc24dd05a084445b05 (refs/remotes/git-svn)
+r7 = b330abe7eb04b10a1a7fa7e992fb0c49029884e2 (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 = ce0ec8d13cdb1470ad7120e0a4240e921d425b3d (refs/remotes/git-svn)
+r8 = c67f5a08bd50d527cdb28a30fcd05e8ae2f69808 (refs/remotes/git-svn)
 	A	5/.placeholder
 	D	6/.placeholder
-r9 = 1c708e0fc3bc5de6a780c0c5ba10f643cbccc804 (refs/remotes/git-svn)
+r9 = f1ab238504228824c001b5084045d9bce1e7fa1f (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
 git-svn-repo/6/.placeholder/.placeholder
@@ -529103,7 +529088,7 @@
 	A	1/file1.txt
 	A	5/file1.txt
 W: -empty_dir: 1/.placeholder
-r10 = 584cb8045ac6220b7ad7395a61002e40b3807f24 (refs/remotes/git-svn)
+r10 = f8000f07d58586d17c3a7192ee8911b69a15f6fd (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 10 - second set of svn commits and rebase
 
@@ -529194,9 +529179,9 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch --revision BASE:3
 
-r1 = 894e97a4e2a98ad0b14676549c74a44e47c7d723 (refs/remotes/origin/trunk)
+r1 = 5b7f1f3a5cdd967d0a216c0446268e7825065490 (refs/remotes/origin/trunk)
 	A	foo
-r3 = 443903270f1e6eb298a155f44ca3f928034609f1 (refs/remotes/origin/trunk)
+r3 = bc562136dd66c0c7557b457f6ab3fd8e704deba1 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk r3
 ok 2 - fetch to merge-base (a)
@@ -529207,19 +529192,19 @@
 	test 1 = $(git cat-file -p main|grep parent|wc -l)
 
 	A	baz
-r6 = 38c2ede85262d3aaaa0bf1126e7d0f13fa6fc987 (refs/remotes/origin/trunk)
+r6 = 2afdfbc4ddb5d68e13855e25634d391146e3fed3 (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.47.2/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1
-r7 = 21a901886b90b320d1f3104ec443591a1067a0de (refs/remotes/origin/trunk)
+r7 = 6bea05f6caffa07a1baa897436e2945bc162dce1 (refs/remotes/origin/trunk)
 Successfully rebased and updated refs/heads/main.
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 443903270f1e6eb298a155f44ca3f928034609f1
+Found branch parent: (refs/remotes/origin/branch1) bc562136dd66c0c7557b457f6ab3fd8e704deba1
 Following parent with do_switch
 Successfully followed parent
-r4 = b8a62b71eccf8be85b4920bac00bc7bb0492eaef (refs/remotes/origin/branch1)
+r4 = 306176de156eded8f3a708a8be4b2c8a4516dcf8 (refs/remotes/origin/branch1)
 	A	bar
-r5 = 658517ef121d76546170d86716f5b433ceb069fc (refs/remotes/origin/branch1)
+r5 = 87217d5019cda1dd3542a2b1f898e68f8ce3baad (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': 
@@ -529228,236 +529213,22 @@
 	git svn fetch &&
 	test 2 = $(git cat-file -p origin/trunk|grep parent|wc -l)
 
-r3 = 443903270f1e6eb298a155f44ca3f928034609f1 (refs/remotes/origin/trunk)
-HEAD is now at 4439032 a
+r3 = bc562136dd66c0c7557b457f6ab3fd8e704deba1 (refs/remotes/origin/trunk)
+HEAD is now at bc56213 a
 Index mismatch: 4d5fcadc293a348e88f777dc0920f11e7d71441c != 4e126a1a1821dd5763468eb219c1ecdb6f7f0fda
-rereading 443903270f1e6eb298a155f44ca3f928034609f1
+rereading bc562136dd66c0c7557b457f6ab3fd8e704deba1
 	A	baz
-r6 = 38c2ede85262d3aaaa0bf1126e7d0f13fa6fc987 (refs/remotes/origin/trunk)
+r6 = 2afdfbc4ddb5d68e13855e25634d391146e3fed3 (refs/remotes/origin/trunk)
 	A	bar
 Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-6): 658517ef121d76546170d86716f5b433ceb069fc
-r7 = 3a0ca831dab6432b2c46950edc792883a96cd021 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-6): 87217d5019cda1dd3542a2b1f898e68f8ce3baad
+r7 = cf08e6e26f5969f3ef6560e13b3d1baf7d159322 (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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9162-git-svn-dcommit-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t9162-git-svn-dcommit-interactive/test-interactive/.git/
-r1 = 908ba429e514f547b7d3fef3eb164dd51d1dddcf (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive r1
-[master 1673709] 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.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-	A	foo
-Committed r2
-	A	foo
-r2 = dc49bfa9f74b95596ab4c1aa78b52cb49c7fe4bc (refs/remotes/git-svn)
-No changes between 1673709a77a077b76d98d836ecd5a1a0a723c347 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 05ab2e9] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master e10a08b] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master e40efab] 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.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 05ab2e930ad1fd753082a13b8bc18495e972d18b
-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 e10a08b508e0682782ddfd00e4dfd18c5b2af5f3
-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 e40efab223844055c6c9abc5c062b8fa6c26b2f2
-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 = c54202a5738e3010ffcaf29c06dc39bb6232ef73 (refs/remotes/git-svn)
-	M	foo
-Committed r4
-	M	foo
-r4 = 77954eb3edbabf3339d22d71b341ed7816560593 (refs/remotes/git-svn)
-	M	foo
-Committed r5
-	M	foo
-r5 = 5914f61cc887a592579158bca357f9a8952d315b (refs/remotes/git-svn)
-No changes between e40efab223844055c6c9abc5c062b8fa6c26b2f2 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 682ebc7] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 1bef7cb] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 52ab280] 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.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 682ebc7090150d7084956f43f922853899a9b05d
-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 1bef7cb629fdf9f47354ae73a0679d80894cd360
-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 52ab280f547ca68c4b96f670bd7587631ec92eb1
-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 5914f61 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 682ebc7] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 1bef7cb] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 52ab280] 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.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 682ebc7090150d7084956f43f922853899a9b05d
-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 1bef7cb629fdf9f47354ae73a0679d80894cd360
-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 5914f61 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 682ebc7] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 1bef7cb] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 52ab280] 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.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 682ebc7090150d7084956f43f922853899a9b05d
-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 = c07883f94d53ad491ec37ffc67b191ce15ecb0a4 (refs/remotes/git-svn)
-	M	foo
-Committed r7
-	M	foo
-r7 = 93a6708edeb25c3a9ceb71ef5445137f28d21a59 (refs/remotes/git-svn)
-	M	foo
-Committed r8
-	M	foo
-r8 = 18c28a3eeaee2ba038fe41c414f4acf2180c7c93 (refs/remotes/git-svn)
-No changes between 52ab280f547ca68c4b96f670bd7587631ec92eb1 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-HEAD is now at 18c28a3 change #3
-ok 5 - answers: all
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9302-fast-import-unpack-limit.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9302-fast-import-unpack-limit/.git/
 expecting success of 9302.1 'create loose objects on import': 
@@ -529653,6 +529424,220 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9162-git-svn-dcommit-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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.47.2/t/trash directory.t9162-git-svn-dcommit-interactive/test-interactive/.git/
+r1 = 7e2ddfa1e06907943694ff9f50f6e3b84dc46674 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive r1
+[master c268807] 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.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+	A	foo
+Committed r2
+	A	foo
+r2 = 0dabbf51a12600d6441252eb091594c5ef03f93f (refs/remotes/git-svn)
+No changes between c268807f5632c2b270b2480446046d8641a8f614 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 7fda028] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 653413d] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b514e91] 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.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit 7fda02846d5821cf87b3f304d69d15c7a3a5e0da
+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 653413da5924cdedb99eef95ce1eb42b400b808f
+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 b514e91dc70fba11a15d6a45393cdfef9792a357
+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 = cd80531bec27892b752fd46c74f1a01c403d079b (refs/remotes/git-svn)
+	M	foo
+Committed r4
+	M	foo
+r4 = bbabeea693e951a0dac18061567a9256a8475abb (refs/remotes/git-svn)
+	M	foo
+Committed r5
+	M	foo
+r5 = c2a6dfc1e757eba2c44e4170293a89cef2d24123 (refs/remotes/git-svn)
+No changes between b514e91dc70fba11a15d6a45393cdfef9792a357 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 e34e454] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 2ebbb5e] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master eda69e7] 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.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit e34e454433486df20abcb965a26f09df5e5ae753
+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 2ebbb5efc4eaf21588a76c25b34d665ba5b679fb
+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 eda69e70c5d5c26c9c431f3a83d19925f654f857
+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 c2a6dfc 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 e34e454] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 2ebbb5e] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master eda69e7] 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.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit e34e454433486df20abcb965a26f09df5e5ae753
+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 2ebbb5efc4eaf21588a76c25b34d665ba5b679fb
+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 c2a6dfc 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 e34e454] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 2ebbb5e] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master eda69e7] 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.47.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit e34e454433486df20abcb965a26f09df5e5ae753
+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 = 21a55a713b1ceac4df0d1104c42215c935c77a1b (refs/remotes/git-svn)
+	M	foo
+Committed r7
+	M	foo
+r7 = 89d6c4ac002e403600e8549e5dbb372d8ed51d10 (refs/remotes/git-svn)
+	M	foo
+Committed r8
+	M	foo
+r8 = d33de98a2156922554a5dfbaf7543b0f235b3d50 (refs/remotes/git-svn)
+No changes between eda69e70c5d5c26c9c431f3a83d19925f654f857 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+HEAD is now at d33de98 change #3
+ok 5 - answers: all
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9304-fast-import-marks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9304-fast-import-marks/.git/
 expecting success of 9304.1 'setup dump of basic history': 
@@ -529852,6 +529837,374 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9211-scalar-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/.git/
+expecting success of 9211.1 'set up repository to clone': 
+	rm -rf .git &&
+	git init to-clone &&
+	(
+		cd to-clone &&
+		git branch -m base &&
+
+		test_commit first &&
+		test_commit second &&
+		test_commit third &&
+
+		git switch -c parallel first &&
+		mkdir -p 1/2 &&
+		test_commit 1/2/3 &&
+
+		git switch base &&
+
+		# By default, permit
+		git config uploadpack.allowfilter true &&
+		git config uploadpack.allowanysha1inwant true
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/to-clone/.git/
+[base (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[base d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[base cd7036d] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third.t
+Switched to a new branch 'parallel'
+[parallel afe5387] 1/2/3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1/2/3.t
+Switched to branch 'base'
+ok 1 - set up repository to clone
+
+expecting success of 9211.2 'creates content in enlistment root': 
+	enlistment=cloned &&
+
+	scalar clone "file://$(pwd)/to-clone" $enlistment &&
+	ls -A $enlistment >enlistment-root &&
+	test_line_count = 1 enlistment-root &&
+	test_path_is_dir $enlistment/src &&
+	test_path_is_dir $enlistment/src/.git &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/cloned/src/.git/
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 2 - creates content in enlistment root
+
+expecting success of 9211.3 'with spaces': 
+	enlistment="cloned with space" &&
+
+	scalar clone "file://$(pwd)/to-clone" "$enlistment" &&
+	test_path_is_dir "$enlistment" &&
+	test_path_is_dir "$enlistment/src" &&
+	test_path_is_dir "$enlistment/src/.git" &&
+
+	cleanup_clone "$enlistment"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/cloned with space/src/.git/
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 3 - with spaces
+
+expecting success of 9211.4 'partial clone if supported by server': 
+	enlistment=partial-clone &&
+
+	scalar clone "file://$(pwd)/to-clone" $enlistment &&
+
+	(
+		cd $enlistment/src &&
+
+		# Two promisor packs: one for refs, the other for blobs
+		ls .git/objects/pack/pack-*.promisor >promisorlist &&
+		test_line_count = 2 promisorlist
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/partial-clone/src/.git/
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 4 - partial clone if supported by server
+
+expecting success of 9211.5 'fall back on full clone if partial unsupported': 
+	enlistment=no-partial-support &&
+
+	test_config -C to-clone uploadpack.allowfilter false &&
+	test_config -C to-clone uploadpack.allowanysha1inwant false &&
+
+	scalar clone "file://$(pwd)/to-clone" $enlistment 2>err &&
+	grep "filtering not recognized by server, ignoring" err &&
+
+	(
+		cd $enlistment/src &&
+
+		# Still get a refs promisor file, but none for blobs
+		ls .git/objects/pack/pack-*.promisor >promisorlist &&
+		test_line_count = 1 promisorlist
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/no-partial-support/src/.git/
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+warning: filtering not recognized by server, ignoring
+ok 5 - fall back on full clone if partial unsupported
+
+expecting success of 9211.6 'initializes sparse-checkout by default': 
+	enlistment=sparse &&
+
+	scalar clone "file://$(pwd)/to-clone" $enlistment &&
+	(
+		cd $enlistment/src &&
+		test_cmp_config true core.sparseCheckout &&
+		test_cmp_config true core.sparseCheckoutCone
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/sparse/src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 6 - initializes sparse-checkout by default
+
+expecting success of 9211.7 '--full-clone does not create sparse-checkout': 
+	enlistment=full-clone &&
+
+	scalar clone --full-clone "file://$(pwd)/to-clone" $enlistment &&
+	(
+		cd $enlistment/src &&
+		test_cmp_config "" --default "" core.sparseCheckout &&
+		test_cmp_config "" --default "" core.sparseCheckoutCone
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/full-clone/src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 7 - --full-clone does not create sparse-checkout
+
+expecting success of 9211.8 '--single-branch clones HEAD only': 
+	enlistment=single-branch &&
+
+	scalar clone --single-branch "file://$(pwd)/to-clone" $enlistment &&
+	(
+		cd $enlistment/src &&
+		git for-each-ref refs/remotes/origin >out &&
+		test_line_count = 1 out &&
+		grep "refs/remotes/origin/base" out
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/single-branch/src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+cd7036d3271be3d37ad73318fcc1838bd64f7f42 commit	refs/remotes/origin/base
+ok 8 - --single-branch clones HEAD only
+
+expecting success of 9211.9 '--no-single-branch clones all branches': 
+	enlistment=no-single-branch &&
+
+	scalar clone --no-single-branch "file://$(pwd)/to-clone" $enlistment &&
+	(
+		cd $enlistment/src &&
+		git for-each-ref refs/remotes/origin >out &&
+		test_line_count = 2 out &&
+		grep "refs/remotes/origin/base" out &&
+		grep "refs/remotes/origin/parallel" out
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/no-single-branch/src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+cd7036d3271be3d37ad73318fcc1838bd64f7f42 commit	refs/remotes/origin/base
+afe53871bea8a7b2e02fc5f14f4076b8cbd8e537 commit	refs/remotes/origin/parallel
+ok 9 - --no-single-branch clones all branches
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
+
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
+
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+prerequisite TTY ok
+expecting success of 9211.10 'progress with tty': 
+	enlistment=progress1 &&
+
+	test_config -C to-clone uploadpack.allowfilter true &&
+	test_config -C to-clone uploadpack.allowanysha1inwant true &&
+
+	test_terminal env GIT_PROGRESS_DELAY=0 \
+		scalar clone "file://$(pwd)/to-clone" "$enlistment" 2>stderr &&
+	grep "Enumerating objects" stderr >actual &&
+	test_line_count = 2 actual &&
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/progress1/src/.git/
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 10 - progress with tty
+
+expecting success of 9211.11 'progress without tty': 
+	enlistment=progress2 &&
+
+	test_config -C to-clone uploadpack.allowfilter true &&
+	test_config -C to-clone uploadpack.allowanysha1inwant true &&
+
+	GIT_PROGRESS_DELAY=0 scalar clone "file://$(pwd)/to-clone" "$enlistment" 2>stderr &&
+	! grep "Enumerating objects" stderr &&
+	! grep "Updating files" stderr &&
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/progress2/src/.git/
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 11 - progress without tty
+
+expecting success of 9211.12 'scalar clone warns when background maintenance fails': 
+	GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
+		scalar clone "file://$(pwd)/to-clone" maint-fail 2>err &&
+	grep "could not turn on maintenance" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/maint-fail/src/.git/
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+warning: could not turn on maintenance
+ok 12 - scalar clone warns when background maintenance fails
+
+expecting success of 9211.13 '`scalar clone --no-src`': 
+	scalar clone --src "file://$(pwd)/to-clone" with-src &&
+	scalar clone --no-src "file://$(pwd)/to-clone" without-src &&
+
+	test_path_is_dir with-src/src &&
+	test_path_is_missing without-src/src &&
+
+	(cd with-src/src && ls ?*) >with &&
+	(cd without-src && ls ?*) >without &&
+	test_cmp with without
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/with-src/src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/without-src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 13 - `scalar clone --no-src`
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9303-fast-import-compression.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9303-fast-import-compression/.git/
 expecting success of 9303.1 'fast-import (packed) with -c core.compression=0': 
@@ -530263,44 +530616,1982 @@
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2399 KiB
+       pools:          2048 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 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 12 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=0
+
+expecting success of 9303.13 'fast-import (loose) with -c core.compression=0 -c core.loosecompression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=9 $config &&
+		sz=$(test_file_size .git/objects/??/????*) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2399 KiB
+       pools:          2048 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 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 13 - fast-import (loose) with -c core.compression=0 -c core.loosecompression=9
+
+expecting success of 9303.14 'fast-import (loose) with -c core.compression=9 -c core.loosecompression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=9 $config &&
+		sz=$(test_file_size .git/objects/??/????*) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2399 KiB
+       pools:          2048 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 14 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=9
+
+expecting success of 9303.15 'fast-import (loose) with -c core.loosecompression=0': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=9 $config &&
+		sz=$(test_file_size .git/objects/??/????*) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2399 KiB
+       pools:          2048 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 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 15 - fast-import (loose) with -c core.loosecompression=0
+
+expecting success of 9303.16 'fast-import (loose) with -c core.loosecompression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=9 $config &&
+		sz=$(test_file_size .git/objects/??/????*) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2399 KiB
+       pools:          2048 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 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 16 - fast-import (loose) with -c core.loosecompression=9
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9351-fast-export-anonymize.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9351-fast-export-anonymize/.git/
+expecting success of 9351.1 'setup simple repo': 
+	test_commit base &&
+	test_commit foo &&
+	test_commit retain-me &&
+	git checkout -b other HEAD^ &&
+	mkdir subdir &&
+	test_commit subdir/bar &&
+	test_commit subdir/xyzzy &&
+	fake_commit=$(echo $ZERO_OID | sed s/0/a/) &&
+	git update-index --add --cacheinfo 160000,$fake_commit,link1 &&
+	git update-index --add --cacheinfo 160000,$fake_commit,link2 &&
+	git commit -m "add gitlink" &&
+	git tag -m "annotated tag" mytag &&
+	git tag -m "annotated tag with long message" longtag
+
+[main (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[main 64bd085] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[main 98733ca] retain-me
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 retain-me.t
+Switched to a new branch 'other'
+[other 7ff9039] subdir/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/bar.t
+[other 1427cb1] subdir/xyzzy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/xyzzy.t
+[other 73eb103] add gitlink
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 160000 link1
+ create mode 160000 link2
+ok 1 - setup simple repo
+
+expecting success of 9351.2 'export anonymized stream': 
+	git fast-export --anonymize --all \
+		--anonymize-map=retain-me \
+		--anonymize-map=xyzzy:should-not-appear \
+		--anonymize-map=xyzzy:custom-name \
+		--anonymize-map=other \
+		>stream
+
+ok 2 - export anonymized stream
+
+expecting success of 9351.3 'stream omits path names': 
+	! grep base stream &&
+	! grep foo stream &&
+	! grep subdir stream &&
+	! grep bar stream &&
+	! grep xyzzy stream
+
+ok 3 - stream omits path names
+
+expecting success of 9351.4 'stream contains user-specified names': 
+	grep retain-me stream &&
+	! grep should-not-appear stream &&
+	grep custom-name stream
+
+reset refs/tags/retain-me
+commit refs/tags/ref3/custom-name
+ok 4 - stream contains user-specified names
+
+expecting success of 9351.5 'stream omits gitlink oids': 
+	# avoid relying on the whole oid to remain hash-agnostic; this is
+	# plenty to be unique within our test case
+	! grep a000000000000000000 stream
+
+ok 5 - stream omits gitlink oids
+
+expecting success of 9351.6 'stream retains other as refname': 
+	grep other stream
+
+commit refs/heads/other
+ok 6 - stream retains other as refname
+
+expecting success of 9351.7 'stream omits other refnames': 
+	! grep main stream &&
+	! grep mytag stream &&
+	! grep longtag stream
+
+ok 7 - stream omits other refnames
+
+expecting success of 9351.8 'stream omits identities': 
+	! grep "$GIT_COMMITTER_NAME" stream &&
+	! grep "$GIT_COMMITTER_EMAIL" stream &&
+	! grep "$GIT_AUTHOR_NAME" stream &&
+	! grep "$GIT_AUTHOR_EMAIL" stream
+
+ok 8 - stream omits identities
+
+expecting success of 9351.9 'stream omits tag message': 
+	! grep "annotated tag" stream
+
+ok 9 - stream omits tag message
+
+expecting success of 9351.10 'import stream to new repository': 
+	git init new &&
+	cd new &&
+	git fast-import <../stream
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9351-fast-export-anonymize/new/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           21 (         0 duplicates                  )
+      blobs  :            5 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            8 (         0 duplicates          6 deltas of          6 attempts)
+      commits:            6 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           7 (         6 loads     )
+      marks:           1024 (        11 unique    )
+      atoms:              8
+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            =         12
+pack_report: pack_mmap_calls          =          6
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1442
+---------------------------------------------------------------------
+
+ok 10 - import stream to new repository
+
+expecting success of 9351.11 'result has two branches': 
+	git for-each-ref --format="%(refname)" refs/heads >branches &&
+	test_line_count = 2 branches &&
+	other_branch=refs/heads/other &&
+	main_branch=$(grep -v $other_branch branches)
+
+ok 11 - result has two branches
+
+expecting success of 9351.12 'repo has original shape and timestamps': 
+	shape () {
+		git log --format="%m %ct" --left-right --boundary "$@"
+	} &&
+	(cd .. && shape main...other) >expect &&
+	shape $main_branch...$other_branch >actual &&
+	test_cmp expect actual
+
+ok 12 - repo has original shape and timestamps
+
+expecting success of 9351.13 'root tree has original shape': 
+	# the output entries are not necessarily in the same
+	# order, but we should at least have the same set of
+	# object types.
+	git -C .. ls-tree HEAD >orig-root &&
+	cut -d" " -f2 <orig-root | sort >expect &&
+	git ls-tree $other_branch >root &&
+	cut -d" " -f2 <root | sort >actual &&
+	test_cmp expect actual
+
+ok 13 - root tree has original shape
+
+expecting success of 9351.14 'paths in subdir ended up in one tree': 
+	git -C .. ls-tree other:subdir >orig-subdir &&
+	cut -d" " -f2 <orig-subdir | sort >expect &&
+	tree=$(grep tree root | cut -f2) &&
+	git ls-tree $other_branch:$tree >tree &&
+	cut -d" " -f2 <tree >actual &&
+	test_cmp expect actual
+
+ok 14 - paths in subdir ended up in one tree
+
+expecting success of 9351.15 'identical gitlinks got identical oid': 
+	awk "/commit/ { print \$3 }" <root | sort -u >commits &&
+	test_line_count = 1 commits
+
+ok 15 - identical gitlinks got identical oid
+
+expecting success of 9351.16 'all tags point to branch tip': 
+	git rev-parse $other_branch >expect &&
+	git for-each-ref --format="%(*objectname)" | grep . | uniq >actual &&
+	test_cmp expect actual
+
+ok 16 - all tags point to branch tip
+
+expecting success of 9351.17 'idents are shared': 
+	git log --all --format="%an <%ae>" >authors &&
+	sort -u authors >unique &&
+	test_line_count = 1 unique &&
+	git log --all --format="%cn <%ce>" >committers &&
+	sort -u committers >unique &&
+	test_line_count = 1 unique &&
+	! test_cmp authors committers
+
+--- authors	2025-01-30 02:19:42.474964293 +0000
++++ committers	2025-01-30 02:19:42.538964677 +0000
+@@ -1,6 +1,6 @@
+-User 1 <user1@example.com>
+-User 1 <user1@example.com>
+-User 1 <user1@example.com>
+-User 1 <user1@example.com>
+-User 1 <user1@example.com>
+-User 1 <user1@example.com>
++User 0 <user0@example.com>
++User 0 <user0@example.com>
++User 0 <user0@example.com>
++User 0 <user0@example.com>
++User 0 <user0@example.com>
++User 0 <user0@example.com>
+ok 17 - idents are shared
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9210-scalar.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/.git/
+expecting success of 9210.1 'scalar shows a usage': 
+	test_expect_code 129 scalar -h
+
+usage: scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]
+
+Commands:
+	clone
+	list
+	register
+	unregister
+	run
+	reconfigure
+	delete
+	help
+	version
+	diagnose
+
+ok 1 - scalar shows a usage
+
+expecting success of 9210.2 'scalar invoked on enlistment root': 
+	test_when_finished rm -rf test src deeper &&
+
+	for enlistment_root in test src deeper/test
+	do
+		git init ${enlistment_root}/src &&
+
+		# Register
+		scalar register ${enlistment_root} &&
+		scalar list >out &&
+		grep "$(pwd)/${enlistment_root}/src\$" out &&
+
+		# Delete (including enlistment root)
+		scalar delete $enlistment_root &&
+		test_path_is_missing $enlistment_root &&
+		scalar list >out &&
+		! grep "^$(pwd)/${enlistment_root}/src\$" out || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src
+ok 2 - scalar invoked on enlistment root
+
+expecting success of 9210.3 'scalar invoked on enlistment src repo': 
+	test_when_finished rm -rf test src deeper &&
+
+	for enlistment_root in test src deeper/test
+	do
+		git init ${enlistment_root}/src &&
+
+		# Register
+		scalar register ${enlistment_root}/src &&
+		scalar list >out &&
+		grep "$(pwd)/${enlistment_root}/src\$" out &&
+
+		# Delete (will not include enlistment root)
+		scalar delete ${enlistment_root}/src &&
+		test_path_is_dir $enlistment_root &&
+		scalar list >out &&
+		! grep "^$(pwd)/${enlistment_root}/src\$" out || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src
+ok 3 - scalar invoked on enlistment src repo
+
+expecting success of 9210.4 'scalar invoked when enlistment root and repo are the same': 
+	test_when_finished rm -rf test src deeper &&
+
+	for enlistment_root in test src deeper/test
+	do
+		git init ${enlistment_root} &&
+
+		# Register
+		scalar register ${enlistment_root} &&
+		scalar list >out &&
+		grep "$(pwd)/${enlistment_root}\$" out &&
+
+		# Delete (will not include enlistment root)
+		scalar delete ${enlistment_root} &&
+		test_path_is_missing $enlistment_root &&
+		scalar list >out &&
+		! grep "^$(pwd)/${enlistment_root}\$" out &&
+
+		# Make sure we did not accidentally delete the trash dir
+		test_path_is_dir "$TRASH_DIRECTORY" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test
+ok 4 - scalar invoked when enlistment root and repo are the same
+
+expecting success of 9210.5 'scalar repo search respects GIT_CEILING_DIRECTORIES': 
+	test_when_finished rm -rf test &&
+
+	git init test/src &&
+	mkdir -p test/src/deep &&
+	GIT_CEILING_DIRECTORIES="$(pwd)/test/src" &&
+	! scalar register test/src/deep 2>err &&
+	grep "not a git repository" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src/.git/
+fatal: not a git repository (or any of the parent directories): .git
+ok 5 - scalar repo search respects GIT_CEILING_DIRECTORIES
+
+expecting success of 9210.6 'scalar enlistments need a worktree': 
+	test_when_finished rm -rf bare test &&
+
+	git init --bare bare/src &&
+	! scalar register bare/src 2>err &&
+	grep "Scalar enlistments require a worktree" err &&
+
+	git init test/src &&
+	! scalar register test/src/.git 2>err &&
+	grep "Scalar enlistments require a worktree" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/bare/src/
+fatal: Scalar enlistments require a worktree
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src/.git/
+fatal: Scalar enlistments require a worktree
+ok 6 - scalar enlistments need a worktree
+
+checking prerequisite: FSMONITOR_DAEMON
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
+	git version --build-options >output &&
+	grep "feature: fsmonitor--daemon" output
+
+)
+prerequisite FSMONITOR_DAEMON not satisfied
+ok 7 # skip scalar register starts fsmon daemon (missing FSMONITOR_DAEMON)
+
+expecting success of 9210.8 'scalar register warns when background maintenance fails': 
+	git init register-repo &&
+	GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
+		scalar register register-repo 2>err &&
+	grep "could not turn on maintenance" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/register-repo/.git/
+warning: could not turn on maintenance
+ok 8 - scalar register warns when background maintenance fails
+
+expecting success of 9210.9 'scalar unregister': 
+	git init vanish/src &&
+	scalar register vanish/src &&
+	git config --get --global --fixed-value \
+		maintenance.repo "$(pwd)/vanish/src" &&
+	scalar list >scalar.repos &&
+	grep -F "$(pwd)/vanish/src" scalar.repos &&
+	rm -rf vanish/src/.git &&
+	scalar unregister vanish &&
+	test_must_fail git config --get --global --fixed-value \
+		maintenance.repo "$(pwd)/vanish/src" &&
+	scalar list >scalar.repos &&
+	! grep -F "$(pwd)/vanish/src" scalar.repos &&
+
+	# scalar unregister should be idempotent
+	scalar unregister vanish
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/vanish/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/vanish/src
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/vanish/src
+ok 9 - scalar unregister
+
+expecting success of 9210.10 'set up repository to clone': 
+	test_commit first &&
+	test_commit second &&
+	test_commit third &&
+	git switch -c parallel first &&
+	mkdir -p 1/2 &&
+	test_commit 1/2/3 &&
+	git config uploadPack.allowFilter true &&
+	git config uploadPack.allowAnySHA1InWant true
+
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[master d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[master cd7036d] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third.t
+Switched to a new branch 'parallel'
+[parallel afe5387] 1/2/3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1/2/3.t
+ok 10 - set up repository to clone
+
+expecting success of 9210.11 'scalar clone': 
+	second=$(git rev-parse --verify second:second.t) &&
+	scalar clone "file://$(pwd)" cloned --single-branch &&
+	(
+		cd cloned/src &&
+
+		git config --get --global --fixed-value maintenance.repo \
+			"$(pwd)" &&
+
+		git for-each-ref --format="%(refname)" refs/remotes/origin/ >actual &&
+		echo "refs/remotes/origin/parallel" >expect &&
+		test_cmp expect actual &&
+
+		test_path_is_missing 1/2 &&
+
+		# This relies on the fact that the presence of "--missing"
+		# on the command line forces lazy fetching off before
+		# "$second^{blob}" gets parsed.  Without "^{blob}", a
+		# bare object name "$second" is taken into the queue and
+		# the command may not fail with a fixed "rev-list --missing".
+		test_must_fail git rev-list --missing=print "$second^{blob}" -- &&
+
+		git rev-list $second &&
+		git cat-file blob $second >actual &&
+		echo "second" >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/src/.git/
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'parallel'
+branch 'parallel' set up to track 'origin/parallel'.
+Your branch is up to date with 'origin/parallel'.
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/src
+fatal: bad revision 'e019be006cf33489e2d0177a3837a2384eddebc5^{blob}'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+ok 11 - scalar clone
+
+expecting success of 9210.12 'scalar clone --no-... opts': 
+	# Note: redirect stderr always to avoid having a verbose test
+	# run result in a difference in the --[no-]progress option.
+	GIT_TRACE2_EVENT="$(pwd)/no-opt-trace" scalar clone \
+		--no-tags --no-src \
+		"file://$(pwd)" no-opts --single-branch 2>/dev/null &&
+
+	test_subcommand git fetch --quiet --no-progress \
+			origin --no-tags <no-opt-trace &&
+	(
+		cd no-opts &&
+
+		test_cmp_config --no-tags remote.origin.tagopt &&
+		git for-each-ref --format="%(refname)" refs/tags/ >tags &&
+		test_line_count = 0 tags
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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":"20250130T021939.284711Z-H5c947e1c-P002164cf","thread":"main","time":"2025-01-30T02:19:39.350495Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","fetch","--quiet","--no-progress","origin","--no-tags"]}
+ok 12 - scalar clone --no-... opts
+
+expecting success of 9210.13 'scalar reconfigure': 
+	git init one/src &&
+	scalar register one &&
+	git -C one/src config core.preloadIndex false &&
+	scalar reconfigure one &&
+	test true = "$(git -C one/src config core.preloadIndex)" &&
+	git -C one/src config core.preloadIndex false &&
+	rm one/src/cron.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/reconfigure" scalar reconfigure -a &&
+	test_path_is_file one/src/cron.txt &&
+	test true = "$(git -C one/src config core.preloadIndex)" &&
+	test_subcommand git maintenance start <reconfigure
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/one/src/.git/
+{"event":"child_start","sid":"20250130T021940.044271Z-H5c947e1c-P00216796","thread":"main","time":"2025-01-30T02:19:40.046331Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20250130T021940.044271Z-H5c947e1c-P00216796","thread":"main","time":"2025-01-30T02:19:40.197602Z","file":"run-command.c","line":733,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20250130T021940.044271Z-H5c947e1c-P00216796","thread":"main","time":"2025-01-30T02:19:40.354478Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20250130T021940.044271Z-H5c947e1c-P00216796","thread":"main","time":"2025-01-30T02:19:40.481902Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+ok 13 - scalar reconfigure
+
+expecting success of 9210.14 'scalar reconfigure --all with includeIf.onbranch': 
+	repos="two three four" &&
+	for num in $repos
+	do
+		git init $num/src &&
+		scalar register $num/src &&
+		git -C $num/src config includeif."onbranch:foo".path something &&
+		git -C $num/src config core.preloadIndex false || return 1
+	done &&
+
+	scalar reconfigure --all &&
+
+	for num in $repos
+	do
+		test true = "$(git -C $num/src config core.preloadIndex)" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/two/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/three/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/four/src/.git/
+ok 14 - scalar reconfigure --all with includeIf.onbranch
+
+expecting success of 9210.15 'scalar reconfigure --all with detached HEADs': 
+	repos="two three four" &&
+	for num in $repos
+	do
+		rm -rf $num/src &&
+		git init $num/src &&
+		scalar register $num/src &&
+		git -C $num/src config core.preloadIndex false &&
+		test_commit -C $num/src initial &&
+		git -C $num/src switch --detach HEAD || return 1
+	done &&
+
+	scalar reconfigure --all &&
+
+	for num in $repos
+	do
+		test true = "$(git -C $num/src config core.preloadIndex)" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/two/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/two/src
+[master (root-commit) 23fa7ba] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+HEAD is now at 23fa7ba initial
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/three/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/three/src
+[master (root-commit) 31243c6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+HEAD is now at 31243c6 initial
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/four/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/four/src
+[master (root-commit) 167ffd6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+HEAD is now at 167ffd6 initial
+ok 15 - scalar reconfigure --all with detached HEADs
+
+expecting success of 9210.16 '`reconfigure -a` removes stale config entries': 
+	git init stale/src &&
+	scalar register stale &&
+	scalar list >scalar.repos &&
+	grep stale scalar.repos &&
+
+	grep -v stale scalar.repos >expect &&
+
+	rm -rf stale &&
+	scalar reconfigure -a &&
+	scalar list >scalar.repos &&
+	test_cmp expect scalar.repos
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/stale/src/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/stale/src
+warning: removed stale scalar.repo '/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/stale/src'
+ok 16 - `reconfigure -a` removes stale config entries
+
+expecting success of 9210.17 'scalar delete without enlistment shows a usage': 
+	test_expect_code 129 scalar delete
+
+usage: scalar delete <enlistment>
+
+ok 17 - scalar delete without enlistment shows a usage
+
+expecting success of 9210.18 'scalar delete with enlistment': 
+	scalar delete cloned &&
+	test_path_is_missing cloned
+
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/src
+ok 18 - scalar delete with enlistment
+
+expecting success of 9210.19 'scalar supports -c/-C': 
+	test_when_finished "scalar delete sub" &&
+	git init sub &&
+	scalar -C sub -c status.aheadBehind=bogus register &&
+	test -z "$(git -C sub config --local status.aheadBehind)" &&
+	test true = "$(git -C sub config core.preloadIndex)"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/sub/.git/
+/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/sub
+ok 19 - scalar supports -c/-C
+
+expecting success of 9210.20 '`scalar [...] <dir>` errors out when dir is missing': 
+	! scalar run config cloned 2>err &&
+	grep "cloned. does not exist" err
+
+fatal: '/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned' does not exist
+ok 20 - `scalar [...] <dir>` errors out when dir is missing
+
+checking prerequisite: UNZIP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+	"$GIT_UNZIP" -v
+	test $? -ne 127
+
+)
+UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
+
+Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
+see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
+
+Compiled with gcc 14.2.0 for Unix (Linux ELF).
+
+UnZip special compilation options:
+        ACORN_FTYPE_NFS
+        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
+        SET_DIR_ATTRIB
+        SYMLINKS (symbolic links supported, if RTL and file system permit)
+        TIMESTAMP
+        UNIXBACKUP
+        USE_EF_UT_TIME
+        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
+        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
+        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
+        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
+        ZIP64_SUPPORT (archives using Zip64 for large files supported)
+        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
+        VMS_TEXT_CONV
+        WILD_STOP_AT_DIR
+        [decryption, version 2.11 of 05 Jan 2007]
+
+UnZip and ZipInfo environment options:
+           UNZIP:  [none]
+        UNZIPOPT:  [none]
+         ZIPINFO:  [none]
+      ZIPINFOOPT:  [none]
+prerequisite UNZIP ok
+expecting success of 9210.21 'scalar diagnose': 
+	scalar clone "file://$(pwd)" cloned --single-branch &&
+	git repack &&
+	echo "$(pwd)/.git/objects/" >>cloned/src/.git/objects/info/alternates &&
+	test_commit -C cloned/src loose &&
+	scalar diagnose cloned >out 2>err &&
+	grep "Available space" out &&
+	sed -n "s/.*$SQ\\(.*\\.zip\\)$SQ.*/\\1/p" <err >zip_path &&
+	zip_path=$(cat zip_path) &&
+	test -n "$zip_path" &&
+	"$GIT_UNZIP" -v "$zip_path" &&
+	folder=${zip_path%.zip} &&
+	test_path_is_missing "$folder" &&
+	"$GIT_UNZIP" -p "$zip_path" diagnostics.log >out &&
+	test_file_not_empty out &&
+	"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
+	grep "$(pwd)/.git/objects" out &&
+	"$GIT_UNZIP" -p "$zip_path" objects-local.txt >out &&
+	grep "^Total: [1-9]" out
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/src/.git/
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'parallel'
+branch 'parallel' set up to track 'origin/parallel'.
+Your branch is up to date with 'origin/parallel'.
+[parallel 5d34185] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+Available space on '/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/src': 65.35 GiB (mount flags 0x1000)
+Archive:  /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/.scalarDiagnostics/git-diagnostics-20250130_021946.zip
+ Length   Method    Size  Cmpr    Date    Time   CRC-32   Name
+--------  ------  ------- ---- ---------- ----- --------  ----
+     403  Defl:N      243  40% 2025-01-30 02:19 13f85ce2  diagnostics.log
+    1087  Defl:N      260  76% 2025-01-30 02:19 ce0cfe4d  packs-local.txt
+     198  Defl:N      132  33% 2025-01-30 02:19 bcb97240  objects-local.txt
+       6  Stored        6   0% 2025-01-30 02:19 183bc9be  .git/COMMIT_EDITMSG
+     602  Defl:N      417  31% 2025-01-30 02:19 2db7fe33  .git/index
+    1123  Defl:N      577  49% 2025-01-30 02:19 8a33a857  .git/config
+      25  Stored       25   0% 2025-01-30 02:19 7ce4afd6  .git/HEAD
+     425  Defl:N      177  58% 2025-01-30 02:19 4cfc6992  .git/FETCH_HEAD
+      57  Defl:N       39  32% 2025-01-30 02:19 795d289e  .git/config.worktree
+      73  Defl:N       63  14% 2025-01-30 02:19 1f078b37  .git/description
+     478  Defl:N      279  42% 2025-01-30 02:19 09f84f85  .git/hooks/applypatch-msg.sample
+     896  Defl:N      503  44% 2025-01-30 02:19 10caf8e9  .git/hooks/commit-msg.sample
+    4726  Defl:N     1814  62% 2025-01-30 02:19 793c7cef  .git/hooks/fsmonitor-watchman.sample
+     189  Defl:N      138  27% 2025-01-30 02:19 c0f70c9a  .git/hooks/post-update.sample
+     424  Defl:N      265  38% 2025-01-30 02:19 024cc0cf  .git/hooks/pre-applypatch.sample
+    1649  Defl:N      907  45% 2025-01-30 02:19 1b0e50ae  .git/hooks/pre-commit.sample
+     416  Defl:N      255  39% 2025-01-30 02:19 5ef33f44  .git/hooks/pre-merge-commit.sample
+    1374  Defl:N      701  49% 2025-01-30 02:19 f90a0f0f  .git/hooks/pre-push.sample
+    4898  Defl:N     2015  59% 2025-01-30 02:19 5158ec84  .git/hooks/pre-rebase.sample
+     544  Defl:N      329  40% 2025-01-30 02:19 96f8c492  .git/hooks/pre-receive.sample
+    1492  Defl:N      744  50% 2025-01-30 02:19 303613ed  .git/hooks/prepare-commit-msg.sample
+    2783  Defl:N     1254  55% 2025-01-30 02:19 f00806d3  .git/hooks/push-to-checkout.sample
+    2308  Defl:N      975  58% 2025-01-30 02:19 4b9edd4e  .git/hooks/sendemail-validate.sample
+    3650  Defl:N     1173  68% 2025-01-30 02:19 06fcf0d9  .git/hooks/update.sample
+       8  Stored        8   0% 2025-01-30 02:19 4cc141be  .git/info/sparse-checkout
+     240  Defl:N      173  28% 2025-01-30 02:19 21cd3d77  .git/info/exclude
+     323  Defl:N      168  48% 2025-01-30 02:19 dc297921  .git/logs/HEAD
+     319  Defl:N      164  49% 2025-01-30 02:19 51851cc6  .git/logs/refs/heads/parallel
+     183  Defl:N      131  28% 2025-01-30 02:19 403541c6  .git/logs/refs/remotes/origin/parallel
+      81  Defl:N       77   5% 2025-01-30 02:19 d1b7b4b6  .git/objects/info/alternates
+--------          -------  ---                            -------
+   30980            14012  55%                            30 files
+Contents of /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/.git/objects:
+Total: 3 loose objects
+ok 21 - scalar diagnose
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9350-fast-export.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/.git/
+expecting success of 9350.1 'setup': 
+
+	echo break it > file0 &&
+	git add file0 &&
+	test_tick &&
+	echo Wohlauf > file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	echo die Luft > file &&
+	echo geht frisch > file2 &&
+	git add file file2 &&
+	test_tick &&
+	git commit -m second &&
+	echo und > file2 &&
+	test_tick &&
+	git commit -m third file2 &&
+	test_tick &&
+	git tag rein &&
+	git checkout -b wer HEAD^ &&
+	echo lange > file2 &&
+	test_tick &&
+	git commit -m sitzt file2 &&
+	test_tick &&
+	git tag -a -m valentin muss &&
+	git merge -s ours main
+
+
+[main (root-commit) 283ea05] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 file0
+[main 300cb83] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+[main 80f15f4] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'wer'
+[wer 708f3c9] sitzt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merge made by the 'ours' strategy.
+ok 1 - setup
+
+expecting success of 9350.2 'fast-export | fast-import': 
+
+	MAIN=$(git rev-parse --verify main) &&
+	REIN=$(git rev-parse --verify rein) &&
+	WER=$(git rev-parse --verify wer) &&
+	MUSS=$(git rev-parse --verify muss) &&
+	mkdir new &&
+	git --git-dir=new/.git init &&
+	git fast-export --all >actual &&
+	(cd new &&
+	 git fast-import &&
+	 test $MAIN = $(git rev-parse --verify refs/heads/main) &&
+	 test $REIN = $(git rev-parse --verify refs/tags/rein) &&
+	 test $WER = $(git rev-parse --verify refs/heads/wer) &&
+	 test $MUSS = $(git rev-parse --verify refs/tags/muss)) <actual
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/new/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (         0 duplicates                  )
+      blobs  :            6 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            4 (         0 duplicates          3 deltas of          3 attempts)
+      commits:            5 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            1 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           4 (         3 loads     )
+      marks:           1024 (        11 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          5
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1158
+---------------------------------------------------------------------
+
+ok 2 - fast-export | fast-import
+
+expecting success of 9350.3 'fast-export ^muss^{commit} muss': 
+	git fast-export --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
+	cat >expected <<-EOF &&
+	tag muss
+	from $(git rev-parse --verify muss^{commit})
+	$(git cat-file tag muss | grep tagger)
+	data 9
+	valentin
+
+	EOF
+	test_cmp expected actual
+
+ok 3 - fast-export ^muss^{commit} muss
+
+expecting success of 9350.4 'fast-export --mark-tags ^muss^{commit} muss': 
+	git fast-export --mark-tags --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
+	cat >expected <<-EOF &&
+	tag muss
+	mark :1
+	from $(git rev-parse --verify muss^{commit})
+	$(git cat-file tag muss | grep tagger)
+	data 9
+	valentin
+
+	EOF
+	test_cmp expected actual
+
+ok 4 - fast-export --mark-tags ^muss^{commit} muss
+
+expecting success of 9350.5 'fast-export main~2..main': 
+
+	git fast-export main~2..main >actual &&
+	sed "s/main/partial/" actual |
+		(cd new &&
+		 git fast-import &&
+		 test $MAIN != $(git rev-parse --verify refs/heads/partial) &&
+		 git diff --exit-code main partial &&
+		 git diff --exit-code main^ partial^ &&
+		 test_must_fail git rev-parse partial~2)
+
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            8 (         0 duplicates                  )
+      blobs  :            4 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         6 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+fatal: ambiguous argument 'partial~2': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+partial~2
+ok 5 - fast-export main~2..main
+
+expecting success of 9350.6 'fast-export --reference-excluded-parents main~2..main': 
+
+	git fast-export --reference-excluded-parents main~2..main >actual &&
+	grep commit.refs/heads/main actual >commit-count &&
+	test_line_count = 2 commit-count &&
+	sed "s/main/rewrite/" actual |
+		(cd new &&
+		 git fast-import &&
+		 test $MAIN = $(git rev-parse --verify refs/heads/rewrite))
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            7 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         5 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 6 - fast-export --reference-excluded-parents main~2..main
+
+expecting success of 9350.7 'fast-export --show-original-ids': 
+
+	git fast-export --show-original-ids main >output &&
+	grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
+	git rev-list --objects main muss >objects-and-names &&
+	awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
+	comm -23 actual commits-trees-blobs >unfound &&
+	test_must_be_empty unfound
+
+ok 7 - fast-export --show-original-ids
+
+expecting success of 9350.8 'fast-export --show-original-ids | git fast-import': 
+
+	git fast-export --show-original-ids main muss | git fast-import --quiet &&
+	test $MAIN = $(git rev-parse --verify refs/heads/main) &&
+	test $MUSS = $(git rev-parse --verify refs/tags/muss)
+
+ok 8 - fast-export --show-original-ids | git fast-import
+
+expecting success of 9350.9 'reencoding iso-8859-7': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	test_tick &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+	git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
+	sed "s/wer/i18n/" iso-8859-7.fi |
+		(cd new &&
+		 git fast-import &&
+		 # The commit object, if not re-encoded, would be 200 bytes plus hash.
+		 # Removing the "encoding iso-8859-7\n" header drops 20 bytes.
+		 # Re-encoding the Pi character from \xF0 (\360) in iso-8859-7
+		 # to \xCF\x80 (\317\200) in UTF-8 adds a byte.  Check for
+		 # the expected size.
+		 test $(($(test_oid hexsz) + 181)) -eq "$(git cat-file -s i18n)" &&
+		 # ...and for the expected translation of bytes.
+		 git cat-file commit i18n >actual &&
+		 grep $(printf "\317\200") actual &&
+		 # Also make sure the commit does not have the "encoding" header
+		 ! grep ^encoding actual)
+
+[wer 6941255] Pi: ð
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            5 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+Pi: π
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 9 - reencoding iso-8859-7
+
+expecting success of 9350.10 'aborting on iso-8859-7': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+	test_must_fail git fast-export --reencode=abort wer^..wer >iso-8859-7.fi
+
+[wer 6941255] Pi: ð
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Encountered commit-specific encoding iso-8859-7 in commit 69412559de66ce43db5f4d5fd25191a3ab0b1823; use --reencode=[yes|no] to handle it
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 10 - aborting on iso-8859-7
+
+expecting success of 9350.11 'preserving iso-8859-7': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+	git fast-export --reencode=no wer^..wer >iso-8859-7.fi &&
+	sed "s/wer/i18n-no-recoding/" iso-8859-7.fi |
+		(cd new &&
+		 git fast-import &&
+		 # The commit object, if not re-encoded, is 200 bytes plus hash.
+		 # Removing the "encoding iso-8859-7\n" header would drops 20
+		 # bytes.  Re-encoding the Pi character from \xF0 (\360) in
+		 # iso-8859-7 to \xCF\x80 (\317\200) in UTF-8 adds a byte.
+		 # Check for the expected size...
+		 test $(($(test_oid hexsz) + 200)) -eq "$(git cat-file -s i18n-no-recoding)" &&
+		 # ...as well as the expected byte.
+		 git cat-file commit i18n-no-recoding >actual &&
+		 grep $(printf "\360") actual &&
+		 # Also make sure the commit has the "encoding" header
+		 grep ^encoding actual)
+
+[wer 6941255] Pi: ð
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            5 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+Pi: ð
+encoding iso-8859-7
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 11 - preserving iso-8859-7
+
+expecting success of 9350.12 'encoding preserved if reencoding fails': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/broken-iso-8859-7-commit-message.txt" file &&
+	git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
+	sed "s/wer/i18n-invalid/" iso-8859-7.fi |
+		(cd new &&
+		 git fast-import &&
+		 git cat-file commit i18n-invalid >actual &&
+		 # Make sure the commit still has the encoding header
+		 grep ^encoding actual &&
+		 # Verify that the commit has the expected size; i.e.
+		 # that no bytes were re-encoded to a different encoding.
+		 test $(($(test_oid hexsz) + 212)) -eq "$(git cat-file -s i18n-invalid)" &&
+		 # ...and check for the original special bytes
+		 grep $(printf "\360") actual &&
+		 grep $(printf "\377") actual)
+
+[wer 5cc588f] Pi: ð; Invalid: ÿ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            5 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+encoding iso-8859-7
+Pi: ð; Invalid: ÿ
+Pi: ð; Invalid: ÿ
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 12 - encoding preserved if reencoding fails
+
+expecting success of 9350.13 'import/export-marks': 
+
+	git checkout -b marks main &&
+	git fast-export --export-marks=tmp-marks HEAD &&
+	test -s tmp-marks &&
+	test_line_count = 3 tmp-marks &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks HEAD >actual &&
+	test $(grep ^commit actual | wc -l) -eq 0 &&
+	echo change > file &&
+	git commit -m "last commit" file &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks HEAD >actual &&
+	test $(grep ^commit\  actual | wc -l) -eq 1 &&
+	test_line_count = 4 tmp-marks
+
+
+Switched to a new branch 'marks'
+blob
+mark :1
+data 8
+Wohlauf
+
+blob
+mark :2
+data 9
+break it
+
+reset refs/heads/marks
+commit refs/heads/marks
+mark :3
+author A U Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
+data 8
+initial
+M 100644 :2 file0
+M 100644 :1 file
+
+blob
+mark :4
+data 9
+die Luft
+
+blob
+mark :5
+data 12
+geht frisch
+
+commit refs/heads/marks
+mark :6
+author A U Thor <author@example.com> 1112912113 -0700
+committer C O Mitter <committer@example.com> 1112912113 -0700
+data 7
+second
+from :3
+M 100644 :5 file2
+M 100644 :4 file
+
+blob
+mark :7
+data 4
+und
+
+commit refs/heads/marks
+mark :8
+author A U Thor <author@example.com> 1112912173 -0700
+committer C O Mitter <committer@example.com> 1112912173 -0700
+data 6
+third
+from :6
+M 100644 :7 file2
+
+[marks 00d551b] last commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - import/export-marks
+
+expecting success of 9350.14 'set up faked signed tag': 
+
+	git fast-import <signed-tag-import
+
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            1 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2399 KiB
+       pools:          2048 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 14 - set up faked signed tag
+
+expecting success of 9350.15 'signed-tags=abort': 
+
+	test_must_fail git fast-export --signed-tags=abort sign-your-name
+
+
+fatal: encountered signed tag a3638f8ba890fd4c674f4a3c04947833ab5dcd43; use --signed-tags=<mode> to handle it
+blob
+mark :1
+data 8
+Wohlauf
+
+blob
+mark :2
+data 9
+break it
+
+reset refs/tags/sign-your-name
+commit refs/tags/sign-your-name
+mark :3
+author A U Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
+data 8
+initial
+M 100644 :2 file0
+M 100644 :1 file
+
+blob
+mark :4
+data 9
+die Luft
+
+blob
+mark :5
+data 12
+geht frisch
+
+commit refs/tags/sign-your-name
+mark :6
+author A U Thor <author@example.com> 1112912113 -0700
+committer C O Mitter <committer@example.com> 1112912113 -0700
+data 7
+second
+from :3
+M 100644 :5 file2
+M 100644 :4 file
+
+blob
+mark :7
+data 4
+und
+
+commit refs/tags/sign-your-name
+mark :8
+author A U Thor <author@example.com> 1112912173 -0700
+committer C O Mitter <committer@example.com> 1112912173 -0700
+data 6
+third
+from :6
+M 100644 :7 file2
+
+blob
+mark :9
+data 7
+change
+
+commit refs/tags/sign-your-name
+mark :10
+author A U Thor <author@example.com> 1112912413 -0700
+committer C O Mitter <committer@example.com> 1112912413 -0700
+data 12
+last commit
+from :8
+M 100644 :9 file
+
+ok 15 - signed-tags=abort
+
+expecting success of 9350.16 'signed-tags=verbatim': 
+
+	git fast-export --signed-tags=verbatim sign-your-name > output &&
+	grep PGP output
+
+
+-----BEGIN PGP SIGNATURE-----
+-----END PGP SIGNATURE-----
+ok 16 - signed-tags=verbatim
+
+expecting success of 9350.17 'signed-tags=strip': 
+
+	git fast-export --signed-tags=strip sign-your-name > output &&
+	! grep PGP output
+
+
+ok 17 - signed-tags=strip
+
+expecting success of 9350.18 'signed-tags=warn-strip': 
+	git fast-export --signed-tags=warn-strip sign-your-name >output 2>err &&
+	! grep PGP output &&
+	test -s err
+
+ok 18 - signed-tags=warn-strip
+
+expecting success of 9350.19 'setup submodule': 
+
+	test_config_global protocol.file.allow always &&
+	git checkout -f main &&
+	mkdir sub &&
+	(
+		cd sub &&
+		git init  &&
+		echo test file > file &&
+		git add file &&
+		git commit -m sub_initial
+	) &&
+	git submodule add "$(pwd)/sub" sub &&
+	git commit -m initial &&
+	test_tick &&
+	(
+		cd sub &&
+		echo more data >> file &&
+		git add file &&
+		git commit -m sub_second
+	) &&
+	git add sub &&
+	git commit -m second
+
+
+Switched to branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/sub/.git/
+[main (root-commit) 075e849] sub_initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Adding existing repo at 'sub' to the index
+[main 76b186a] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[main 53da5af] sub_second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 9b44221] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 19 - setup submodule
+
+expecting success of 9350.20 'submodule fast-export | fast-import': 
+
+	test_config_global protocol.file.allow always &&
+	SUBENT1=$(git ls-tree main^ sub) &&
+	SUBENT2=$(git ls-tree main sub) &&
+	rm -rf new &&
+	mkdir new &&
+	git --git-dir=new/.git init &&
+	git fast-export --signed-tags=strip --all >actual &&
+	(cd new &&
+	 git fast-import &&
+	 test "$SUBENT1" = "$(git ls-tree refs/heads/main^ sub)" &&
+	 test "$SUBENT2" = "$(git ls-tree refs/heads/main sub)" &&
+	 git checkout main &&
+	 git submodule init &&
+	 git submodule update &&
+	 cmp sub/file ../sub/file) <actual
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/new/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           25 (         0 duplicates                  )
+      blobs  :            8 (         0 duplicates          0 deltas of          1 attempts)
+      trees  :            7 (         0 duplicates          6 deltas of          6 attempts)
+      commits:            8 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           5 (         5 loads     )
+      marks:           1024 (        16 unique    )
+      atoms:              5
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          8
+pack_report: pack_mmap_calls          =          4
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1494
+---------------------------------------------------------------------
+
+Already on 'main'
+Submodule 'sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/new/sub'...
+done.
+Submodule path 'sub': checked out '53da5af386a666416b61517c3f90dafe75821d2b'
+ok 20 - submodule fast-export | fast-import
+
+expecting success of 9350.21 'setup copies': 
+
+	git checkout -b copy rein &&
+	git mv file file3 &&
+	git commit -m move1 &&
+	test_tick &&
+	cp file2 file4 &&
+	git add file4 &&
+	git mv file2 file5 &&
+	git commit -m copy1 &&
+	test_tick &&
+	cp file3 file6 &&
+	git add file6 &&
+	git commit -m copy2 &&
+	test_tick &&
+	echo more text >> file6 &&
+	echo even more text >> file6 &&
+	git add file6 &&
+	git commit -m modify &&
+	test_tick &&
+	cp file6 file7 &&
+	echo test >> file7 &&
+	git add file7 &&
+	git commit -m copy_modify
+
+
+warning: unable to rmdir 'sub': Directory not empty
+Switched to a new branch 'copy'
+[copy 16740da] move1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => file3 (100%)
+[copy 0d83758] copy1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename file2 => file4 (100%)
+ create mode 100644 file5
+[copy 44ca68a] copy2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file6
+[copy 22ab272] modify
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[copy ed9d1ab] copy_modify
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 file7
+ok 21 - setup copies
+
+expecting success of 9350.22 'fast-export -C -C | fast-import': 
+
+	ENTRY=$(git rev-parse --verify copy) &&
+	rm -rf new &&
+	mkdir new &&
+	git --git-dir=new/.git init &&
+	git fast-export -C -C --signed-tags=strip --all > output &&
+	grep "^C file2 file4\$" output &&
+	cat output |
+	(cd new &&
+	 git fast-import &&
+	 test $ENTRY = $(git rev-parse --verify refs/heads/copy))
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/new/.git/
+C file2 file4
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           37 (         0 duplicates                  )
+      blobs  :           10 (         0 duplicates          1 deltas of          3 attempts)
+      trees  :           12 (         0 duplicates         11 deltas of         11 attempts)
+      commits:           13 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           6 (         6 loads     )
+      marks:           1024 (        23 unique    )
+      atoms:             10
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =         10
+pack_report: pack_mmap_calls          =          5
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1941
+---------------------------------------------------------------------
+
+ok 22 - fast-export -C -C | fast-import
+
+expecting success of 9350.23 'fast-export | fast-import when main is tagged': 
+
+	git tag -m msg last &&
+	git fast-export -C -C --signed-tags=strip --all > output &&
+	test $(grep -c "^tag " output) = 3
+
+
+ok 23 - fast-export | fast-import when main is tagged
+
+expecting success of 9350.24 'cope with tagger-less tags': 
+
+	TAG=$(git hash-object --literally -t tag -w tag-content) &&
+	git update-ref refs/tags/sonnenschein $TAG &&
+	git fast-export -C -C --signed-tags=strip --all > output &&
+	test $(grep -c "^tag " output) = 4 &&
+	! grep "Unspecified Tagger" output &&
+	git fast-export -C -C --signed-tags=strip --all \
+		--fake-missing-tagger > output &&
+	test $(grep -c "^tag " output) = 4 &&
+	grep "Unspecified Tagger" output
+
+
+tagger Unspecified Tagger <unspecified-tagger> 0 +0000
+ok 24 - cope with tagger-less tags
+
+expecting success of 9350.25 'setup for limiting exports by PATH': 
+	mkdir limit-by-paths &&
+	(
+		cd limit-by-paths &&
+		git init &&
+		echo hi > there &&
+		git add there &&
+		git commit -m "First file" &&
+		echo foo > bar &&
+		git add bar &&
+		git commit -m "Second file" &&
+		git tag -a -m msg mytag &&
+		echo morefoo >> bar &&
+		git add bar &&
+		git commit -m "Change to second file"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/limit-by-paths/.git/
+[main (root-commit) c4bb517] First file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 there
+[main 5b2b7c2] Second file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[main 49ac088] Change to second file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 25 - setup for limiting exports by PATH
+
+expecting success of 9350.26 'dropping tag of filtered out object': 
+(
+	cd limit-by-paths &&
+	git fast-export --tag-of-filtered-object=drop mytag -- there > output &&
+	test_cmp expected output
+)
+
+ok 26 - dropping tag of filtered out object
+
+expecting success of 9350.27 'rewriting tag of filtered out object': 
+(
+	cd limit-by-paths &&
+	git fast-export --tag-of-filtered-object=rewrite mytag -- there > output &&
+	test_cmp expected output
+)
+
+ok 27 - rewriting tag of filtered out object
+
+expecting success of 9350.28 'rewrite tag predating pathspecs to nothing': 
+	test_create_repo rewrite_tag_predating_pathspecs &&
+	(
+		cd rewrite_tag_predating_pathspecs &&
+
+		test_commit initial &&
+
+		git tag -a -m "Some old tag" v0.0.0.0.0.0.1 &&
+
+		test_commit bar &&
+
+		git fast-export --tag-of-filtered-object=rewrite --all -- bar.t >output &&
+		grep from.$ZERO_OID output
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/rewrite_tag_predating_pathspecs/.git/
+[main (root-commit) f175d86] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main 3f8d6f0] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+from 0000000000000000000000000000000000000000
+from 0000000000000000000000000000000000000000
+ok 28 - rewrite tag predating pathspecs to nothing
+
+checking known breakage of 9350.29 'no exact-ref revisions included': 
+	(
+		cd limit-by-paths &&
+		git fast-export main~2..main~1 > output &&
+		test_cmp expected output
+	)
+
+--- expected	2025-01-30 02:19:45.498982430 +0000
++++ output	2025-01-30 02:19:45.530982622 +0000
+@@ -8,8 +8,7 @@
+ data 3
+ hi
+ 
+-reset refs/heads/main
+-commit refs/heads/main
++commit main~1
+ mark :3
+ author A U Thor <author@example.com> 1112912713 -0700
+ committer C O Mitter <committer@example.com> 1112912713 -0700
+not ok 29 - no exact-ref revisions included # TODO known breakage
+
+expecting success of 9350.30 'path limiting with import-marks does not lose unmodified files': 
+	git checkout -b simple marks~2 &&
+	git fast-export --export-marks=marks simple -- file > /dev/null &&
+	echo more content >> file &&
+	test_tick &&
+	git commit -mnext file &&
+	git fast-export --import-marks=marks simple -- file file0 >actual &&
+	grep file0 actual
+
+Switched to a new branch 'simple'
+[simple ed6c25d] next
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+M 100644 :6 file0
+ok 30 - path limiting with import-marks does not lose unmodified files
+
+expecting success of 9350.31 'path limiting works': 
+	git fast-export simple -- file >actual &&
+	sed -ne "s/^M .* //p" <actual | sort -u >actual.files &&
+	echo file >expect &&
+	test_cmp expect actual.files
+
+ok 31 - path limiting works
+
+expecting success of 9350.32 'avoid corrupt stream with non-existent mark': 
+	test_create_repo avoid_non_existent_mark &&
+	(
+		cd avoid_non_existent_mark &&
+
+		test_commit important-path &&
+
+		test_commit ignored &&
+
+		git branch A &&
+		git branch B &&
+
+		echo foo >>important-path.t &&
+		git add important-path.t &&
+		test_commit more changes &&
+
+		git fast-export --all -- important-path.t | git fast-import --force
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/avoid_non_existent_mark/.git/
+[main (root-commit) 8503f52] important-path
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 important-path.t
+[main f2403bd] ignored
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ignored.t
+[main 0864148] more
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 changes
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            6 (         0 duplicates                  )
+      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
       tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
+Total branches:           6 (         2 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              1
+Memory total:          2493 KiB
+       pools:          2141 KiB
      objects:           351 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize = 1073741824
 pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          6
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /        486
 ---------------------------------------------------------------------
 
-ok 12 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=0
+ok 32 - avoid corrupt stream with non-existent mark
 
-expecting success of 9303.13 'fast-import (loose) with -c core.compression=0 -c core.loosecompression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=9 $config &&
-		sz=$(test_file_size .git/objects/??/????*) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
+expecting success of 9350.33 'full-tree re-shows unmodified files': 
+	git checkout -f simple &&
+	git fast-export --full-tree simple >actual &&
+	test $(grep -c file0 actual) -eq 3
+
+Already on 'simple'
+ok 33 - full-tree re-shows unmodified files
+
+expecting success of 9350.34 'set-up a few more tags for tag export tests': 
+	git checkout -f main &&
+	HEAD_TREE=$(git show -s --pretty=raw HEAD | sed -n "/tree/s/tree //p") &&
+	git tag    tree_tag        -m "tagging a tree" $HEAD_TREE &&
+	git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE &&
+	git tag    tag-obj_tag     -m "tagging a tag" tree_tag-obj &&
+	git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
+
+Switched to branch 'main'
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f tag-obj_tag tree_tag-obj^{}
+hint: Disable this message with "git config advice.nestedTag false"
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f tag-obj_tag-obj tree_tag-obj^{}
+hint: Disable this message with "git config advice.nestedTag false"
+ok 34 - set-up a few more tags for tag export tests
+
+expecting success of 9350.35 'tree_tag': 
+	mkdir result &&
+	(cd result && git init) &&
+	git fast-export tree_tag > fe-stream &&
+	(cd result && git fast-import < ../fe-stream)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/result/.git/
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 2516549014edd9dfa47a30176eac045c6786c9fb,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+Total objects:            0 (         0 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
       trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
       commits:            0 (         0 duplicates          0 deltas of          0 attempts)
       tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
@@ -530320,31 +532611,164 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 13 - fast-import (loose) with -c core.compression=0 -c core.loosecompression=9
+ok 35 - tree_tag
 
-expecting success of 9303.14 'fast-import (loose) with -c core.compression=9 -c core.loosecompression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=9 $config &&
-		sz=$(test_file_size .git/objects/??/????*) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
+expecting success of 9350.36 'tree_tag-obj': git fast-export tree_tag-obj
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 72a752e8d1c88d34d9afd9c39bf2a282d2079f56,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+ok 36 - tree_tag-obj
+
+expecting success of 9350.37 'tag-obj_tag': git fast-export tag-obj_tag
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 72a752e8d1c88d34d9afd9c39bf2a282d2079f56,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+warning: Omitting tag 10db1d54284bce2b194af52fe4510dcbebfc0e06,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+ok 37 - tag-obj_tag
+
+expecting success of 9350.38 'tag-obj_tag-obj': git fast-export tag-obj_tag-obj
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 72a752e8d1c88d34d9afd9c39bf2a282d2079f56,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+warning: Omitting tag faa0e7b8513c5e5501d1ac1f66ef270edb7bd02d,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+ok 38 - tag-obj_tag-obj
+
+expecting success of 9350.39 'handling tags of blobs': 
+	git tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
+	git fast-export blobtag >actual &&
+	cat >expect <<-EOF &&
+	blob
+	mark :1
+	data 9
+	die Luft
+
+	tag blobtag
+	from :1
+	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 14
+	Tag of a blob
+
+	EOF
+	test_cmp expect actual
+
+ok 39 - handling tags of blobs
+
+expecting success of 9350.40 'handling nested tags': 
+	git tag -a -m "This is a nested tag" nested muss &&
+	git fast-export --mark-tags nested >output &&
+	grep "^from $ZERO_OID$" output &&
+	grep "^tag nested$" output >tag_lines &&
+	test_line_count = 2 tag_lines
+
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f nested muss^{}
+hint: Disable this message with "git config advice.nestedTag false"
+from 0000000000000000000000000000000000000000
+ok 40 - handling nested tags
+
+expecting success of 9350.41 'directory becomes symlink': 
+	git init dirtosymlink &&
+	git init result &&
+	(
+		cd dirtosymlink &&
+		mkdir foo &&
+		mkdir bar &&
+		echo hello > foo/world &&
+		echo hello > bar/world &&
+		git add foo/world bar/world &&
+		git commit -q -mone &&
+		git rm -r foo &&
+		test_ln_s_add bar foo &&
+		git commit -q -mtwo
+	) &&
+	(
+		cd dirtosymlink &&
+		git fast-export main -- foo |
+		(cd ../result && git fast-import --quiet)
+	) &&
+	(cd result && git show main:foo)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/dirtosymlink/.git/
+Reinitialized existing Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/result/.git/
+rm 'foo/world'
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+barok 41 - directory becomes symlink
+
+expecting success of 9350.42 'fast-export quotes pathnames': 
+	git init crazy-paths &&
+	test_config -C crazy-paths core.protectNTFS false &&
+	(cd crazy-paths &&
+	 blob=$(echo foo | git hash-object -w --stdin) &&
+	 git -c core.protectNTFS=false update-index --add \
+		--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
+		--cacheinfo 100644 $blob "path with \"quote\"" \
+		--cacheinfo 100644 $blob "path with \\backslash" \
+		--cacheinfo 100644 $blob "path with space" &&
+	 git commit -m addition &&
+	 git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
+	 git read-tree --empty &&
+	 git update-index -z --index-info <index &&
+	 git commit -m rename &&
+	 git read-tree --empty &&
+	 git commit -m deletion &&
+	 git fast-export -M HEAD >export.out &&
+	 git rev-list HEAD >expect &&
+	 git init result &&
+	 cd result &&
+	 git fast-import <../export.out &&
+	 git rev-list HEAD >actual &&
+	 test_cmp ../expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/crazy-paths/.git/
+[main (root-commit) deac6af] addition
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 "path with\nnewline"
+ create mode 100644 "path with \"quote\""
+ create mode 100644 "path with \\backslash"
+ create mode 100644 path with space
+[main 89b4a6a] rename
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ rename "path with\nnewline" => "subdir/path with\nnewline" (100%)
+ rename "path with \"quote\"" => "subdir/path with \"quote\"" (100%)
+ rename "path with \\backslash" => "subdir/path with \\backslash" (100%)
+ rename path with space => subdir/path with space (100%)
+[main 39f052a] deletion
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 deletions(-)
+ delete mode 100644 "subdir/path with\nnewline"
+ delete mode 100644 "subdir/path with \"quote\""
+ delete mode 100644 "subdir/path with \\backslash"
+ delete mode 100644 subdir/path with space
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/crazy-paths/result/.git/
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
+Total objects:            7 (         1 duplicates                  )
       blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            3 (         1 duplicates          0 deltas of          1 attempts)
+      commits:            3 (         0 duplicates          0 deltas of          0 attempts)
       tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              5
+Memory total:          2493 KiB
+       pools:          2141 KiB
      objects:           351 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -530356,67 +532780,61 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 14 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=9
+ok 42 - fast-export quotes pathnames
 
-expecting success of 9303.15 'fast-import (loose) with -c core.loosecompression=0': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=9 $config &&
-		sz=$(test_file_size .git/objects/??/????*) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
+expecting success of 9350.43 'test bidirectionality': 
+	git init marks-test &&
+	git fast-export --export-marks=marks-cur --import-marks-if-exists=marks-cur --branches | \
+	git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks-if-exists=marks-new &&
+	(cd marks-test &&
+	git reset --hard &&
+	echo Wohlauf > file &&
+	git commit -a -m "back in time") &&
+	git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks-if-exists=marks-new --branches | \
+	git fast-import --export-marks=marks-cur --import-marks-if-exists=marks-cur
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/marks-test/.git/
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+Total objects:           38 (         0 duplicates                  )
+      blobs  :           11 (         0 duplicates          1 deltas of          4 attempts)
+      trees  :           13 (         0 duplicates         12 deltas of         12 attempts)
+      commits:           14 (         0 duplicates          0 deltas of          0 attempts)
       tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
+Total branches:           5 (         5 loads     )
+      marks:           1024 (        25 unique    )
+      atoms:             10
+Memory total:          2493 KiB
+       pools:          2141 KiB
      objects:           351 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize = 1073741824
 pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          8
+pack_report: pack_mmap_calls          =          4
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1494
 ---------------------------------------------------------------------
 
-ok 15 - fast-import (loose) with -c core.loosecompression=0
-
-expecting success of 9303.16 'fast-import (loose) with -c core.loosecompression=9': 
-		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
-		test_when_finished "rm -rf .git/objects/??" &&
-		import_large -c fastimport.unpacklimit=9 $config &&
-		sz=$(test_file_size .git/objects/??/????*) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
+HEAD is now at 9b44221 second
+[main c9a810a] back in time
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
+Total objects:            3 (         0 duplicates                  )
       blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      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:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
+Total branches:           5 (         1 loads     )
+      marks:           1024 (        16 unique    )
+      atoms:              5
+Memory total:          2493 KiB
+       pools:          2141 KiB
      objects:           351 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -530428,135 +532846,105 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 16 - fast-import (loose) with -c core.loosecompression=9
+ok 43 - test bidirectionality
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9351-fast-export-anonymize.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9351-fast-export-anonymize/.git/
-expecting success of 9351.1 'setup simple repo': 
-	test_commit base &&
-	test_commit foo &&
-	test_commit retain-me &&
-	git checkout -b other HEAD^ &&
-	mkdir subdir &&
-	test_commit subdir/bar &&
-	test_commit subdir/xyzzy &&
-	fake_commit=$(echo $ZERO_OID | sed s/0/a/) &&
-	git update-index --add --cacheinfo 160000,$fake_commit,link1 &&
-	git update-index --add --cacheinfo 160000,$fake_commit,link2 &&
-	git commit -m "add gitlink" &&
-	git tag -m "annotated tag" mytag &&
-	git tag -m "annotated tag with long message" longtag
+expecting success of 9350.44 'avoid uninteresting refs': 
+	> tmp-marks &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks main > /dev/null &&
+	git tag v1.0 &&
+	git branch uninteresting &&
+	echo bump > file &&
+	git commit -a -m bump &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks ^uninteresting ^v1.0 main > actual &&
+	test_cmp expected actual
 
-[main (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[main 64bd085] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[main 98733ca] retain-me
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 retain-me.t
-Switched to a new branch 'other'
-[other 7ff9039] subdir/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/bar.t
-[other 1427cb1] subdir/xyzzy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/xyzzy.t
-[other 73eb103] add gitlink
+[main 480ed5f] bump
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 160000 link1
- create mode 160000 link2
-ok 1 - setup simple repo
-
-expecting success of 9351.2 'export anonymized stream': 
-	git fast-export --anonymize --all \
-		--anonymize-map=retain-me \
-		--anonymize-map=xyzzy:should-not-appear \
-		--anonymize-map=xyzzy:custom-name \
-		--anonymize-map=other \
-		>stream
-
-ok 2 - export anonymized stream
-
-expecting success of 9351.3 'stream omits path names': 
-	! grep base stream &&
-	! grep foo stream &&
-	! grep subdir stream &&
-	! grep bar stream &&
-	! grep xyzzy stream
-
-ok 3 - stream omits path names
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 44 - avoid uninteresting refs
 
-expecting success of 9351.4 'stream contains user-specified names': 
-	grep retain-me stream &&
-	! grep should-not-appear stream &&
-	grep custom-name stream
+expecting success of 9350.45 'refs are updated even if no commits need to be exported': 
+	> tmp-marks &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks main > /dev/null &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks main > actual &&
+	test_cmp expected actual
 
-reset refs/tags/retain-me
-commit refs/tags/ref3/custom-name
-ok 4 - stream contains user-specified names
+ok 45 - refs are updated even if no commits need to be exported
 
-expecting success of 9351.5 'stream omits gitlink oids': 
-	# avoid relying on the whole oid to remain hash-agnostic; this is
-	# plenty to be unique within our test case
-	! grep a000000000000000000 stream
+expecting success of 9350.46 'use refspec': 
+	git fast-export --refspec refs/heads/main:refs/heads/foobar main >actual2 &&
+	grep "^commit " actual2 | sort | uniq >actual &&
+	echo "commit refs/heads/foobar" > expected &&
+	test_cmp expected actual
 
-ok 5 - stream omits gitlink oids
+ok 46 - use refspec
 
-expecting success of 9351.6 'stream retains other as refname': 
-	grep other stream
+expecting success of 9350.47 'delete ref because entire history excluded': 
+	git branch to-delete &&
+	git fast-export to-delete ^to-delete >actual &&
+	cat >expected <<-EOF &&
+	reset refs/heads/to-delete
+	from $ZERO_OID
 
-commit refs/heads/other
-ok 6 - stream retains other as refname
+	EOF
+	test_cmp expected actual
 
-expecting success of 9351.7 'stream omits other refnames': 
-	! grep main stream &&
-	! grep mytag stream &&
-	! grep longtag stream
+ok 47 - delete ref because entire history excluded
 
-ok 7 - stream omits other refnames
+expecting success of 9350.48 'delete refspec': 
+	git fast-export --refspec :refs/heads/to-delete >actual &&
+	cat >expected <<-EOF &&
+	reset refs/heads/to-delete
+	from $ZERO_OID
 
-expecting success of 9351.8 'stream omits identities': 
-	! grep "$GIT_COMMITTER_NAME" stream &&
-	! grep "$GIT_COMMITTER_EMAIL" stream &&
-	! grep "$GIT_AUTHOR_NAME" stream &&
-	! grep "$GIT_AUTHOR_EMAIL" stream
+	EOF
+	test_cmp expected actual
 
-ok 8 - stream omits identities
+ok 48 - delete refspec
 
-expecting success of 9351.9 'stream omits tag message': 
-	! grep "annotated tag" stream
+expecting success of 9350.49 'when using -C, do not declare copy when source of copy is also modified': 
+	test_create_repo src &&
+	echo a_line >src/file.txt &&
+	git -C src add file.txt &&
+	git -C src commit -m 1st_commit &&
 
-ok 9 - stream omits tag message
+	cp src/file.txt src/file2.txt &&
+	echo another_line >>src/file.txt &&
+	git -C src add file.txt file2.txt &&
+	git -C src commit -m 2nd_commit &&
 
-expecting success of 9351.10 'import stream to new repository': 
-	git init new &&
-	cd new &&
-	git fast-import <../stream
+	test_create_repo dst &&
+	git -C src fast-export --all -C >actual &&
+	git -C dst fast-import <actual &&
+	git -C src show >expected &&
+	git -C dst show >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9351-fast-export-anonymize/new/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/src/.git/
+[main (root-commit) b469450] 1st_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.txt
+[main 85ccff7] 2nd_commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file2.txt
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/dst/.git/
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:           21 (         0 duplicates                  )
-      blobs  :            5 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            8 (         0 duplicates          6 deltas of          6 attempts)
-      commits:            6 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           7 (         6 loads     )
-      marks:           1024 (        11 unique    )
-      atoms:              8
+Total objects:            6 (         0 duplicates                  )
+      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              2
 Memory total:          2493 KiB
        pools:          2141 KiB
      objects:           351 KiB
@@ -530564,460 +532952,899 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize = 1073741824
 pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =         12
-pack_report: pack_mmap_calls          =          6
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1442
+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 - import stream to new repository
-
-expecting success of 9351.11 'result has two branches': 
-	git for-each-ref --format="%(refname)" refs/heads >branches &&
-	test_line_count = 2 branches &&
-	other_branch=refs/heads/other &&
-	main_branch=$(grep -v $other_branch branches)
-
-ok 11 - result has two branches
-
-expecting success of 9351.12 'repo has original shape and timestamps': 
-	shape () {
-		git log --format="%m %ct" --left-right --boundary "$@"
-	} &&
-	(cd .. && shape main...other) >expect &&
-	shape $main_branch...$other_branch >actual &&
-	test_cmp expect actual
-
-ok 12 - repo has original shape and timestamps
-
-expecting success of 9351.13 'root tree has original shape': 
-	# the output entries are not necessarily in the same
-	# order, but we should at least have the same set of
-	# object types.
-	git -C .. ls-tree HEAD >orig-root &&
-	cut -d" " -f2 <orig-root | sort >expect &&
-	git ls-tree $other_branch >root &&
-	cut -d" " -f2 <root | sort >actual &&
-	test_cmp expect actual
-
-ok 13 - root tree has original shape
-
-expecting success of 9351.14 'paths in subdir ended up in one tree': 
-	git -C .. ls-tree other:subdir >orig-subdir &&
-	cut -d" " -f2 <orig-subdir | sort >expect &&
-	tree=$(grep tree root | cut -f2) &&
-	git ls-tree $other_branch:$tree >tree &&
-	cut -d" " -f2 <tree >actual &&
-	test_cmp expect actual
-
-ok 14 - paths in subdir ended up in one tree
-
-expecting success of 9351.15 'identical gitlinks got identical oid': 
-	awk "/commit/ { print \$3 }" <root | sort -u >commits &&
-	test_line_count = 1 commits
-
-ok 15 - identical gitlinks got identical oid
-
-expecting success of 9351.16 'all tags point to branch tip': 
-	git rev-parse $other_branch >expect &&
-	git for-each-ref --format="%(*objectname)" | grep . | uniq >actual &&
-	test_cmp expect actual
+ok 49 - when using -C, do not declare copy when source of copy is also modified
 
-ok 16 - all tags point to branch tip
+expecting success of 9350.50 'merge commit gets exported with --import-marks': 
+	test_create_repo merging &&
+	(
+		cd merging &&
+		test_commit initial &&
+		git checkout -b topic &&
+		test_commit on-topic &&
+		git checkout main &&
+		test_commit on-main &&
+		test_tick &&
+		git merge --no-ff -m Yeah topic &&
 
-expecting success of 9351.17 'idents are shared': 
-	git log --all --format="%an <%ae>" >authors &&
-	sort -u authors >unique &&
-	test_line_count = 1 unique &&
-	git log --all --format="%cn <%ce>" >committers &&
-	sort -u committers >unique &&
-	test_line_count = 1 unique &&
-	! test_cmp authors committers
+		echo ":1 $(git rev-parse HEAD^^)" >marks &&
+		git fast-export --import-marks=marks main >out &&
+		grep Yeah out
+	)
 
---- authors	2026-03-04 08:05:00.051352315 +0000
-+++ committers	2026-03-04 08:05:00.083352315 +0000
-@@ -1,6 +1,6 @@
--User 1 <user1@example.com>
--User 1 <user1@example.com>
--User 1 <user1@example.com>
--User 1 <user1@example.com>
--User 1 <user1@example.com>
--User 1 <user1@example.com>
-+User 0 <user0@example.com>
-+User 0 <user0@example.com>
-+User 0 <user0@example.com>
-+User 0 <user0@example.com>
-+User 0 <user0@example.com>
-+User 0 <user0@example.com>
-ok 17 - idents are shared
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/merging/.git/
+[main (root-commit) 1aef781] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'topic'
+[topic bb9f331] on-topic
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 on-topic.t
+Switched to branch 'main'
+[main a2e3e6b] on-main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 on-main.t
+Merge made by the 'ort' strategy.
+ on-topic.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 on-topic.t
+Yeah
+ok 50 - merge commit gets exported with --import-marks
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9211-scalar-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/.git/
-expecting success of 9211.1 'set up repository to clone': 
-	rm -rf .git &&
-	git init to-clone &&
+expecting success of 9350.51 'fast-export --first-parent outputs all revisions output by revision walk': 
+	git init first-parent &&
 	(
-		cd to-clone &&
-		git branch -m base &&
+		cd first-parent &&
+		test_commit A &&
+		git checkout -b topic1 &&
+		test_commit B &&
+		git checkout main &&
+		git merge --no-ff topic1 &&
 
-		test_commit first &&
-		test_commit second &&
-		test_commit third &&
+		git checkout -b topic2 &&
+		test_commit C &&
+		git checkout main &&
+		git merge --no-ff topic2 &&
 
-		git switch -c parallel first &&
-		mkdir -p 1/2 &&
-		test_commit 1/2/3 &&
+		test_commit D &&
 
-		git switch base &&
+		git fast-export main -- --first-parent >first-parent-export &&
+		git fast-export main -- --first-parent --reverse >first-parent-reverse-export &&
+		test_cmp first-parent-export first-parent-reverse-export &&
 
-		# By default, permit
-		git config uploadpack.allowfilter true &&
-		git config uploadpack.allowanysha1inwant true
+		git init import &&
+		git -C import fast-import <first-parent-export &&
+
+		git log --format="%ad %s" --first-parent main >expected &&
+		git -C import log --format="%ad %s" --all >actual &&
+		test_cmp expected actual &&
+		test_line_count = 4 actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/to-clone/.git/
-[base (root-commit) 50e526b] first
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/first-parent/.git/
+[main (root-commit) 40531c9] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[base d662100] second
+ create mode 100644 A.t
+Switched to a new branch 'topic1'
+[topic1 26bf445] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[base cd7036d] third
+ create mode 100644 B.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ B.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'topic2'
+[topic2 3d54688] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 third.t
-Switched to a new branch 'parallel'
-[parallel afe5387] 1/2/3
+ create mode 100644 C.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[main 0270458] D
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 1/2/3.t
-Switched to branch 'base'
-ok 1 - set up repository to clone
-
-expecting success of 9211.2 'creates content in enlistment root': 
-	enlistment=cloned &&
-
-	scalar clone "file://$(pwd)/to-clone" $enlistment &&
-	ls -A $enlistment >enlistment-root &&
-	test_line_count = 1 enlistment-root &&
-	test_path_is_dir $enlistment/src &&
-	test_path_is_dir $enlistment/src/.git &&
-
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/cloned/src/.git/
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 2 - creates content in enlistment root
-
-expecting success of 9211.3 'with spaces': 
-	enlistment="cloned with space" &&
-
-	scalar clone "file://$(pwd)/to-clone" "$enlistment" &&
-	test_path_is_dir "$enlistment" &&
-	test_path_is_dir "$enlistment/src" &&
-	test_path_is_dir "$enlistment/src/.git" &&
+ create mode 100644 D.t
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/first-parent/import/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           12 (         0 duplicates                  )
+      blobs  :            4 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            4 (         0 duplicates          3 deltas of          3 attempts)
+      commits:            4 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         8 unique    )
+      atoms:              4
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-	cleanup_clone "$enlistment"
+ok 51 - fast-export --first-parent outputs all revisions output by revision walk
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/cloned with space/src/.git/
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 3 - with spaces
+expecting success of 9350.52 'fast-export handles --end-of-options': 
+	git update-ref refs/heads/nodash HEAD &&
+	git update-ref refs/heads/--dashes HEAD &&
+	git fast-export --end-of-options nodash >expect &&
+	git fast-export --end-of-options --dashes >actual.raw &&
+	# fix up lines which mention the ref for comparison
+	sed s/--dashes/nodash/ <actual.raw >actual &&
+	test_cmp expect actual
 
-expecting success of 9211.4 'partial clone if supported by server': 
-	enlistment=partial-clone &&
+ok 52 - fast-export handles --end-of-options
 
-	scalar clone "file://$(pwd)/to-clone" $enlistment &&
+# still have 1 known breakage(s)
+# passed all remaining 51 test(s)
+1..52
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9168-git-svn-partially-globbed-names.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 $enlistment/src &&
-
-		# Two promisor packs: one for refs, the other for blobs
-		ls .git/objects/pack/pack-*.promisor >promisorlist &&
-		test_line_count = 2 promisorlist
+		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.47.2) of git-svn) does not exist.
+Done migrating from a git-svn v1 layout
+	A	readme
+r1 = 686063e692670e9df6f7c7367569207c766421e3 (refs/remotes/trunk)
+branch_from: /trunk => /trunk/src/a
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a, 1
+Found branch parent: (refs/remotes/branches/b_start) 686063e692670e9df6f7c7367569207c766421e3
+Following parent with do_switch
+Successfully followed parent
+r2 = 7781251e2ada3d9e534ab150adbb9ce5e3205a2a (refs/remotes/branches/b_start)
+	M	readme
+r3 = f8642a8052036b8fa43d5a423afda7d20778171e (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.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end/src/a, 3
+Found branch parent: (refs/remotes/tags/t_end) f8642a8052036b8fa43d5a423afda7d20778171e
+Following parent with do_switch
+	M	readme
+Successfully followed parent
+r4 = 8f49023228710feb42e5b6704ab94d6b4f8a69f7 (refs/remotes/tags/t_end)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/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
 
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/partial-clone/src/.git/
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 4 - partial clone if supported by server
-
-expecting success of 9211.5 'fall back on full clone if partial unsupported': 
-	enlistment=no-partial-support &&
-
-	test_config -C to-clone uploadpack.allowfilter false &&
-	test_config -C to-clone uploadpack.allowanysha1inwant false &&
-
-	scalar clone "file://$(pwd)/to-clone" $enlistment 2>err &&
-	grep "filtering not recognized by server, ignoring" err &&
+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 $enlistment/src &&
-
-		# Still get a refs promisor file, but none for blobs
-		ls .git/objects/pack/pack-*.promisor >promisorlist &&
-		test_line_count = 1 promisorlist
+		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 = 04feb11c783dacbd4ec0733d5eae279d8d4a620f (refs/remotes/two/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
+Found branch parent: (refs/remotes/two/branches/b_start) 04feb11c783dacbd4ec0733d5eae279d8d4a620f
+Following parent with do_switch
+Successfully followed parent
+r2 = e6e4ea266fc67e7539c13a6bc4b346cecdae0649 (refs/remotes/two/branches/b_start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = ada42226c6d7e7cd94752e575b032b3bc4b14ecf (refs/remotes/two/branches/b_start)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
+Found branch parent: (refs/remotes/two/tags/t_end) ada42226c6d7e7cd94752e575b032b3bc4b14ecf
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r4 = 055390c0e046d4c8d177efc8d6fb1cffc754a098 (refs/remotes/two/tags/t_end)
+	M	src/b/readme
+r5 = 47c7ff924d18d82af379c4ffb815b634620b27df (refs/remotes/two/tags/t_end)
+	M	src/b/readme
+r6 = 8fc35bd6538895bfc3b8fc0ca558e6510862fc48 (refs/remotes/two/tags/t_end)
+ok 4 - test left-hand-side only prefixed globbing
 
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/no-partial-support/src/.git/
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-warning: filtering not recognized by server, ignoring
-ok 5 - fall back on full clone if partial unsupported
-
-expecting success of 9211.6 'initializes sparse-checkout by default': 
-	enlistment=sparse &&
+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
 
-	scalar clone "file://$(pwd)/to-clone" $enlistment &&
+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 $enlistment/src &&
-		test_cmp_config true core.sparseCheckout &&
-		test_cmp_config true core.sparseCheckoutCone
+		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 = 04feb11c783dacbd4ec0733d5eae279d8d4a620f (refs/remotes/three/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
+Found branch parent: (refs/remotes/three/branches/b_start) 04feb11c783dacbd4ec0733d5eae279d8d4a620f
+Following parent with do_switch
+Successfully followed parent
+r2 = e6e4ea266fc67e7539c13a6bc4b346cecdae0649 (refs/remotes/three/branches/b_start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = ada42226c6d7e7cd94752e575b032b3bc4b14ecf (refs/remotes/three/branches/b_start)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
+Found branch parent: (refs/remotes/three/tags/t_end) ada42226c6d7e7cd94752e575b032b3bc4b14ecf
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r4 = 055390c0e046d4c8d177efc8d6fb1cffc754a098 (refs/remotes/three/tags/t_end)
+	M	src/b/readme
+r5 = 47c7ff924d18d82af379c4ffb815b634620b27df (refs/remotes/three/tags/t_end)
+	M	src/b/readme
+r6 = 8fc35bd6538895bfc3b8fc0ca558e6510862fc48 (refs/remotes/three/tags/t_end)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_, 3
+Found branch parent: (refs/remotes/three/branches/b_) 04feb11c783dacbd4ec0733d5eae279d8d4a620f
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r7 = 33f690da1507f2c22f1a18b2fc4cdf61f5af65a7 (refs/remotes/three/branches/b_)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_ => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_, 7
+Found branch parent: (refs/remotes/three/tags/t_) 33f690da1507f2c22f1a18b2fc4cdf61f5af65a7
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r8 = 4dfe76668873caf4583699df0d605979de178641 (refs/remotes/three/tags/t_)
+ok 6 - test prefixed globs match just prefix
 
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/sparse/src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 6 - initializes sparse-checkout by default
+expecting success of 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/*
 
-expecting success of 9211.7 '--full-clone does not create sparse-checkout': 
-	enlistment=full-clone &&
+EOF
+	
+ok 7 - prepare test disallow prefixed multi-globs
 
-	scalar clone --full-clone "file://$(pwd)/to-clone" $enlistment &&
+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 $enlistment/src &&
-		test_cmp_config "" --default "" core.sparseCheckout &&
-		test_cmp_config "" --default "" core.sparseCheckoutCone
+		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
 
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/full-clone/src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 7 - --full-clone does not create sparse-checkout
-
-expecting success of 9211.8 '--single-branch clones HEAD only': 
-	enlistment=single-branch &&
+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
 
-	scalar clone --single-branch "file://$(pwd)/to-clone" $enlistment &&
+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 $enlistment/src &&
-		git for-each-ref refs/remotes/origin >out &&
-		test_line_count = 1 out &&
-		grep "refs/remotes/origin/base" out
+		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 = 04feb11c783dacbd4ec0733d5eae279d8d4a620f (refs/remotes/five/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde, 8
+	A	src/a/readme
+	A	src/b/readme
+W: +empty_dir: trunk/doc
+r1 = 04feb11c783dacbd4ec0733d5eae279d8d4a620f (refs/remotes/four/trunk)
+Found branch parent: (refs/remotes/five/branches/abcde) 04feb11c783dacbd4ec0733d5eae279d8d4a620f
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r10 = 867f167146d464e20b009df081b0ec64c3c54364 (refs/remotes/five/branches/abcde)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/fghij, 10
+Found branch parent: (refs/remotes/five/tags/fghij) 867f167146d464e20b009df081b0ec64c3c54364
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r11 = 79bc8e120d063481b90be9cb212a817352fe14aa (refs/remotes/five/tags/fghij)
+ok 10 - test globbing in the middle of the word
 
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/single-branch/src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-cd7036d3271be3d37ad73318fcc1838bd64f7f42 commit	refs/remotes/origin/base
-ok 8 - --single-branch clones HEAD only
-
-expecting success of 9211.9 '--no-single-branch clones all branches': 
-	enlistment=no-single-branch &&
+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
 
-	scalar clone --no-single-branch "file://$(pwd)/to-clone" $enlistment &&
+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 $enlistment/src &&
-		git for-each-ref refs/remotes/origin >out &&
-		test_line_count = 2 out &&
-		grep "refs/remotes/origin/base" out &&
-		grep "refs/remotes/origin/parallel" out
+		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
 
-	cleanup_clone $enlistment
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9161-git-svn-mergeinfo-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9161-git-svn-mergeinfo-push/.git/
+expecting success of 9161.1 'load svn dump': 
+	svnadmin load -q '/build/reproducible-path/git-2.47.2/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' 	  < '/build/reproducible-path/git-2.47.2/t/t9161/branches.dump' &&
+	git svn init --minimize-url -R svnmerge 	  -T trunk -b branches 'file:///build/reproducible-path/git-2.47.2/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' &&
+	git svn fetch --all
+	
+r1 = 6853a5b4420fd470454849a72349886d543b7d25 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1, 1
+Found branch parent: (refs/remotes/origin/svnb1) 6853a5b4420fd470454849a72349886d543b7d25
+Following parent with do_switch
+Successfully followed parent
+r2 = fa09a4f3fd48e7b2f90efdc58554b03195709877 (refs/remotes/origin/svnb1)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2, 1
+Found branch parent: (refs/remotes/origin/svnb2) 6853a5b4420fd470454849a72349886d543b7d25
+Following parent with do_switch
+Successfully followed parent
+r3 = b72e1806ab4284e750504880cd3cb3d8b423eaa8 (refs/remotes/origin/svnb2)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb3, 1
+Found branch parent: (refs/remotes/origin/svnb3) 6853a5b4420fd470454849a72349886d543b7d25
+Following parent with do_switch
+Successfully followed parent
+r4 = 08bf69549619f219ee297e7d5756f25a24d17ac4 (refs/remotes/origin/svnb3)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb4, 1
+Found branch parent: (refs/remotes/origin/svnb4) 6853a5b4420fd470454849a72349886d543b7d25
+Following parent with do_switch
+Successfully followed parent
+r5 = d25866a64b96d6b81ec373ba7c593214567ae963 (refs/remotes/origin/svnb4)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb5, 1
+Found branch parent: (refs/remotes/origin/svnb5) 6853a5b4420fd470454849a72349886d543b7d25
+Following parent with do_switch
+Successfully followed parent
+r6 = 204c5c977903d011770a14f2db25ec8438cdf109 (refs/remotes/origin/svnb5)
+	A	b1file
+r7 = 90b41d14c8c460bbbe8e081e0f26f1c64a9b08ad (refs/remotes/origin/svnb1)
+	A	b2file
+r8 = c79210436389ad645983c229bb35527472ac9504 (refs/remotes/origin/svnb2)
+	A	b3file
+r9 = 8e7307385a31c1407d8d9671e9a7b008bf3c144a (refs/remotes/origin/svnb3)
+	A	b4file
+r10 = f31f4a6aec7ad1edad5480caabff9e689afffc8a (refs/remotes/origin/svnb4)
+	A	b5file
+r11 = 5b52b82b573e451f076402fae3a69e9b6da4170e (refs/remotes/origin/svnb5)
+	A	b5file
+Checking svn:mergeinfo changes since r10: 1 sources, 1 changed
+Found merge parent (/branches/svnb5:6,11): 5b52b82b573e451f076402fae3a69e9b6da4170e
+r12 = ec104002d1cd613008b70f6e5c7647acad97125e (refs/remotes/origin/svnb4)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk r1
+ok 1 - load svn dump
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/no-single-branch/src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-cd7036d3271be3d37ad73318fcc1838bd64f7f42 commit	refs/remotes/origin/base
-afe53871bea8a7b2e02fc5f14f4076b8cbd8e537 commit	refs/remotes/origin/parallel
-ok 9 - --no-single-branch clones all branches
+expecting success of 9161.2 'propagate merge information': 
+	git config svn.pushmergeinfo yes &&
+	git checkout origin/svnb1 &&
+	git merge --no-ff origin/svnb2 &&
+	git svn dcommit
+	
+Note: switching to 'origin/svnb1'.
 
-checking prerequisite: TTY
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
+  git switch -c <new-branch-name>
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+Or undo this operation with:
 
-)
-prerequisite TTY ok
-expecting success of 9211.10 'progress with tty': 
-	enlistment=progress1 &&
+  git switch -
 
-	test_config -C to-clone uploadpack.allowfilter true &&
-	test_config -C to-clone uploadpack.allowanysha1inwant true &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	test_terminal env GIT_PROGRESS_DELAY=0 \
-		scalar clone "file://$(pwd)/to-clone" "$enlistment" 2>stderr &&
-	grep "Enumerating objects" stderr >actual &&
-	test_line_count = 2 actual &&
-	cleanup_clone $enlistment
+HEAD is now at 90b41d1 b1 commit
+Merge made by the 'ort' strategy.
+ b2file | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 b2file
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	b2file
+Committed r13
+	A	b2file
+Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
+Found merge parent (/branches/svnb2:3,8): c79210436389ad645983c229bb35527472ac9504
+r13 = 5bab521bd001e50511a4780e8254ffb2022ffa74 (refs/remotes/origin/svnb1)
+No changes between 088aad1ade7865ea55cf1aa2e1f87c14206a6676 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 2 - propagate merge information
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/progress1/src/.git/
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 10 - progress with tty
+expecting success of 9161.3 'check svn:mergeinfo': 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
+	test "$mergeinfo" = "/branches/svnb2:3,8"
+	
+ok 3 - check svn:mergeinfo
 
-expecting success of 9211.11 'progress without tty': 
-	enlistment=progress2 &&
+expecting success of 9161.4 'merge another branch': 
+	git merge --no-ff origin/svnb3 &&
+	git svn dcommit
+	
+Merge made by the 'ort' strategy.
+ b3file | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 b3file
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	b3file
+Committed r14
+	A	b3file
+Checking svn:mergeinfo changes since r13: 2 sources, 1 changed
+Found merge parent (/branches/svnb3:4,9): 8e7307385a31c1407d8d9671e9a7b008bf3c144a
+r14 = 8e6a9e2d5a28cd9ee78151b3c1e0d63bdc14f51a (refs/remotes/origin/svnb1)
+No changes between fbfa698c75fbc40aa9ee25f6bc0ef11a19453603 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 4 - merge another branch
 
-	test_config -C to-clone uploadpack.allowfilter true &&
-	test_config -C to-clone uploadpack.allowanysha1inwant true &&
+expecting success of 9161.5 'check primary parent mergeinfo respected': 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
+	test "$mergeinfo" = "/branches/svnb2:3,8
+/branches/svnb3:4,9"
+	
+ok 5 - check primary parent mergeinfo respected
 
-	GIT_PROGRESS_DELAY=0 scalar clone "file://$(pwd)/to-clone" "$enlistment" 2>stderr &&
-	! grep "Enumerating objects" stderr &&
-	! grep "Updating files" stderr &&
-	cleanup_clone $enlistment
+expecting success of 9161.6 'merge existing merge': 
+	git merge --no-ff origin/svnb4 &&
+	git svn dcommit
+	
+Merge made by the 'ort' strategy.
+ b4file | 0
+ b5file | 0
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 b4file
+ create mode 100644 b5file
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	b4file
+	A	b5file
+Committed r15
+	A	b4file
+	A	b5file
+Checking svn:mergeinfo changes since r14: 4 sources, 2 changed
+Found merge parent (/branches/svnb4:5-6,10-12): ec104002d1cd613008b70f6e5c7647acad97125e
+Found merge parent (/branches/svnb5:6,11): 5b52b82b573e451f076402fae3a69e9b6da4170e
+r15 = 215c16459ef8cc052c84958c7418a09cdda6e315 (refs/remotes/origin/svnb1)
+No changes between 28f15741bf6e6581cb0e533006aac18e60e767c9 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 6 - merge existing merge
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/progress2/src/.git/
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 11 - progress without tty
+expecting success of 9161.7 'check both parents' mergeinfo respected': 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
+	test "$mergeinfo" = "/branches/svnb2:3,8
+/branches/svnb3:4,9
+/branches/svnb4:5-6,10-12
+/branches/svnb5:6,11"
+	
+ok 7 - check both parents' mergeinfo respected
 
-expecting success of 9211.12 'scalar clone warns when background maintenance fails': 
-	GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
-		scalar clone "file://$(pwd)/to-clone" maint-fail 2>err &&
-	grep "could not turn on maintenance" err
+expecting success of 9161.8 'make further commits to branch': 
+	git checkout origin/svnb2 &&
+	touch newb2file &&
+	git add newb2file &&
+	git commit -m "later b2 commit" &&
+	touch newb2file-2 &&
+	git add newb2file-2 &&
+	git commit -m "later b2 commit 2" &&
+	git svn dcommit
+	
+Previous HEAD position was 215c164 Merge remote-tracking branch 'origin/svnb4' into HEAD
+HEAD is now at c792104 b2 commit
+[detached HEAD cc01c62] later b2 commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 newb2file
+[detached HEAD 986c5c0] later b2 commit 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 newb2file-2
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2 ...
+	A	newb2file
+Committed r16
+	A	newb2file
+r16 = 80c778e77b83114ecfc0a94690a72665e3c51624 (refs/remotes/origin/svnb2)
+	A	newb2file-2
+Committed r17
+	A	newb2file-2
+r17 = a4ffb2981f573f796e521d65e0a94af49dd9b9aa (refs/remotes/origin/svnb2)
+No changes between 986c5c009c772d6c0ae6068eaa3196b59994ae86 and refs/remotes/origin/svnb2
+Resetting to the latest refs/remotes/origin/svnb2
+ok 8 - make further commits to branch
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/maint-fail/src/.git/
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-warning: could not turn on maintenance
-ok 12 - scalar clone warns when background maintenance fails
+expecting success of 9161.9 'second forward merge': 
+	git checkout origin/svnb1 &&
+	git merge --no-ff origin/svnb2 &&
+	git svn dcommit
+	
+Previous HEAD position was a4ffb29 later b2 commit 2
+HEAD is now at 215c164 Merge remote-tracking branch 'origin/svnb4' into HEAD
+Merge made by the 'ort' strategy.
+ newb2file   | 0
+ newb2file-2 | 0
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 newb2file
+ create mode 100644 newb2file-2
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	newb2file
+	A	newb2file-2
+Committed r18
+	A	newb2file
+	A	newb2file-2
+Checking svn:mergeinfo changes since r15: 4 sources, 1 changed
+Found merge parent (/branches/svnb2:8,16-17): a4ffb2981f573f796e521d65e0a94af49dd9b9aa
+r18 = 58aac8a12b92d6a4b2b9d6bfcc2c5516f63916aa (refs/remotes/origin/svnb1)
+No changes between 2ce02d50c706116e10ce8c5d5a50fd049ddabff1 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 9 - second forward merge
 
-expecting success of 9211.13 '`scalar clone --no-src`': 
-	scalar clone --src "file://$(pwd)/to-clone" with-src &&
-	scalar clone --no-src "file://$(pwd)/to-clone" without-src &&
+expecting success of 9161.10 'check new mergeinfo added': 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
+	test "$mergeinfo" = "/branches/svnb2:3,8,16-17
+/branches/svnb3:4,9
+/branches/svnb4:5-6,10-12
+/branches/svnb5:6,11"
+	
+ok 10 - check new mergeinfo added
 
-	test_path_is_dir with-src/src &&
-	test_path_is_missing without-src/src &&
+expecting success of 9161.11 'reintegration merge': 
+	git checkout origin/svnb4 &&
+	git merge --no-ff origin/svnb1 &&
+	git svn dcommit
+	
+Previous HEAD position was 58aac8a Merge remote-tracking branch 'origin/svnb2' into HEAD
+HEAD is now at ec10400 Merge remote-tracking branch 'svnb5' into HEAD
+Merge made by the 'ort' strategy.
+ b1file      | 0
+ b2file      | 0
+ b3file      | 0
+ newb2file   | 0
+ newb2file-2 | 0
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 b1file
+ create mode 100644 b2file
+ create mode 100644 b3file
+ create mode 100644 newb2file
+ create mode 100644 newb2file-2
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb4 ...
+	A	b1file
+	A	b2file
+	A	b3file
+	A	newb2file
+	A	newb2file-2
+Committed r19
+	A	b1file
+	A	b2file
+	A	b3file
+	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): 58aac8a12b92d6a4b2b9d6bfcc2c5516f63916aa
+Found merge parent (/branches/svnb2:3,8,16-17): a4ffb2981f573f796e521d65e0a94af49dd9b9aa
+Found merge parent (/branches/svnb3:4,9): 8e7307385a31c1407d8d9671e9a7b008bf3c144a
+r19 = 68b775451d0a8b19575d5247c282af6ee6b7ff37 (refs/remotes/origin/svnb4)
+No changes between 5af456c41d14be288b5bca007f9120715078c6bf and refs/remotes/origin/svnb4
+Resetting to the latest refs/remotes/origin/svnb4
+ok 11 - reintegration merge
 
-	(cd with-src/src && ls ?*) >with &&
-	(cd without-src && ls ?*) >without &&
-	test_cmp with without
+expecting success of 9161.12 'check reintegration mergeinfo': 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4) &&
+	test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
+/branches/svnb2:3,8,16-17
+/branches/svnb3:4,9
+/branches/svnb5:6,11"
+	
+ok 12 - check reintegration mergeinfo
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/with-src/src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9211-scalar-clone/without-src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 13 - `scalar clone --no-src`
+expecting success of 9161.13 'dcommit a merge at the top of a stack': 
+	git checkout origin/svnb1 &&
+	touch anotherfile &&
+	git add anotherfile &&
+	git commit -m "a commit" &&
+	git merge origin/svnb4 &&
+	git svn dcommit
+	
+Previous HEAD position was 68b7754 Merge remote-tracking branch 'origin/svnb1' into HEAD
+HEAD is now at 58aac8a Merge remote-tracking branch 'origin/svnb2' into HEAD
+[detached HEAD 92fdae1] a commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 anotherfile
+Merge made by the 'ort' strategy.
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	anotherfile
+Committed r20
+	A	anotherfile
+r20 = f9c8fd64471d96630a568977a70ac75dcfd27bdd (refs/remotes/origin/svnb1)
+Committed r21
+No changes
+ab13ae8a96bc68fd71067849062a6044f3419859~1 == ab13ae8a96bc68fd71067849062a6044f3419859
+Checking svn:mergeinfo changes since r20: 4 sources, 1 changed
+Found merge parent (/branches/svnb4:10-12,19): 68b775451d0a8b19575d5247c282af6ee6b7ff37
+r21 = bcfaef0d3dbfaa06a94e40530fcf08250ac258a0 (refs/remotes/origin/svnb1)
+No changes between ab13ae8a96bc68fd71067849062a6044f3419859 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 13 - dcommit a merge at the top of a stack
 
 # passed all 13 test(s)
 1..13
@@ -532483,9 +535310,9 @@
 Deleted merge conflict for 'a/a/file.txt':
   {local}: deleted
   {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Removing a/a/file_BASE_899561.txt
-Removing a/a/file_LOCAL_899561.txt
-Removing a/a/file_REMOTE_899561.txt
+Use (m)odified or (d)eleted file, or (a)bort? Removing a/a/file_BASE_2136993.txt
+Removing a/a/file_LOCAL_2136993.txt
+Removing a/a/file_REMOTE_2136993.txt
 Removing actual
 Removing both.orig
 Removing expect
@@ -533708,3284 +536535,554 @@
 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_944427
-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 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-ybnzE5/both_LOCAL_945275
-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 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
- Author: A U Thor <author@example.com>
-HEAD is now at a348a8f branch1 resolved with mergetool
-ok 30 - mergetool with guiDefault
-
-# passed all 30 test(s)
-1..30
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9210-scalar.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/.git/
-expecting success of 9210.1 'scalar shows a usage': 
-	test_expect_code 129 scalar -h
-
-usage: scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]
-
-Commands:
-	clone
-	list
-	register
-	unregister
-	run
-	reconfigure
-	delete
-	help
-	version
-	diagnose
-
-ok 1 - scalar shows a usage
-
-expecting success of 9210.2 'scalar invoked on enlistment root': 
-	test_when_finished rm -rf test src deeper &&
-
-	for enlistment_root in test src deeper/test
-	do
-		git init ${enlistment_root}/src &&
-
-		# Register
-		scalar register ${enlistment_root} &&
-		scalar list >out &&
-		grep "$(pwd)/${enlistment_root}/src\$" out &&
-
-		# Delete (including enlistment root)
-		scalar delete $enlistment_root &&
-		test_path_is_missing $enlistment_root &&
-		scalar list >out &&
-		! grep "^$(pwd)/${enlistment_root}/src\$" out || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src
-ok 2 - scalar invoked on enlistment root
-
-expecting success of 9210.3 'scalar invoked on enlistment src repo': 
-	test_when_finished rm -rf test src deeper &&
-
-	for enlistment_root in test src deeper/test
-	do
-		git init ${enlistment_root}/src &&
-
-		# Register
-		scalar register ${enlistment_root}/src &&
-		scalar list >out &&
-		grep "$(pwd)/${enlistment_root}/src\$" out &&
-
-		# Delete (will not include enlistment root)
-		scalar delete ${enlistment_root}/src &&
-		test_path_is_dir $enlistment_root &&
-		scalar list >out &&
-		! grep "^$(pwd)/${enlistment_root}/src\$" out || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/src
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/src
-ok 3 - scalar invoked on enlistment src repo
-
-expecting success of 9210.4 'scalar invoked when enlistment root and repo are the same': 
-	test_when_finished rm -rf test src deeper &&
-
-	for enlistment_root in test src deeper/test
-	do
-		git init ${enlistment_root} &&
-
-		# Register
-		scalar register ${enlistment_root} &&
-		scalar list >out &&
-		grep "$(pwd)/${enlistment_root}\$" out &&
-
-		# Delete (will not include enlistment root)
-		scalar delete ${enlistment_root} &&
-		test_path_is_missing $enlistment_root &&
-		scalar list >out &&
-		! grep "^$(pwd)/${enlistment_root}\$" out &&
-
-		# Make sure we did not accidentally delete the trash dir
-		test_path_is_dir "$TRASH_DIRECTORY" || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/src
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/deeper/test
-ok 4 - scalar invoked when enlistment root and repo are the same
-
-expecting success of 9210.5 'scalar repo search respects GIT_CEILING_DIRECTORIES': 
-	test_when_finished rm -rf test &&
-
-	git init test/src &&
-	mkdir -p test/src/deep &&
-	GIT_CEILING_DIRECTORIES="$(pwd)/test/src" &&
-	! scalar register test/src/deep 2>err &&
-	grep "not a git repository" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src/.git/
-fatal: not a git repository (or any of the parent directories): .git
-ok 5 - scalar repo search respects GIT_CEILING_DIRECTORIES
-
-expecting success of 9210.6 'scalar enlistments need a worktree': 
-	test_when_finished rm -rf bare test &&
-
-	git init --bare bare/src &&
-	! scalar register bare/src 2>err &&
-	grep "Scalar enlistments require a worktree" err &&
-
-	git init test/src &&
-	! scalar register test/src/.git 2>err &&
-	grep "Scalar enlistments require a worktree" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/bare/src/
-fatal: Scalar enlistments require a worktree
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/test/src/.git/
-fatal: Scalar enlistments require a worktree
-ok 6 - scalar enlistments need a worktree
-
-checking prerequisite: FSMONITOR_DAEMON
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
-	git version --build-options >output &&
-	grep "feature: fsmonitor--daemon" output
-
-)
-prerequisite FSMONITOR_DAEMON not satisfied
-ok 7 # skip scalar register starts fsmon daemon (missing FSMONITOR_DAEMON)
-
-expecting success of 9210.8 'scalar register warns when background maintenance fails': 
-	git init register-repo &&
-	GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
-		scalar register register-repo 2>err &&
-	grep "could not turn on maintenance" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/register-repo/.git/
-warning: could not turn on maintenance
-ok 8 - scalar register warns when background maintenance fails
-
-expecting success of 9210.9 'scalar unregister': 
-	git init vanish/src &&
-	scalar register vanish/src &&
-	git config --get --global --fixed-value \
-		maintenance.repo "$(pwd)/vanish/src" &&
-	scalar list >scalar.repos &&
-	grep -F "$(pwd)/vanish/src" scalar.repos &&
-	rm -rf vanish/src/.git &&
-	scalar unregister vanish &&
-	test_must_fail git config --get --global --fixed-value \
-		maintenance.repo "$(pwd)/vanish/src" &&
-	scalar list >scalar.repos &&
-	! grep -F "$(pwd)/vanish/src" scalar.repos &&
-
-	# scalar unregister should be idempotent
-	scalar unregister vanish
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/vanish/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/vanish/src
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/vanish/src
-ok 9 - scalar unregister
-
-expecting success of 9210.10 'set up repository to clone': 
-	test_commit first &&
-	test_commit second &&
-	test_commit third &&
-	git switch -c parallel first &&
-	mkdir -p 1/2 &&
-	test_commit 1/2/3 &&
-	git config uploadPack.allowFilter true &&
-	git config uploadPack.allowAnySHA1InWant true
-
-[master (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[master d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[master cd7036d] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third.t
-Switched to a new branch 'parallel'
-[parallel afe5387] 1/2/3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1/2/3.t
-ok 10 - set up repository to clone
-
-expecting success of 9210.11 'scalar clone': 
-	second=$(git rev-parse --verify second:second.t) &&
-	scalar clone "file://$(pwd)" cloned --single-branch &&
-	(
-		cd cloned/src &&
-
-		git config --get --global --fixed-value maintenance.repo \
-			"$(pwd)" &&
-
-		git for-each-ref --format="%(refname)" refs/remotes/origin/ >actual &&
-		echo "refs/remotes/origin/parallel" >expect &&
-		test_cmp expect actual &&
-
-		test_path_is_missing 1/2 &&
-
-		# This relies on the fact that the presence of "--missing"
-		# on the command line forces lazy fetching off before
-		# "$second^{blob}" gets parsed.  Without "^{blob}", a
-		# bare object name "$second" is taken into the queue and
-		# the command may not fail with a fixed "rev-list --missing".
-		test_must_fail git rev-list --missing=print "$second^{blob}" -- &&
-
-		git rev-list $second &&
-		git cat-file blob $second >actual &&
-		echo "second" >expect &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/src/.git/
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'parallel'
-branch 'parallel' set up to track 'origin/parallel'.
-Your branch is up to date with 'origin/parallel'.
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/src
-fatal: bad revision 'e019be006cf33489e2d0177a3837a2384eddebc5^{blob}'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-ok 11 - scalar clone
-
-expecting success of 9210.12 'scalar clone --no-... opts': 
-	# Note: redirect stderr always to avoid having a verbose test
-	# run result in a difference in the --[no-]progress option.
-	GIT_TRACE2_EVENT="$(pwd)/no-opt-trace" scalar clone \
-		--no-tags --no-src \
-		"file://$(pwd)" no-opts --single-branch 2>/dev/null &&
-
-	test_subcommand git fetch --quiet --no-progress \
-			origin --no-tags <no-opt-trace &&
-	(
-		cd no-opts &&
-
-		test_cmp_config --no-tags remote.origin.tagopt &&
-		git for-each-ref --format="%(refname)" refs/tags/ >tags &&
-		test_line_count = 0 tags
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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":"20260304T080458.066575Z-H8d819085-P000ea3dc","thread":"main","time":"2026-03-04T08:04:58.171353Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","fetch","--quiet","--no-progress","origin","--no-tags"]}
-ok 12 - scalar clone --no-... opts
-
-expecting success of 9210.13 'scalar reconfigure': 
-	git init one/src &&
-	scalar register one &&
-	git -C one/src config core.preloadIndex false &&
-	scalar reconfigure one &&
-	test true = "$(git -C one/src config core.preloadIndex)" &&
-	git -C one/src config core.preloadIndex false &&
-	rm one/src/cron.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/reconfigure" scalar reconfigure -a &&
-	test_path_is_file one/src/cron.txt &&
-	test true = "$(git -C one/src config core.preloadIndex)" &&
-	test_subcommand git maintenance start <reconfigure
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/one/src/.git/
-{"event":"child_start","sid":"20260304T080458.970153Z-H8d819085-P000ea7b1","thread":"main","time":"2026-03-04T08:04:58.972246Z","file":"run-command.c","line":733,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20260304T080458.970153Z-H8d819085-P000ea7b1","thread":"main","time":"2026-03-04T08:04:59.134685Z","file":"run-command.c","line":733,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20260304T080458.970153Z-H8d819085-P000ea7b1","thread":"main","time":"2026-03-04T08:04:59.291676Z","file":"run-command.c","line":733,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20260304T080458.970153Z-H8d819085-P000ea7b1","thread":"main","time":"2026-03-04T08:04:59.466422Z","file":"run-command.c","line":733,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-ok 13 - scalar reconfigure
-
-expecting success of 9210.14 'scalar reconfigure --all with includeIf.onbranch': 
-	repos="two three four" &&
-	for num in $repos
-	do
-		git init $num/src &&
-		scalar register $num/src &&
-		git -C $num/src config includeif."onbranch:foo".path something &&
-		git -C $num/src config core.preloadIndex false || return 1
-	done &&
-
-	scalar reconfigure --all &&
-
-	for num in $repos
-	do
-		test true = "$(git -C $num/src config core.preloadIndex)" || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/two/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/three/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/four/src/.git/
-ok 14 - scalar reconfigure --all with includeIf.onbranch
-
-expecting success of 9210.15 'scalar reconfigure --all with detached HEADs': 
-	repos="two three four" &&
-	for num in $repos
-	do
-		rm -rf $num/src &&
-		git init $num/src &&
-		scalar register $num/src &&
-		git -C $num/src config core.preloadIndex false &&
-		test_commit -C $num/src initial &&
-		git -C $num/src switch --detach HEAD || return 1
-	done &&
-
-	scalar reconfigure --all &&
-
-	for num in $repos
-	do
-		test true = "$(git -C $num/src config core.preloadIndex)" || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/two/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/two/src
-[master (root-commit) 23fa7ba] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-HEAD is now at 23fa7ba initial
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/three/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/three/src
-[master (root-commit) 31243c6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-HEAD is now at 31243c6 initial
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/four/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/four/src
-[master (root-commit) 167ffd6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-HEAD is now at 167ffd6 initial
-ok 15 - scalar reconfigure --all with detached HEADs
-
-expecting success of 9210.16 '`reconfigure -a` removes stale config entries': 
-	git init stale/src &&
-	scalar register stale &&
-	scalar list >scalar.repos &&
-	grep stale scalar.repos &&
-
-	grep -v stale scalar.repos >expect &&
-
-	rm -rf stale &&
-	scalar reconfigure -a &&
-	scalar list >scalar.repos &&
-	test_cmp expect scalar.repos
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/stale/src/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/stale/src
-warning: removed stale scalar.repo '/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/stale/src'
-ok 16 - `reconfigure -a` removes stale config entries
-
-expecting success of 9210.17 'scalar delete without enlistment shows a usage': 
-	test_expect_code 129 scalar delete
-
-usage: scalar delete <enlistment>
-
-ok 17 - scalar delete without enlistment shows a usage
-
-expecting success of 9210.18 'scalar delete with enlistment': 
-	scalar delete cloned &&
-	test_path_is_missing cloned
-
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/src
-ok 18 - scalar delete with enlistment
-
-expecting success of 9210.19 'scalar supports -c/-C': 
-	test_when_finished "scalar delete sub" &&
-	git init sub &&
-	scalar -C sub -c status.aheadBehind=bogus register &&
-	test -z "$(git -C sub config --local status.aheadBehind)" &&
-	test true = "$(git -C sub config core.preloadIndex)"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/sub/.git/
-/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/sub
-ok 19 - scalar supports -c/-C
-
-expecting success of 9210.20 '`scalar [...] <dir>` errors out when dir is missing': 
-	! scalar run config cloned 2>err &&
-	grep "cloned. does not exist" err
-
-fatal: '/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned' does not exist
-ok 20 - `scalar [...] <dir>` errors out when dir is missing
-
-checking prerequisite: UNZIP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-	"$GIT_UNZIP" -v
-	test $? -ne 127
-
-)
-UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
-
-Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
-see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
-
-Compiled with gcc 14.2.0 for Unix (Linux ELF).
-
-UnZip special compilation options:
-        ACORN_FTYPE_NFS
-        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
-        SET_DIR_ATTRIB
-        SYMLINKS (symbolic links supported, if RTL and file system permit)
-        TIMESTAMP
-        UNIXBACKUP
-        USE_EF_UT_TIME
-        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
-        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
-        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
-        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
-        ZIP64_SUPPORT (archives using Zip64 for large files supported)
-        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
-        VMS_TEXT_CONV
-        WILD_STOP_AT_DIR
-        [decryption, version 2.11 of 05 Jan 2007]
-
-UnZip and ZipInfo environment options:
-           UNZIP:  [none]
-        UNZIPOPT:  [none]
-         ZIPINFO:  [none]
-      ZIPINFOOPT:  [none]
-prerequisite UNZIP ok
-expecting success of 9210.21 'scalar diagnose': 
-	scalar clone "file://$(pwd)" cloned --single-branch &&
-	git repack &&
-	echo "$(pwd)/.git/objects/" >>cloned/src/.git/objects/info/alternates &&
-	test_commit -C cloned/src loose &&
-	scalar diagnose cloned >out 2>err &&
-	grep "Available space" out &&
-	sed -n "s/.*$SQ\\(.*\\.zip\\)$SQ.*/\\1/p" <err >zip_path &&
-	zip_path=$(cat zip_path) &&
-	test -n "$zip_path" &&
-	"$GIT_UNZIP" -v "$zip_path" &&
-	folder=${zip_path%.zip} &&
-	test_path_is_missing "$folder" &&
-	"$GIT_UNZIP" -p "$zip_path" diagnostics.log >out &&
-	test_file_not_empty out &&
-	"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
-	grep "$(pwd)/.git/objects" out &&
-	"$GIT_UNZIP" -p "$zip_path" objects-local.txt >out &&
-	grep "^Total: [1-9]" out
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/src/.git/
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'parallel'
-branch 'parallel' set up to track 'origin/parallel'.
-Your branch is up to date with 'origin/parallel'.
-[parallel 5d34185] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-Available space on '/build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/src': 72.09 GiB (mount flags 0x1000)
-Archive:  /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/cloned/.scalarDiagnostics/git-diagnostics-20260304_080505.zip
- Length   Method    Size  Cmpr    Date    Time   CRC-32   Name
---------  ------  ------- ---- ---------- ----- --------  ----
-     403  Defl:N      243  40% 2026-03-04 08:05 0920a7e3  diagnostics.log
-    1087  Defl:N      260  76% 2026-03-04 08:05 ce0cfe4d  packs-local.txt
-     198  Defl:N      132  33% 2026-03-04 08:05 bcb97240  objects-local.txt
-       6  Stored        6   0% 2026-03-04 08:05 183bc9be  .git/COMMIT_EDITMSG
-     602  Defl:N      415  31% 2026-03-04 08:05 5376cbff  .git/index
-    1123  Defl:N      577  49% 2026-03-04 08:05 8a33a857  .git/config
-      25  Stored       25   0% 2026-03-04 08:05 7ce4afd6  .git/HEAD
-     425  Defl:N      177  58% 2026-03-04 08:05 4cfc6992  .git/FETCH_HEAD
-      57  Defl:N       39  32% 2026-03-04 08:05 795d289e  .git/config.worktree
-      73  Defl:N       63  14% 2026-03-04 08:05 1f078b37  .git/description
-     478  Defl:N      279  42% 2026-03-04 08:05 09f84f85  .git/hooks/applypatch-msg.sample
-     896  Defl:N      503  44% 2026-03-04 08:05 10caf8e9  .git/hooks/commit-msg.sample
-    4726  Defl:N     1814  62% 2026-03-04 08:05 793c7cef  .git/hooks/fsmonitor-watchman.sample
-     189  Defl:N      138  27% 2026-03-04 08:05 c0f70c9a  .git/hooks/post-update.sample
-     424  Defl:N      265  38% 2026-03-04 08:05 024cc0cf  .git/hooks/pre-applypatch.sample
-    1649  Defl:N      907  45% 2026-03-04 08:05 1b0e50ae  .git/hooks/pre-commit.sample
-     416  Defl:N      255  39% 2026-03-04 08:05 5ef33f44  .git/hooks/pre-merge-commit.sample
-    1374  Defl:N      701  49% 2026-03-04 08:05 f90a0f0f  .git/hooks/pre-push.sample
-    4898  Defl:N     2015  59% 2026-03-04 08:05 5158ec84  .git/hooks/pre-rebase.sample
-     544  Defl:N      329  40% 2026-03-04 08:05 96f8c492  .git/hooks/pre-receive.sample
-    1492  Defl:N      744  50% 2026-03-04 08:05 303613ed  .git/hooks/prepare-commit-msg.sample
-    2783  Defl:N     1254  55% 2026-03-04 08:05 f00806d3  .git/hooks/push-to-checkout.sample
-    2308  Defl:N      975  58% 2026-03-04 08:05 4b9edd4e  .git/hooks/sendemail-validate.sample
-    3650  Defl:N     1173  68% 2026-03-04 08:05 06fcf0d9  .git/hooks/update.sample
-       8  Stored        8   0% 2026-03-04 08:05 4cc141be  .git/info/sparse-checkout
-     240  Defl:N      173  28% 2026-03-04 08:05 21cd3d77  .git/info/exclude
-     323  Defl:N      168  48% 2026-03-04 08:05 dc297921  .git/logs/HEAD
-     319  Defl:N      164  49% 2026-03-04 08:05 51851cc6  .git/logs/refs/heads/parallel
-     183  Defl:N      131  28% 2026-03-04 08:05 403541c6  .git/logs/refs/remotes/origin/parallel
-      81  Defl:N       77   5% 2026-03-04 08:05 d1b7b4b6  .git/objects/info/alternates
---------          -------  ---                            -------
-   30980            14010  55%                            30 files
-Contents of /build/reproducible-path/git-2.47.2/t/trash directory.t9210-scalar/.git/objects:
-Total: 3 loose objects
-ok 21 - scalar diagnose
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9350-fast-export.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/.git/
-expecting success of 9350.1 'setup': 
-
-	echo break it > file0 &&
-	git add file0 &&
-	test_tick &&
-	echo Wohlauf > file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	echo die Luft > file &&
-	echo geht frisch > file2 &&
-	git add file file2 &&
-	test_tick &&
-	git commit -m second &&
-	echo und > file2 &&
-	test_tick &&
-	git commit -m third file2 &&
-	test_tick &&
-	git tag rein &&
-	git checkout -b wer HEAD^ &&
-	echo lange > file2 &&
-	test_tick &&
-	git commit -m sitzt file2 &&
-	test_tick &&
-	git tag -a -m valentin muss &&
-	git merge -s ours main
-
-
-[main (root-commit) 283ea05] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 file0
-[main 300cb83] second
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file2
-[main 80f15f4] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'wer'
-[wer 708f3c9] sitzt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merge made by the 'ours' strategy.
-ok 1 - setup
-
-expecting success of 9350.2 'fast-export | fast-import': 
-
-	MAIN=$(git rev-parse --verify main) &&
-	REIN=$(git rev-parse --verify rein) &&
-	WER=$(git rev-parse --verify wer) &&
-	MUSS=$(git rev-parse --verify muss) &&
-	mkdir new &&
-	git --git-dir=new/.git init &&
-	git fast-export --all >actual &&
-	(cd new &&
-	 git fast-import &&
-	 test $MAIN = $(git rev-parse --verify refs/heads/main) &&
-	 test $REIN = $(git rev-parse --verify refs/tags/rein) &&
-	 test $WER = $(git rev-parse --verify refs/heads/wer) &&
-	 test $MUSS = $(git rev-parse --verify refs/tags/muss)) <actual
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/new/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           16 (         0 duplicates                  )
-      blobs  :            6 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            4 (         0 duplicates          3 deltas of          3 attempts)
-      commits:            5 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            1 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           4 (         3 loads     )
-      marks:           1024 (        11 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          5
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1158
----------------------------------------------------------------------
-
-ok 2 - fast-export | fast-import
-
-expecting success of 9350.3 'fast-export ^muss^{commit} muss': 
-	git fast-export --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
-	cat >expected <<-EOF &&
-	tag muss
-	from $(git rev-parse --verify muss^{commit})
-	$(git cat-file tag muss | grep tagger)
-	data 9
-	valentin
-
-	EOF
-	test_cmp expected actual
-
-ok 3 - fast-export ^muss^{commit} muss
-
-expecting success of 9350.4 'fast-export --mark-tags ^muss^{commit} muss': 
-	git fast-export --mark-tags --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
-	cat >expected <<-EOF &&
-	tag muss
-	mark :1
-	from $(git rev-parse --verify muss^{commit})
-	$(git cat-file tag muss | grep tagger)
-	data 9
-	valentin
-
-	EOF
-	test_cmp expected actual
-
-ok 4 - fast-export --mark-tags ^muss^{commit} muss
-
-expecting success of 9350.5 'fast-export main~2..main': 
-
-	git fast-export main~2..main >actual &&
-	sed "s/main/partial/" actual |
-		(cd new &&
-		 git fast-import &&
-		 test $MAIN != $(git rev-parse --verify refs/heads/partial) &&
-		 git diff --exit-code main partial &&
-		 git diff --exit-code main^ partial^ &&
-		 test_must_fail git rev-parse partial~2)
-
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            8 (         0 duplicates                  )
-      blobs  :            4 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         6 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-fatal: ambiguous argument 'partial~2': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-partial~2
-ok 5 - fast-export main~2..main
-
-expecting success of 9350.6 'fast-export --reference-excluded-parents main~2..main': 
-
-	git fast-export --reference-excluded-parents main~2..main >actual &&
-	grep commit.refs/heads/main actual >commit-count &&
-	test_line_count = 2 commit-count &&
-	sed "s/main/rewrite/" actual |
-		(cd new &&
-		 git fast-import &&
-		 test $MAIN = $(git rev-parse --verify refs/heads/rewrite))
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            7 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         5 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 6 - fast-export --reference-excluded-parents main~2..main
-
-expecting success of 9350.7 'fast-export --show-original-ids': 
-
-	git fast-export --show-original-ids main >output &&
-	grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
-	git rev-list --objects main muss >objects-and-names &&
-	awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
-	comm -23 actual commits-trees-blobs >unfound &&
-	test_must_be_empty unfound
-
-ok 7 - fast-export --show-original-ids
-
-expecting success of 9350.8 'fast-export --show-original-ids | git fast-import': 
-
-	git fast-export --show-original-ids main muss | git fast-import --quiet &&
-	test $MAIN = $(git rev-parse --verify refs/heads/main) &&
-	test $MUSS = $(git rev-parse --verify refs/tags/muss)
-
-ok 8 - fast-export --show-original-ids | git fast-import
-
-expecting success of 9350.9 'reencoding iso-8859-7': 
-
-	test_when_finished "git reset --hard HEAD~1" &&
-	test_config i18n.commitencoding iso-8859-7 &&
-	test_tick &&
-	echo rosten >file &&
-	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
-	git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
-	sed "s/wer/i18n/" iso-8859-7.fi |
-		(cd new &&
-		 git fast-import &&
-		 # The commit object, if not re-encoded, would be 200 bytes plus hash.
-		 # Removing the "encoding iso-8859-7\n" header drops 20 bytes.
-		 # Re-encoding the Pi character from \xF0 (\360) in iso-8859-7
-		 # to \xCF\x80 (\317\200) in UTF-8 adds a byte.  Check for
-		 # the expected size.
-		 test $(($(test_oid hexsz) + 181)) -eq "$(git cat-file -s i18n)" &&
-		 # ...and for the expected translation of bytes.
-		 git cat-file commit i18n >actual &&
-		 grep $(printf "\317\200") actual &&
-		 # Also make sure the commit does not have the "encoding" header
-		 ! grep ^encoding actual)
-
-[wer 6941255] Pi: ð
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            5 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-Pi: π
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 9 - reencoding iso-8859-7
-
-expecting success of 9350.10 'aborting on iso-8859-7': 
-
-	test_when_finished "git reset --hard HEAD~1" &&
-	test_config i18n.commitencoding iso-8859-7 &&
-	echo rosten >file &&
-	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
-	test_must_fail git fast-export --reencode=abort wer^..wer >iso-8859-7.fi
-
-[wer 6941255] Pi: ð
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Encountered commit-specific encoding iso-8859-7 in commit 69412559de66ce43db5f4d5fd25191a3ab0b1823; use --reencode=[yes|no] to handle it
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 10 - aborting on iso-8859-7
-
-expecting success of 9350.11 'preserving iso-8859-7': 
-
-	test_when_finished "git reset --hard HEAD~1" &&
-	test_config i18n.commitencoding iso-8859-7 &&
-	echo rosten >file &&
-	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
-	git fast-export --reencode=no wer^..wer >iso-8859-7.fi &&
-	sed "s/wer/i18n-no-recoding/" iso-8859-7.fi |
-		(cd new &&
-		 git fast-import &&
-		 # The commit object, if not re-encoded, is 200 bytes plus hash.
-		 # Removing the "encoding iso-8859-7\n" header would drops 20
-		 # bytes.  Re-encoding the Pi character from \xF0 (\360) in
-		 # iso-8859-7 to \xCF\x80 (\317\200) in UTF-8 adds a byte.
-		 # Check for the expected size...
-		 test $(($(test_oid hexsz) + 200)) -eq "$(git cat-file -s i18n-no-recoding)" &&
-		 # ...as well as the expected byte.
-		 git cat-file commit i18n-no-recoding >actual &&
-		 grep $(printf "\360") actual &&
-		 # Also make sure the commit has the "encoding" header
-		 grep ^encoding actual)
-
-[wer 6941255] Pi: ð
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            5 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-Pi: ð
-encoding iso-8859-7
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 11 - preserving iso-8859-7
-
-expecting success of 9350.12 'encoding preserved if reencoding fails': 
-
-	test_when_finished "git reset --hard HEAD~1" &&
-	test_config i18n.commitencoding iso-8859-7 &&
-	echo rosten >file &&
-	git commit -s -F "$TEST_DIRECTORY/t9350/broken-iso-8859-7-commit-message.txt" file &&
-	git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
-	sed "s/wer/i18n-invalid/" iso-8859-7.fi |
-		(cd new &&
-		 git fast-import &&
-		 git cat-file commit i18n-invalid >actual &&
-		 # Make sure the commit still has the encoding header
-		 grep ^encoding actual &&
-		 # Verify that the commit has the expected size; i.e.
-		 # that no bytes were re-encoded to a different encoding.
-		 test $(($(test_oid hexsz) + 212)) -eq "$(git cat-file -s i18n-invalid)" &&
-		 # ...and check for the original special bytes
-		 grep $(printf "\360") actual &&
-		 grep $(printf "\377") actual)
-
-[wer 5cc588f] Pi: ð; Invalid: ÿ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            5 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-encoding iso-8859-7
-Pi: ð; Invalid: ÿ
-Pi: ð; Invalid: ÿ
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 12 - encoding preserved if reencoding fails
-
-expecting success of 9350.13 'import/export-marks': 
-
-	git checkout -b marks main &&
-	git fast-export --export-marks=tmp-marks HEAD &&
-	test -s tmp-marks &&
-	test_line_count = 3 tmp-marks &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks HEAD >actual &&
-	test $(grep ^commit actual | wc -l) -eq 0 &&
-	echo change > file &&
-	git commit -m "last commit" file &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks HEAD >actual &&
-	test $(grep ^commit\  actual | wc -l) -eq 1 &&
-	test_line_count = 4 tmp-marks
-
-
-Switched to a new branch 'marks'
-blob
-mark :1
-data 8
-Wohlauf
-
-blob
-mark :2
-data 9
-break it
-
-reset refs/heads/marks
-commit refs/heads/marks
-mark :3
-author A U Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
-data 8
-initial
-M 100644 :2 file0
-M 100644 :1 file
-
-blob
-mark :4
-data 9
-die Luft
-
-blob
-mark :5
-data 12
-geht frisch
-
-commit refs/heads/marks
-mark :6
-author A U Thor <author@example.com> 1112912113 -0700
-committer C O Mitter <committer@example.com> 1112912113 -0700
-data 7
-second
-from :3
-M 100644 :5 file2
-M 100644 :4 file
-
-blob
-mark :7
-data 4
-und
-
-commit refs/heads/marks
-mark :8
-author A U Thor <author@example.com> 1112912173 -0700
-committer C O Mitter <committer@example.com> 1112912173 -0700
-data 6
-third
-from :6
-M 100644 :7 file2
-
-[marks 00d551b] last commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - import/export-marks
-
-expecting success of 9350.14 'set up faked signed tag': 
-
-	git fast-import <signed-tag-import
-
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            1 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 14 - set up faked signed tag
-
-expecting success of 9350.15 'signed-tags=abort': 
-
-	test_must_fail git fast-export --signed-tags=abort sign-your-name
-
-
-fatal: encountered signed tag a3638f8ba890fd4c674f4a3c04947833ab5dcd43; use --signed-tags=<mode> to handle it
-blob
-mark :1
-data 8
-Wohlauf
-
-blob
-mark :2
-data 9
-break it
-
-reset refs/tags/sign-your-name
-commit refs/tags/sign-your-name
-mark :3
-author A U Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
-data 8
-initial
-M 100644 :2 file0
-M 100644 :1 file
-
-blob
-mark :4
-data 9
-die Luft
-
-blob
-mark :5
-data 12
-geht frisch
-
-commit refs/tags/sign-your-name
-mark :6
-author A U Thor <author@example.com> 1112912113 -0700
-committer C O Mitter <committer@example.com> 1112912113 -0700
-data 7
-second
-from :3
-M 100644 :5 file2
-M 100644 :4 file
-
-blob
-mark :7
-data 4
-und
-
-commit refs/tags/sign-your-name
-mark :8
-author A U Thor <author@example.com> 1112912173 -0700
-committer C O Mitter <committer@example.com> 1112912173 -0700
-data 6
-third
-from :6
-M 100644 :7 file2
-
-blob
-mark :9
-data 7
-change
-
-commit refs/tags/sign-your-name
-mark :10
-author A U Thor <author@example.com> 1112912413 -0700
-committer C O Mitter <committer@example.com> 1112912413 -0700
-data 12
-last commit
-from :8
-M 100644 :9 file
-
-ok 15 - signed-tags=abort
-
-expecting success of 9350.16 'signed-tags=verbatim': 
-
-	git fast-export --signed-tags=verbatim sign-your-name > output &&
-	grep PGP output
-
-
------BEGIN PGP SIGNATURE-----
------END PGP SIGNATURE-----
-ok 16 - signed-tags=verbatim
-
-expecting success of 9350.17 'signed-tags=strip': 
-
-	git fast-export --signed-tags=strip sign-your-name > output &&
-	! grep PGP output
-
-
-ok 17 - signed-tags=strip
-
-expecting success of 9350.18 'signed-tags=warn-strip': 
-	git fast-export --signed-tags=warn-strip sign-your-name >output 2>err &&
-	! grep PGP output &&
-	test -s err
-
-ok 18 - signed-tags=warn-strip
-
-expecting success of 9350.19 'setup submodule': 
-
-	test_config_global protocol.file.allow always &&
-	git checkout -f main &&
-	mkdir sub &&
-	(
-		cd sub &&
-		git init  &&
-		echo test file > file &&
-		git add file &&
-		git commit -m sub_initial
-	) &&
-	git submodule add "$(pwd)/sub" sub &&
-	git commit -m initial &&
-	test_tick &&
-	(
-		cd sub &&
-		echo more data >> file &&
-		git add file &&
-		git commit -m sub_second
-	) &&
-	git add sub &&
-	git commit -m second
-
-
-Switched to branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/sub/.git/
-[main (root-commit) 075e849] sub_initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Adding existing repo at 'sub' to the index
-[main 76b186a] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[main 53da5af] sub_second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 9b44221] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 19 - setup submodule
-
-expecting success of 9350.20 'submodule fast-export | fast-import': 
-
-	test_config_global protocol.file.allow always &&
-	SUBENT1=$(git ls-tree main^ sub) &&
-	SUBENT2=$(git ls-tree main sub) &&
-	rm -rf new &&
-	mkdir new &&
-	git --git-dir=new/.git init &&
-	git fast-export --signed-tags=strip --all >actual &&
-	(cd new &&
-	 git fast-import &&
-	 test "$SUBENT1" = "$(git ls-tree refs/heads/main^ sub)" &&
-	 test "$SUBENT2" = "$(git ls-tree refs/heads/main sub)" &&
-	 git checkout main &&
-	 git submodule init &&
-	 git submodule update &&
-	 cmp sub/file ../sub/file) <actual
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/new/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           25 (         0 duplicates                  )
-      blobs  :            8 (         0 duplicates          0 deltas of          1 attempts)
-      trees  :            7 (         0 duplicates          6 deltas of          6 attempts)
-      commits:            8 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           5 (         5 loads     )
-      marks:           1024 (        16 unique    )
-      atoms:              5
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          8
-pack_report: pack_mmap_calls          =          4
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1494
----------------------------------------------------------------------
-
-Already on 'main'
-Submodule 'sub' (/build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/new/sub'...
-done.
-Submodule path 'sub': checked out '53da5af386a666416b61517c3f90dafe75821d2b'
-ok 20 - submodule fast-export | fast-import
-
-expecting success of 9350.21 'setup copies': 
-
-	git checkout -b copy rein &&
-	git mv file file3 &&
-	git commit -m move1 &&
-	test_tick &&
-	cp file2 file4 &&
-	git add file4 &&
-	git mv file2 file5 &&
-	git commit -m copy1 &&
-	test_tick &&
-	cp file3 file6 &&
-	git add file6 &&
-	git commit -m copy2 &&
-	test_tick &&
-	echo more text >> file6 &&
-	echo even more text >> file6 &&
-	git add file6 &&
-	git commit -m modify &&
-	test_tick &&
-	cp file6 file7 &&
-	echo test >> file7 &&
-	git add file7 &&
-	git commit -m copy_modify
-
-
-warning: unable to rmdir 'sub': Directory not empty
-Switched to a new branch 'copy'
-[copy 16740da] move1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => file3 (100%)
-[copy 0d83758] copy1
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename file2 => file4 (100%)
- create mode 100644 file5
-[copy 44ca68a] copy2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file6
-[copy 22ab272] modify
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[copy ed9d1ab] copy_modify
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
- create mode 100644 file7
-ok 21 - setup copies
-
-expecting success of 9350.22 'fast-export -C -C | fast-import': 
-
-	ENTRY=$(git rev-parse --verify copy) &&
-	rm -rf new &&
-	mkdir new &&
-	git --git-dir=new/.git init &&
-	git fast-export -C -C --signed-tags=strip --all > output &&
-	grep "^C file2 file4\$" output &&
-	cat output |
-	(cd new &&
-	 git fast-import &&
-	 test $ENTRY = $(git rev-parse --verify refs/heads/copy))
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/new/.git/
-C file2 file4
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           37 (         0 duplicates                  )
-      blobs  :           10 (         0 duplicates          1 deltas of          3 attempts)
-      trees  :           12 (         0 duplicates         11 deltas of         11 attempts)
-      commits:           13 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           6 (         6 loads     )
-      marks:           1024 (        23 unique    )
-      atoms:             10
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =         10
-pack_report: pack_mmap_calls          =          5
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1941
----------------------------------------------------------------------
-
-ok 22 - fast-export -C -C | fast-import
-
-expecting success of 9350.23 'fast-export | fast-import when main is tagged': 
-
-	git tag -m msg last &&
-	git fast-export -C -C --signed-tags=strip --all > output &&
-	test $(grep -c "^tag " output) = 3
-
-
-ok 23 - fast-export | fast-import when main is tagged
-
-expecting success of 9350.24 'cope with tagger-less tags': 
-
-	TAG=$(git hash-object --literally -t tag -w tag-content) &&
-	git update-ref refs/tags/sonnenschein $TAG &&
-	git fast-export -C -C --signed-tags=strip --all > output &&
-	test $(grep -c "^tag " output) = 4 &&
-	! grep "Unspecified Tagger" output &&
-	git fast-export -C -C --signed-tags=strip --all \
-		--fake-missing-tagger > output &&
-	test $(grep -c "^tag " output) = 4 &&
-	grep "Unspecified Tagger" output
-
-
-tagger Unspecified Tagger <unspecified-tagger> 0 +0000
-ok 24 - cope with tagger-less tags
-
-expecting success of 9350.25 'setup for limiting exports by PATH': 
-	mkdir limit-by-paths &&
-	(
-		cd limit-by-paths &&
-		git init &&
-		echo hi > there &&
-		git add there &&
-		git commit -m "First file" &&
-		echo foo > bar &&
-		git add bar &&
-		git commit -m "Second file" &&
-		git tag -a -m msg mytag &&
-		echo morefoo >> bar &&
-		git add bar &&
-		git commit -m "Change to second file"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/limit-by-paths/.git/
-[main (root-commit) c4bb517] First file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 there
-[main 5b2b7c2] Second file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main 49ac088] Change to second file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 25 - setup for limiting exports by PATH
-
-expecting success of 9350.26 'dropping tag of filtered out object': 
-(
-	cd limit-by-paths &&
-	git fast-export --tag-of-filtered-object=drop mytag -- there > output &&
-	test_cmp expected output
-)
-
-ok 26 - dropping tag of filtered out object
-
-expecting success of 9350.27 'rewriting tag of filtered out object': 
-(
-	cd limit-by-paths &&
-	git fast-export --tag-of-filtered-object=rewrite mytag -- there > output &&
-	test_cmp expected output
-)
-
-ok 27 - rewriting tag of filtered out object
-
-expecting success of 9350.28 'rewrite tag predating pathspecs to nothing': 
-	test_create_repo rewrite_tag_predating_pathspecs &&
-	(
-		cd rewrite_tag_predating_pathspecs &&
-
-		test_commit initial &&
-
-		git tag -a -m "Some old tag" v0.0.0.0.0.0.1 &&
-
-		test_commit bar &&
-
-		git fast-export --tag-of-filtered-object=rewrite --all -- bar.t >output &&
-		grep from.$ZERO_OID output
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/rewrite_tag_predating_pathspecs/.git/
-[main (root-commit) f175d86] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 3f8d6f0] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-from 0000000000000000000000000000000000000000
-from 0000000000000000000000000000000000000000
-ok 28 - rewrite tag predating pathspecs to nothing
-
-checking known breakage of 9350.29 'no exact-ref revisions included': 
-	(
-		cd limit-by-paths &&
-		git fast-export main~2..main~1 > output &&
-		test_cmp expected output
-	)
-
---- expected	2026-03-04 08:05:03.431352315 +0000
-+++ output	2026-03-04 08:05:03.475352315 +0000
-@@ -8,8 +8,7 @@
- data 3
- hi
- 
--reset refs/heads/main
--commit refs/heads/main
-+commit main~1
- mark :3
- author A U Thor <author@example.com> 1112912713 -0700
- committer C O Mitter <committer@example.com> 1112912713 -0700
-not ok 29 - no exact-ref revisions included # TODO known breakage
-
-expecting success of 9350.30 'path limiting with import-marks does not lose unmodified files': 
-	git checkout -b simple marks~2 &&
-	git fast-export --export-marks=marks simple -- file > /dev/null &&
-	echo more content >> file &&
-	test_tick &&
-	git commit -mnext file &&
-	git fast-export --import-marks=marks simple -- file file0 >actual &&
-	grep file0 actual
-
-Switched to a new branch 'simple'
-[simple ed6c25d] next
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-M 100644 :6 file0
-ok 30 - path limiting with import-marks does not lose unmodified files
-
-expecting success of 9350.31 'path limiting works': 
-	git fast-export simple -- file >actual &&
-	sed -ne "s/^M .* //p" <actual | sort -u >actual.files &&
-	echo file >expect &&
-	test_cmp expect actual.files
-
-ok 31 - path limiting works
-
-expecting success of 9350.32 'avoid corrupt stream with non-existent mark': 
-	test_create_repo avoid_non_existent_mark &&
-	(
-		cd avoid_non_existent_mark &&
-
-		test_commit important-path &&
-
-		test_commit ignored &&
-
-		git branch A &&
-		git branch B &&
-
-		echo foo >>important-path.t &&
-		git add important-path.t &&
-		test_commit more changes &&
-
-		git fast-export --all -- important-path.t | git fast-import --force
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/avoid_non_existent_mark/.git/
-[main (root-commit) 8503f52] important-path
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 important-path.t
-[main f2403bd] ignored
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ignored.t
-[main 0864148] more
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 changes
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            6 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           6 (         2 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              1
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          6
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /        486
----------------------------------------------------------------------
-
-ok 32 - avoid corrupt stream with non-existent mark
-
-expecting success of 9350.33 'full-tree re-shows unmodified files': 
-	git checkout -f simple &&
-	git fast-export --full-tree simple >actual &&
-	test $(grep -c file0 actual) -eq 3
-
-Already on 'simple'
-ok 33 - full-tree re-shows unmodified files
-
-expecting success of 9350.34 'set-up a few more tags for tag export tests': 
-	git checkout -f main &&
-	HEAD_TREE=$(git show -s --pretty=raw HEAD | sed -n "/tree/s/tree //p") &&
-	git tag    tree_tag        -m "tagging a tree" $HEAD_TREE &&
-	git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE &&
-	git tag    tag-obj_tag     -m "tagging a tag" tree_tag-obj &&
-	git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
-
-Switched to branch 'main'
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f tag-obj_tag tree_tag-obj^{}
-hint: Disable this message with "git config advice.nestedTag false"
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f tag-obj_tag-obj tree_tag-obj^{}
-hint: Disable this message with "git config advice.nestedTag false"
-ok 34 - set-up a few more tags for tag export tests
-
-expecting success of 9350.35 'tree_tag': 
-	mkdir result &&
-	(cd result && git init) &&
-	git fast-export tree_tag > fe-stream &&
-	(cd result && git fast-import < ../fe-stream)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/result/.git/
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag 2516549014edd9dfa47a30176eac045c6786c9fb,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            0 (         0 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 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 35 - tree_tag
-
-expecting success of 9350.36 'tree_tag-obj': git fast-export tree_tag-obj
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag 72a752e8d1c88d34d9afd9c39bf2a282d2079f56,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-ok 36 - tree_tag-obj
-
-expecting success of 9350.37 'tag-obj_tag': git fast-export tag-obj_tag
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag 72a752e8d1c88d34d9afd9c39bf2a282d2079f56,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-warning: Omitting tag 10db1d54284bce2b194af52fe4510dcbebfc0e06,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-ok 37 - tag-obj_tag
-
-expecting success of 9350.38 'tag-obj_tag-obj': git fast-export tag-obj_tag-obj
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag 72a752e8d1c88d34d9afd9c39bf2a282d2079f56,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-warning: Omitting tag faa0e7b8513c5e5501d1ac1f66ef270edb7bd02d,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-ok 38 - tag-obj_tag-obj
-
-expecting success of 9350.39 'handling tags of blobs': 
-	git tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
-	git fast-export blobtag >actual &&
-	cat >expect <<-EOF &&
-	blob
-	mark :1
-	data 9
-	die Luft
-
-	tag blobtag
-	from :1
-	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data 14
-	Tag of a blob
-
-	EOF
-	test_cmp expect actual
-
-ok 39 - handling tags of blobs
-
-expecting success of 9350.40 'handling nested tags': 
-	git tag -a -m "This is a nested tag" nested muss &&
-	git fast-export --mark-tags nested >output &&
-	grep "^from $ZERO_OID$" output &&
-	grep "^tag nested$" output >tag_lines &&
-	test_line_count = 2 tag_lines
-
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f nested muss^{}
-hint: Disable this message with "git config advice.nestedTag false"
-from 0000000000000000000000000000000000000000
-ok 40 - handling nested tags
-
-expecting success of 9350.41 'directory becomes symlink': 
-	git init dirtosymlink &&
-	git init result &&
-	(
-		cd dirtosymlink &&
-		mkdir foo &&
-		mkdir bar &&
-		echo hello > foo/world &&
-		echo hello > bar/world &&
-		git add foo/world bar/world &&
-		git commit -q -mone &&
-		git rm -r foo &&
-		test_ln_s_add bar foo &&
-		git commit -q -mtwo
-	) &&
-	(
-		cd dirtosymlink &&
-		git fast-export main -- foo |
-		(cd ../result && git fast-import --quiet)
-	) &&
-	(cd result && git show main:foo)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/dirtosymlink/.git/
-Reinitialized existing Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/result/.git/
-rm 'foo/world'
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-barok 41 - directory becomes symlink
-
-expecting success of 9350.42 'fast-export quotes pathnames': 
-	git init crazy-paths &&
-	test_config -C crazy-paths core.protectNTFS false &&
-	(cd crazy-paths &&
-	 blob=$(echo foo | git hash-object -w --stdin) &&
-	 git -c core.protectNTFS=false update-index --add \
-		--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
-		--cacheinfo 100644 $blob "path with \"quote\"" \
-		--cacheinfo 100644 $blob "path with \\backslash" \
-		--cacheinfo 100644 $blob "path with space" &&
-	 git commit -m addition &&
-	 git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
-	 git read-tree --empty &&
-	 git update-index -z --index-info <index &&
-	 git commit -m rename &&
-	 git read-tree --empty &&
-	 git commit -m deletion &&
-	 git fast-export -M HEAD >export.out &&
-	 git rev-list HEAD >expect &&
-	 git init result &&
-	 cd result &&
-	 git fast-import <../export.out &&
-	 git rev-list HEAD >actual &&
-	 test_cmp ../expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/crazy-paths/.git/
-[main (root-commit) deac6af] addition
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 "path with\nnewline"
- create mode 100644 "path with \"quote\""
- create mode 100644 "path with \\backslash"
- create mode 100644 path with space
-[main 89b4a6a] rename
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- rename "path with\nnewline" => "subdir/path with\nnewline" (100%)
- rename "path with \"quote\"" => "subdir/path with \"quote\"" (100%)
- rename "path with \\backslash" => "subdir/path with \\backslash" (100%)
- rename path with space => subdir/path with space (100%)
-[main 39f052a] deletion
- Author: A U Thor <author@example.com>
- 4 files changed, 4 deletions(-)
- delete mode 100644 "subdir/path with\nnewline"
- delete mode 100644 "subdir/path with \"quote\""
- delete mode 100644 "subdir/path with \\backslash"
- delete mode 100644 subdir/path with space
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/crazy-paths/result/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            7 (         1 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            3 (         1 duplicates          0 deltas of          1 attempts)
-      commits:            3 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              5
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 42 - fast-export quotes pathnames
-
-expecting success of 9350.43 'test bidirectionality': 
-	git init marks-test &&
-	git fast-export --export-marks=marks-cur --import-marks-if-exists=marks-cur --branches | \
-	git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks-if-exists=marks-new &&
-	(cd marks-test &&
-	git reset --hard &&
-	echo Wohlauf > file &&
-	git commit -a -m "back in time") &&
-	git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks-if-exists=marks-new --branches | \
-	git fast-import --export-marks=marks-cur --import-marks-if-exists=marks-cur
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/marks-test/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           38 (         0 duplicates                  )
-      blobs  :           11 (         0 duplicates          1 deltas of          4 attempts)
-      trees  :           13 (         0 duplicates         12 deltas of         12 attempts)
-      commits:           14 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           5 (         5 loads     )
-      marks:           1024 (        25 unique    )
-      atoms:             10
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          8
-pack_report: pack_mmap_calls          =          4
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1494
----------------------------------------------------------------------
-
-HEAD is now at 9b44221 second
-[main c9a810a] back in time
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           5 (         1 loads     )
-      marks:           1024 (        16 unique    )
-      atoms:              5
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 43 - test bidirectionality
-
-expecting success of 9350.44 'avoid uninteresting refs': 
-	> tmp-marks &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks main > /dev/null &&
-	git tag v1.0 &&
-	git branch uninteresting &&
-	echo bump > file &&
-	git commit -a -m bump &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks ^uninteresting ^v1.0 main > actual &&
-	test_cmp expected actual
-
-[main 480ed5f] bump
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 44 - avoid uninteresting refs
-
-expecting success of 9350.45 'refs are updated even if no commits need to be exported': 
-	> tmp-marks &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks main > /dev/null &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks main > actual &&
-	test_cmp expected actual
-
-ok 45 - refs are updated even if no commits need to be exported
-
-expecting success of 9350.46 'use refspec': 
-	git fast-export --refspec refs/heads/main:refs/heads/foobar main >actual2 &&
-	grep "^commit " actual2 | sort | uniq >actual &&
-	echo "commit refs/heads/foobar" > expected &&
-	test_cmp expected actual
-
-ok 46 - use refspec
-
-expecting success of 9350.47 'delete ref because entire history excluded': 
-	git branch to-delete &&
-	git fast-export to-delete ^to-delete >actual &&
-	cat >expected <<-EOF &&
-	reset refs/heads/to-delete
-	from $ZERO_OID
-
-	EOF
-	test_cmp expected actual
-
-ok 47 - delete ref because entire history excluded
-
-expecting success of 9350.48 'delete refspec': 
-	git fast-export --refspec :refs/heads/to-delete >actual &&
-	cat >expected <<-EOF &&
-	reset refs/heads/to-delete
-	from $ZERO_OID
-
-	EOF
-	test_cmp expected actual
-
-ok 48 - delete refspec
-
-expecting success of 9350.49 'when using -C, do not declare copy when source of copy is also modified': 
-	test_create_repo src &&
-	echo a_line >src/file.txt &&
-	git -C src add file.txt &&
-	git -C src commit -m 1st_commit &&
-
-	cp src/file.txt src/file2.txt &&
-	echo another_line >>src/file.txt &&
-	git -C src add file.txt file2.txt &&
-	git -C src commit -m 2nd_commit &&
-
-	test_create_repo dst &&
-	git -C src fast-export --all -C >actual &&
-	git -C dst fast-import <actual &&
-	git -C src show >expected &&
-	git -C dst show >actual &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/src/.git/
-[main (root-commit) b469450] 1st_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.txt
-[main 85ccff7] 2nd_commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file2.txt
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/dst/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            6 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              2
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 49 - when using -C, do not declare copy when source of copy is also modified
-
-expecting success of 9350.50 'merge commit gets exported with --import-marks': 
-	test_create_repo merging &&
-	(
-		cd merging &&
-		test_commit initial &&
-		git checkout -b topic &&
-		test_commit on-topic &&
-		git checkout main &&
-		test_commit on-main &&
-		test_tick &&
-		git merge --no-ff -m Yeah topic &&
-
-		echo ":1 $(git rev-parse HEAD^^)" >marks &&
-		git fast-export --import-marks=marks main >out &&
-		grep Yeah out
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/merging/.git/
-[main (root-commit) 1aef781] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'topic'
-[topic bb9f331] on-topic
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 on-topic.t
-Switched to branch 'main'
-[main a2e3e6b] on-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 on-main.t
-Merge made by the 'ort' strategy.
- on-topic.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 on-topic.t
-Yeah
-ok 50 - merge commit gets exported with --import-marks
-
-expecting success of 9350.51 'fast-export --first-parent outputs all revisions output by revision walk': 
-	git init first-parent &&
-	(
-		cd first-parent &&
-		test_commit A &&
-		git checkout -b topic1 &&
-		test_commit B &&
-		git checkout main &&
-		git merge --no-ff topic1 &&
-
-		git checkout -b topic2 &&
-		test_commit C &&
-		git checkout main &&
-		git merge --no-ff topic2 &&
-
-		test_commit D &&
-
-		git fast-export main -- --first-parent >first-parent-export &&
-		git fast-export main -- --first-parent --reverse >first-parent-reverse-export &&
-		test_cmp first-parent-export first-parent-reverse-export &&
-
-		git init import &&
-		git -C import fast-import <first-parent-export &&
-
-		git log --format="%ad %s" --first-parent main >expected &&
-		git -C import log --format="%ad %s" --all >actual &&
-		test_cmp expected actual &&
-		test_line_count = 4 actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/first-parent/.git/
-[main (root-commit) 40531c9] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'topic1'
-[topic1 26bf445] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- B.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'topic2'
-[topic2 3d54688] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[main 0270458] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9350-fast-export/first-parent/import/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           12 (         0 duplicates                  )
-      blobs  :            4 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            4 (         0 duplicates          3 deltas of          3 attempts)
-      commits:            4 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         8 unique    )
-      atoms:              4
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 51 - fast-export --first-parent outputs all revisions output by revision walk
-
-expecting success of 9350.52 'fast-export handles --end-of-options': 
-	git update-ref refs/heads/nodash HEAD &&
-	git update-ref refs/heads/--dashes HEAD &&
-	git fast-export --end-of-options nodash >expect &&
-	git fast-export --end-of-options --dashes >actual.raw &&
-	# fix up lines which mention the ref for comparison
-	sed s/--dashes/nodash/ <actual.raw >actual &&
-	test_cmp expect actual
-
-ok 52 - fast-export handles --end-of-options
+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_2184876
+HEAD is now at b56897f branch1 changes
+ok 24 - filenames seen by tools start with ./
 
-# still have 1 known breakage(s)
-# passed all remaining 51 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9161-git-svn-mergeinfo-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9161-git-svn-mergeinfo-push/.git/
-expecting success of 9161.1 'load svn dump': 
-	svnadmin load -q '/build/reproducible-path/git-2.47.2/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' 	  < '/build/reproducible-path/git-2.47.2/t/t9161/branches.dump' &&
-	git svn init --minimize-url -R svnmerge 	  -T trunk -b branches 'file:///build/reproducible-path/git-2.47.2/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' &&
-	git svn fetch --all
-	
-r1 = 6853a5b4420fd470454849a72349886d543b7d25 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1, 1
-Found branch parent: (refs/remotes/origin/svnb1) 6853a5b4420fd470454849a72349886d543b7d25
-Following parent with do_switch
-Successfully followed parent
-r2 = fa09a4f3fd48e7b2f90efdc58554b03195709877 (refs/remotes/origin/svnb1)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2, 1
-Found branch parent: (refs/remotes/origin/svnb2) 6853a5b4420fd470454849a72349886d543b7d25
-Following parent with do_switch
-Successfully followed parent
-r3 = b72e1806ab4284e750504880cd3cb3d8b423eaa8 (refs/remotes/origin/svnb2)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb3, 1
-Found branch parent: (refs/remotes/origin/svnb3) 6853a5b4420fd470454849a72349886d543b7d25
-Following parent with do_switch
-Successfully followed parent
-r4 = 08bf69549619f219ee297e7d5756f25a24d17ac4 (refs/remotes/origin/svnb3)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb4, 1
-Found branch parent: (refs/remotes/origin/svnb4) 6853a5b4420fd470454849a72349886d543b7d25
-Following parent with do_switch
-Successfully followed parent
-r5 = d25866a64b96d6b81ec373ba7c593214567ae963 (refs/remotes/origin/svnb4)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb5, 1
-Found branch parent: (refs/remotes/origin/svnb5) 6853a5b4420fd470454849a72349886d543b7d25
-Following parent with do_switch
-Successfully followed parent
-r6 = 204c5c977903d011770a14f2db25ec8438cdf109 (refs/remotes/origin/svnb5)
-	A	b1file
-r7 = 90b41d14c8c460bbbe8e081e0f26f1c64a9b08ad (refs/remotes/origin/svnb1)
-	A	b2file
-r8 = c79210436389ad645983c229bb35527472ac9504 (refs/remotes/origin/svnb2)
-	A	b3file
-r9 = 8e7307385a31c1407d8d9671e9a7b008bf3c144a (refs/remotes/origin/svnb3)
-	A	b4file
-r10 = f31f4a6aec7ad1edad5480caabff9e689afffc8a (refs/remotes/origin/svnb4)
-	A	b5file
-r11 = 5b52b82b573e451f076402fae3a69e9b6da4170e (refs/remotes/origin/svnb5)
-	A	b5file
-Checking svn:mergeinfo changes since r10: 1 sources, 1 changed
-Found merge parent (/branches/svnb5:6,11): 5b52b82b573e451f076402fae3a69e9b6da4170e
-r12 = ec104002d1cd613008b70f6e5c7647acad97125e (refs/remotes/origin/svnb4)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk r1
-ok 1 - load svn dump
+checking prerequisite: MKTEMP
 
-expecting success of 9161.2 'propagate merge information': 
-	git config svn.pushmergeinfo yes &&
-	git checkout origin/svnb1 &&
-	git merge --no-ff origin/svnb2 &&
-	git svn dcommit
-	
-Note: switching to 'origin/svnb1'.
+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"
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+Switched to a new branch '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 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-rEWO4P/both_LOCAL_2185841
+HEAD is now at b56897f branch1 changes
+ok 25 - temporary filenames are used with mergetool.writeToTemp
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+	# make sure "order-file" that is ambiguous between
+	# rev and path is understood correctly.
+	git branch order-file HEAD &&
 
-  git switch -
+	git mergetool --no-prompt --tool myecho >output &&
+	git grep --no-index -h -A2 Merging: output >actual &&
+	test_cmp expect actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 90b41d1 b1 commit
-Merge made by the 'ort' strategy.
- b2file | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 b2file
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	b2file
-Committed r13
-	A	b2file
-Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/branches/svnb2:3,8): c79210436389ad645983c229bb35527472ac9504
-r13 = 1c80f7c175074cb5534d0c66b5ab6415ca4fc599 (refs/remotes/origin/svnb1)
-No changes between 088aad1ade7865ea55cf1aa2e1f87c14206a6676 and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 2 - propagate merge information
+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 &&
 
-expecting success of 9161.3 'check svn:mergeinfo': 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
-	test "$mergeinfo" = "/branches/svnb2:3,8"
-	
-ok 3 - check svn:mergeinfo
+	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
 
-expecting success of 9161.4 'merge another branch': 
-	git merge --no-ff origin/svnb3 &&
-	git svn dcommit
-	
-Merge made by the 'ort' strategy.
- b3file | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 b3file
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	b3file
-Committed r14
-	A	b3file
-Checking svn:mergeinfo changes since r13: 2 sources, 1 changed
-Found merge parent (/branches/svnb3:4,9): 8e7307385a31c1407d8d9671e9a7b008bf3c144a
-r14 = 86a6d1a1920a7e5680a5c4bcd32b42608c9f46e2 (refs/remotes/origin/svnb1)
-No changes between 547fdd1ac4df88529bc21e9791790884b5f12225 and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 4 - merge another branch
+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 9161.5 'check primary parent mergeinfo respected': 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
-	test "$mergeinfo" = "/branches/svnb2:3,8
-/branches/svnb3:4,9"
-	
-ok 5 - check primary parent mergeinfo respected
+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
 
-expecting success of 9161.6 'merge existing merge': 
-	git merge --no-ff origin/svnb4 &&
-	git svn dcommit
-	
-Merge made by the 'ort' strategy.
- b4file | 0
- b5file | 0
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 b4file
- create mode 100644 b5file
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	b4file
-	A	b5file
-Committed r15
-	A	b4file
-	A	b5file
-Checking svn:mergeinfo changes since r14: 4 sources, 2 changed
-Found merge parent (/branches/svnb4:5-6,10-12): ec104002d1cd613008b70f6e5c7647acad97125e
-Found merge parent (/branches/svnb5:6,11): 5b52b82b573e451f076402fae3a69e9b6da4170e
-r15 = 0c21d8a7f091c3253fdd7168b6aa5941af0b2e23 (refs/remotes/origin/svnb1)
-No changes between 29e25379889dc36b508932f25a311b6df5bf8e1e and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 6 - merge existing merge
+		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 9161.7 'check both parents' mergeinfo respected': 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
-	test "$mergeinfo" = "/branches/svnb2:3,8
-/branches/svnb3:4,9
-/branches/svnb4:5-6,10-12
-/branches/svnb5:6,11"
-	
-ok 7 - check both parents' mergeinfo respected
+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"
 
-expecting success of 9161.8 'make further commits to branch': 
-	git checkout origin/svnb2 &&
-	touch newb2file &&
-	git add newb2file &&
-	git commit -m "later b2 commit" &&
-	touch newb2file-2 &&
-	git add newb2file-2 &&
-	git commit -m "later b2 commit 2" &&
-	git svn dcommit
-	
-Previous HEAD position was 0c21d8a Merge remote-tracking branch 'origin/svnb4' into HEAD
-HEAD is now at c792104 b2 commit
-[detached HEAD cc01c62] later b2 commit
+Switched to a new branch 'test29_b'
+[test29_b b1eadc5] base
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 newb2file
-[detached HEAD 986c5c0] later b2 commit 2
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+[test29_b 27f9bad] remote update
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 newb2file-2
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2 ...
-	A	newb2file
-Committed r16
-	A	newb2file
-r16 = 2e9b3bf8e01e43b83d6f76eff898ff49dc5bbb6f (refs/remotes/origin/svnb2)
-	A	newb2file-2
-Committed r17
-	A	newb2file-2
-r17 = aadb1c6c9b954cdc02e76dd6a75fd8eeb59458f1 (refs/remotes/origin/svnb2)
-No changes between 986c5c009c772d6c0ae6068eaa3196b59994ae86 and refs/remotes/origin/svnb2
-Resetting to the latest refs/remotes/origin/svnb2
-ok 8 - make further commits to branch
+ 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
 
-expecting success of 9161.9 'second forward merge': 
-	git checkout origin/svnb1 &&
-	git merge --no-ff origin/svnb2 &&
-	git svn dcommit
-	
-Previous HEAD position was aadb1c6 later b2 commit 2
-HEAD is now at 0c21d8a Merge remote-tracking branch 'origin/svnb4' into HEAD
-Merge made by the 'ort' strategy.
- newb2file   | 0
- newb2file-2 | 0
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 newb2file
- create mode 100644 newb2file-2
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	newb2file
-	A	newb2file-2
-Committed r18
-	A	newb2file
-	A	newb2file-2
-Checking svn:mergeinfo changes since r15: 4 sources, 1 changed
-Found merge parent (/branches/svnb2:8,16-17): aadb1c6c9b954cdc02e76dd6a75fd8eeb59458f1
-r18 = 854167bc9f63aed7ca8d5518dd0c7575f3e99187 (refs/remotes/origin/svnb1)
-No changes between 9e32f621c9f7ffe14f06ac9ad10ca3e16bde8001 and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 9 - second forward merge
+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 9161.10 'check new mergeinfo added': 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
-	test "$mergeinfo" = "/branches/svnb2:3,8,16-17
-/branches/svnb3:4,9
-/branches/svnb4:5-6,10-12
-/branches/svnb5:6,11"
-	
-ok 10 - check new mergeinfo added
+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 &&
 
-expecting success of 9161.11 'reintegration merge': 
-	git checkout origin/svnb4 &&
-	git merge --no-ff origin/svnb1 &&
-	git svn dcommit
-	
-Previous HEAD position was 854167b Merge remote-tracking branch 'origin/svnb2' into HEAD
-HEAD is now at ec10400 Merge remote-tracking branch 'svnb5' into HEAD
-Merge made by the 'ort' strategy.
- b1file      | 0
- b2file      | 0
- b3file      | 0
- newb2file   | 0
- newb2file-2 | 0
- 5 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 b1file
- create mode 100644 b2file
- create mode 100644 b3file
- create mode 100644 newb2file
- create mode 100644 newb2file-2
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb4 ...
-	A	b1file
-	A	b2file
-	A	b3file
-	A	newb2file
-	A	newb2file-2
-Committed r19
-	A	b1file
-	A	b2file
-	A	b3file
-	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): 854167bc9f63aed7ca8d5518dd0c7575f3e99187
-Found merge parent (/branches/svnb2:3,8,16-17): aadb1c6c9b954cdc02e76dd6a75fd8eeb59458f1
-Found merge parent (/branches/svnb3:4,9): 8e7307385a31c1407d8d9671e9a7b008bf3c144a
-r19 = 019472252abd74bfe4a2be0951b31cbf95bc0dce (refs/remotes/origin/svnb4)
-No changes between 6651170de20e6629eec2075a45d9a756e435ccb0 and refs/remotes/origin/svnb4
-Resetting to the latest refs/remotes/origin/svnb4
-ok 11 - reintegration merge
+	test_config mergetool.guiDefault auto &&
+	DISPLAY=SOMETHING && export DISPLAY &&
+	yes "" | git mergetool both &&
+	yes "" | git mergetool file1 file1 &&
 
-expecting success of 9161.12 'check reintegration mergeinfo': 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4) &&
-	test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
-/branches/svnb2:3,8,16-17
-/branches/svnb3:4,9
-/branches/svnb5:6,11"
-	
-ok 12 - check reintegration mergeinfo
+	DISPLAY= && export DISPLAY &&
+	yes "" | git mergetool file2 "spaced name" &&
 
-expecting success of 9161.13 'dcommit a merge at the top of a stack': 
-	git checkout origin/svnb1 &&
-	touch anotherfile &&
-	git add anotherfile &&
-	git commit -m "a commit" &&
-	git merge origin/svnb4 &&
-	git svn dcommit
-	
-Previous HEAD position was 0194722 Merge remote-tracking branch 'origin/svnb1' into HEAD
-HEAD is now at 854167b Merge remote-tracking branch 'origin/svnb2' into HEAD
-[detached HEAD 8267c67] a commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 anotherfile
-Merge made by the 'ort' strategy.
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	anotherfile
-Committed r20
-	A	anotherfile
-r20 = 68c33668995b467eb13857f79ff417ab4b76df02 (refs/remotes/origin/svnb1)
-Committed r21
-No changes
-6fc1ea256d9e35490f323619ce48b06adec92758~1 == 6fc1ea256d9e35490f323619ce48b06adec92758
-Checking svn:mergeinfo changes since r20: 4 sources, 1 changed
-Found merge parent (/branches/svnb4:10-12,19): 019472252abd74bfe4a2be0951b31cbf95bc0dce
-r21 = ba4a1fd75219cd9cd89fea00516f8d5a47a1e43e (refs/remotes/origin/svnb1)
-No changes between 6fc1ea256d9e35490f323619ce48b06adec92758 and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 13 - dcommit a merge at the top of a stack
+	test_config mergetool.guiDefault true &&
+	yes "" | git mergetool subdir/file3 &&
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9168-git-svn-partially-globbed-names.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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
+	yes "d" | git mergetool file11 &&
+	yes "d" | git mergetool file12 &&
+	yes "l" | git mergetool submod &&
 
-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.47.2) of git-svn) does not exist.
-Done migrating from a git-svn v1 layout
-	A	readme
-r1 = 1b533c45da914254465e374f9ab3b0ca6ce6a5a3 (refs/remotes/trunk)
-branch_from: /trunk => /trunk/src/a
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a, 1
-Found branch parent: (refs/remotes/branches/b_start) 1b533c45da914254465e374f9ab3b0ca6ce6a5a3
-Following parent with do_switch
-Successfully followed parent
-r2 = c1968768233caaeba8127a21b7a29885213f6b1a (refs/remotes/branches/b_start)
-	M	readme
-r3 = aed3329c0dbd423ffc25644a590a70fbe4201824 (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.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end/src/a, 3
-Found branch parent: (refs/remotes/tags/t_end) aed3329c0dbd423ffc25644a590a70fbe4201824
-Following parent with do_switch
-	M	readme
-Successfully followed parent
-r4 = f6f085705581025eae30dac47c6adb17acb5ce35 (refs/remotes/tags/t_end)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.47.2/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
+	echo "gui main updated" >expect &&
+	test_cmp expect file1 &&
 
-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
+	echo "main new" >expect &&
+	test_cmp expect file2 &&
 
-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 = b074fe766051a6bbfb7a45fe88625d47804940b7 (refs/remotes/two/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/two/branches/b_start) b074fe766051a6bbfb7a45fe88625d47804940b7
-Following parent with do_switch
-Successfully followed parent
-r2 = d2b1a3368e03a7cace703db1fd81acf2a093eef6 (refs/remotes/two/branches/b_start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = 9e0315c05179904441122d9bdb01be37657331c6 (refs/remotes/two/branches/b_start)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/two/tags/t_end) 9e0315c05179904441122d9bdb01be37657331c6
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = 050c54e4bbc72fa44e5474423abffabaa9cec018 (refs/remotes/two/tags/t_end)
-	M	src/b/readme
-r5 = 1357c793b3086174716934646f3b5bab902f6d6f (refs/remotes/two/tags/t_end)
-	M	src/b/readme
-r6 = ebde5c819364dd34b2bf21c3bd05382480b801f2 (refs/remotes/two/tags/t_end)
-ok 4 - test left-hand-side only prefixed globbing
+	echo "gui main new sub" >expect &&
+	test_cmp expect subdir/file3 &&
 
-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
+	echo "branch1 submodule" >expect &&
+	test_cmp expect submod/bar &&
+	git commit -m "branch1 resolved with mergetool"
 
-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 = b074fe766051a6bbfb7a45fe88625d47804940b7 (refs/remotes/three/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/three/branches/b_start) b074fe766051a6bbfb7a45fe88625d47804940b7
-Following parent with do_switch
-Successfully followed parent
-r2 = d2b1a3368e03a7cace703db1fd81acf2a093eef6 (refs/remotes/three/branches/b_start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = 9e0315c05179904441122d9bdb01be37657331c6 (refs/remotes/three/branches/b_start)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/three/tags/t_end) 9e0315c05179904441122d9bdb01be37657331c6
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = 050c54e4bbc72fa44e5474423abffabaa9cec018 (refs/remotes/three/tags/t_end)
-	M	src/b/readme
-r5 = 1357c793b3086174716934646f3b5bab902f6d6f (refs/remotes/three/tags/t_end)
-	M	src/b/readme
-r6 = ebde5c819364dd34b2bf21c3bd05382480b801f2 (refs/remotes/three/tags/t_end)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_, 3
-Found branch parent: (refs/remotes/three/branches/b_) b074fe766051a6bbfb7a45fe88625d47804940b7
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r7 = 4dab0fae587aeb9c404f4fe96b24aad5abd28cfa (refs/remotes/three/branches/b_)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_ => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_, 7
-Found branch parent: (refs/remotes/three/tags/t_) 4dab0fae587aeb9c404f4fe96b24aad5abd28cfa
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r8 = 24adb78b9faffd89d37e4a87555595db0ab27e10 (refs/remotes/three/tags/t_)
-ok 6 - test prefixed globs match just prefix
+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 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
 
-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/*
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+Merging:
+file1
 
-EOF
-	
-ok 7 - prepare test disallow prefixed multi-globs
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file2
+spaced name
 
-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
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
 
-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
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+subdir/file3
 
-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 = b074fe766051a6bbfb7a45fe88625d47804940b7 (refs/remotes/five/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde, 8
-Found branch parent: (refs/remotes/five/branches/abcde) b074fe766051a6bbfb7a45fe88625d47804940b7
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r10 = b59986ca089d11ffd5fdc80f3c824e4c29d1d311 (refs/remotes/five/branches/abcde)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/fghij, 10
-Found branch parent: (refs/remotes/five/tags/fghij) b59986ca089d11ffd5fdc80f3c824e4c29d1d311
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r11 = 5ab2c470f3557d7de47a786774887b985e3ec5ee (refs/remotes/five/tags/fghij)
-ok 10 - test globbing in the middle of the word
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Merging:
+file11
 
-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
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+file12
 
-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
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? Merging:
+submod
 
-# passed all 12 test(s)
-1..12
+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
+
+# passed all 30 test(s)
+1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9601-cvsimport-vendor-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9601-cvsimport-vendor-branch/.git/
-expecting success of 9601.1 'import a module with a vendor branch': 
+*** t9501-gitweb-standalone-http-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9501-gitweb-standalone-http-status/.git/
+expecting success of 9501.1 'setup': 
+	test_commit 'SnapshotTests' 'i can has snapshot'
 
-	git cvsimport -C module-git module
+[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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 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 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 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 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 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 9601.4 'check a file that was imported once': 
+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
 
-	test_cmp_branch_file main imported-once.txt
+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
 
-ok 4 - check a file that was imported once
+404 - Object does not exist
+ok 7 - snapshots: bad tree-ish id
 
-checking known breakage of 9601.5 'check a file that was imported twice': 
+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
 
-	test_cmp_branch_file main imported-twice.txt
+[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
 
---- module-cvs-main/imported-twice.txt	2004-02-09 15:43:13.000000000 +0000
-+++ module-git/imported-twice.txt	2026-03-04 08:05:16.643352315 +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
+grep: gitweb.output: binary file matches
+ok 9 - snapshots: good object id
 
-expecting success of 9601.6 'check a file that was imported then modified on HEAD': 
+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
 
-	test_cmp_branch_file main imported-modified.txt
+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
 
-ok 6 - check a file that was imported then modified on HEAD
+Status: 200 OK
+Last-modified: Thu, 7 Apr 2005 22:14:13 +0000
+ok 11 - modification: feed last-modified
 
-expecting success of 9601.7 'check a file that was imported, modified, then imported again': 
+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
 
-	test_cmp_branch_file main imported-modified-imported.txt
+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
 
-ok 7 - check a file that was imported, modified, then imported again
+Status: 304 Not Modified
+ok 13 - modification: feed if-modified-since (unmodified)
 
-expecting success of 9601.8 'check a file that was added to HEAD then imported': 
+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
 
-	test_cmp_branch_file main added-imported.txt
+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
 
-ok 8 - check a file that was added to HEAD then imported
+Status: 200 OK
+ok 15 - modification: snapshot if-modified-since (modified)
 
-expecting success of 9601.9 'a vendor branch whose tag has been removed': 
+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
 
-	test_cmp_branch_file main imported-anonymously.txt
+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
 
-ok 9 - a vendor branch whose tag has been removed
+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
 
-# still have 1 known breakage(s)
-# passed all remaining 8 test(s)
-1..9
+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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9300-fast-import.sh ***
@@ -537024,7 +537121,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_954375
+fast-import: dumping crash report to .git/fast_import_crash_2185037
 ok 2 - truncated stream complains
 
 expecting success of 9300.3 'A: create pack from stdin': 
@@ -537518,7 +537615,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_956045
+fast-import: dumping crash report to .git/fast_import_crash_2186636
 ok 20 - B: fail on invalid blob sha1
 
 expecting success of 9300.21 'B: accept branch name "TEMP_TAG"': 
@@ -537626,7 +537723,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_956690
+fast-import: dumping crash report to .git/fast_import_crash_2187135
 ok 23 - B: reject invalid timezone
 
 expecting success of 9300.24 'B: accept invalid timezone with raw-permissive': 
@@ -537734,7 +537831,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_957136
+fast-import: dumping crash report to .git/fast_import_crash_2187538
 ok 26 - B: fail on invalid committer (1)
 
 expecting success of 9300.27 'B: fail on invalid committer (2)': 
@@ -537750,7 +537847,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_957212
+fast-import: dumping crash report to .git/fast_import_crash_2187603
 ok 27 - B: fail on invalid committer (2)
 
 expecting success of 9300.28 'B: fail on invalid committer (3)': 
@@ -537766,7 +537863,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_957259
+fast-import: dumping crash report to .git/fast_import_crash_2187649
 ok 28 - B: fail on invalid committer (3)
 
 expecting success of 9300.29 'B: fail on invalid committer (4)': 
@@ -537782,7 +537879,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_957345
+fast-import: dumping crash report to .git/fast_import_crash_2187741
 ok 29 - B: fail on invalid committer (4)
 
 expecting success of 9300.30 'B: fail on invalid committer (5)': 
@@ -537798,7 +537895,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_957412
+fast-import: dumping crash report to .git/fast_import_crash_2187796
 ok 30 - B: fail on invalid committer (5)
 
 expecting success of 9300.31 'C: incremental import create pack from stdin': 
@@ -538031,7 +538128,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_958290
+fast-import: dumping crash report to .git/fast_import_crash_2188638
 ok 41 - E: rfc2822 date, --date-format=raw
 
 expecting success of 9300.42 'E: rfc2822 date, --date-format=rfc2822': 
@@ -538430,7 +538527,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_960182
+fast-import: dumping crash report to .git/fast_import_crash_2190123
 ok 59 - J: tag must fail on empty branch
 
 expecting success of 9300.60 'K: reinit branch with from': 
@@ -538628,9 +538725,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 8c1bf1b9f891df8805c27a54986e5043829939ad
-dangling tag 0e22025f0f5cea5d83b68c3dc9fc334571f7196c
 dangling commit 8cecdab6b3e4062de5b06ad3accf5bff1449e99b
+dangling tag 0e22025f0f5cea5d83b68c3dc9fc334571f7196c
+dangling commit 8c1bf1b9f891df8805c27a54986e5043829939ad
 dangling tag 103553a16e02d76e288cec0f76240f1ad97caeb9
 dangling commit 994b824fbe51b899f546383c3ba14a28a07c1022
 dangling commit a53846236402ec769ea7f2fd7632de38e28f3273
@@ -539545,7 +539642,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_962953
+fast-import: dumping crash report to .git/fast_import_crash_2192589
 ok 81 - N: reject foo/ syntax
 
 expecting success of 9300.82 'N: reject foo/ syntax in copy source': 
@@ -539561,7 +539658,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_962978
+fast-import: dumping crash report to .git/fast_import_crash_2192622
 ok 82 - N: reject foo/ syntax in copy source
 
 expecting success of 9300.83 'N: reject foo/ syntax in rename source': 
@@ -539577,7 +539674,7 @@
 	INPUT_END
 
 fatal: Path file2/ not in branch
-fast-import: dumping crash report to .git/fast_import_crash_963002
+fast-import: dumping crash report to .git/fast_import_crash_2192644
 ok 83 - N: reject foo/ syntax in rename source
 
 expecting success of 9300.84 'N: reject foo/ syntax in ls argument': 
@@ -539593,7 +539690,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_963029
+fast-import: dumping crash report to .git/fast_import_crash_2192684
 ok 84 - N: reject foo/ syntax in ls argument
 
 expecting success of 9300.85 'N: copy to root ("") by id and modify': 
@@ -540360,7 +540457,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       8617 /       8617
+pack_report: pack_mapped              =       8584 /       8584
 ---------------------------------------------------------------------
 
 Switched to branch 'subuse1'
@@ -540430,7 +540527,7 @@
 pack_report: pack_used_ctr            =          4
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8427 /       8427
+pack_report: pack_mapped              =       8228 /       8228
 ---------------------------------------------------------------------
 
 ok 97 - P: verbatim SHA gitlinks
@@ -540456,7 +540553,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_965116
+fast-import: dumping crash report to .git/fast_import_crash_2194403
 ok 98 - P: fail on inline gitlink
 
 expecting success of 9300.99 'P: fail on blob mark in gitlink': 
@@ -540483,7 +540580,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_965151
+fast-import: dumping crash report to .git/fast_import_crash_2194442
 ok 99 - P: fail on blob mark in gitlink
 
 expecting success of 9300.100 'Q: commit notes': 
@@ -540870,7 +540967,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_966112
+fast-import: dumping crash report to .git/fast_import_crash_2195298
 ok 121 - Q: deny note on empty branch
 
 expecting success of 9300.122 'R: abort on unsupported feature': 
@@ -540881,7 +540978,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_966147
+fast-import: dumping crash report to .git/fast_import_crash_2195322
 ok 122 - R: abort on unsupported feature
 
 expecting success of 9300.123 'R: supported feature is accepted': 
@@ -540928,7 +541025,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_966217
+fast-import: dumping crash report to .git/fast_import_crash_2195369
 ok 124 - R: abort on receiving feature after data command
 
 expecting success of 9300.125 'R: import-marks features forbidden by default': 
@@ -540939,9 +541036,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_966235
+fast-import: dumping crash report to .git/fast_import_crash_2195384
 fatal: feature 'import-marks-if-exists' forbidden in input without --allow-unsafe-features
-fast-import: dumping crash report to .git/fast_import_crash_966259
+fast-import: dumping crash report to .git/fast_import_crash_2195395
 ok 125 - R: import-marks features forbidden by default
 
 expecting success of 9300.126 'R: only one import-marks feature allowed per stream': 
@@ -540955,7 +541052,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_966284
+fast-import: dumping crash report to .git/fast_import_crash_2195430
 ok 126 - R: only one import-marks feature allowed per stream
 
 expecting success of 9300.127 'R: export-marks feature forbidden by default': 
@@ -540963,7 +541060,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_966300
+fast-import: dumping crash report to .git/fast_import_crash_2195447
 ok 127 - R: export-marks feature forbidden by default
 
 expecting success of 9300.128 'R: export-marks feature results in a marks file being created': 
@@ -541053,9 +541150,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_966414
+fast-import: dumping crash report to .git/fast_import_crash_2195529
 fatal: cannot read 'nonexistent.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_966440
+fast-import: dumping crash report to .git/fast_import_crash_2195545
 ok 130 - R: catch typo in marks file name
 
 expecting success of 9300.131 'R: import and output marks can be the same file': 
@@ -541142,7 +541239,7 @@
 	EOF
 
 fatal: cannot read 'io.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_966545
+fast-import: dumping crash report to .git/fast_import_crash_2195622
 ok 132 - R: --import-marks=foo --output-marks=foo to create foo fails
 
 expecting success of 9300.133 'R: --import-marks-if-exists': 
@@ -541359,7 +541456,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8427 /       8427
+pack_report: pack_mapped              =       8228 /       8228
 ---------------------------------------------------------------------
 
 ok 135 - R: import to output marks works without any content
@@ -541394,7 +541491,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8427 /       8427
+pack_report: pack_mapped              =       8228 /       8228
 ---------------------------------------------------------------------
 
 ok 136 - R: import marks prefers commandline marks file over the stream
@@ -541432,7 +541529,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8427 /       8427
+pack_report: pack_mapped              =       8228 /       8228
 ---------------------------------------------------------------------
 
 ok 137 - R: multiple --import-marks= should be honoured
@@ -541470,7 +541567,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8427 /       8427
+pack_report: pack_mapped              =       8228 /       8228
 ---------------------------------------------------------------------
 
 ok 138 - R: feature relative-marks should be honoured
@@ -541507,7 +541604,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8427 /       8427
+pack_report: pack_mapped              =       8228 /       8228
 ---------------------------------------------------------------------
 
 ok 139 - R: feature no-relative-marks should be honoured
@@ -541576,7 +541673,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_967033
+fast-import: dumping crash report to .git/fast_import_crash_2196083
 ok 142 - R: cat-blob-fd must be a nonnegative integer
 
 expecting success of 9300.143 'R: print old blob': 
@@ -541657,7 +541754,7 @@
 pack_report: pack_used_ctr            =          1
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8427 /       8427
+pack_report: pack_mapped              =       8228 /       8228
 ---------------------------------------------------------------------
 
 fast-import statistics:
@@ -541681,7 +541778,7 @@
 pack_report: pack_used_ctr            =          1
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       8427 /       8427
+pack_report: pack_mapped              =       8228 /       8228
 ---------------------------------------------------------------------
 
 ok 144 - R: in-stream cat-blob-fd not respected
@@ -541878,7 +541975,7 @@
 pack_report: pack_used_ctr            =          2
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          1 /          2
-pack_report: pack_mapped              =       8427 /       9052
+pack_report: pack_mapped              =       8228 /       8853
 ---------------------------------------------------------------------
 
 ok 149 - R: print two blobs to stdout
@@ -542088,9 +542185,9 @@
 	test_must_fail git fast-import --done </dev/null
 
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_967973
+fast-import: dumping crash report to .git/fast_import_crash_2197038
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_967982
+fast-import: dumping crash report to .git/fast_import_crash_2197043
 ok 154 - R: feature done means terminating "done" is mandatory
 
 expecting success of 9300.155 'R: terminating "done" with trailing gibberish is ok': 
@@ -542212,14 +542309,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_968087
+fast-import: dumping crash report to .git/fast_import_crash_2197138
 ok 157 - R: die on unknown option
 
 expecting success of 9300.158 '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_968121
+fast-import: dumping crash report to .git/fast_import_crash_2197156
 ok 158 - R: unknown commandline options are rejected
 
 expecting success of 9300.159 'R: die on invalid option argument': 
@@ -542230,11 +542327,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_968148
+fast-import: dumping crash report to .git/fast_import_crash_2197192
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_968157
+fast-import: dumping crash report to .git/fast_import_crash_2197222
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_968169
+fast-import: dumping crash report to .git/fast_import_crash_2197234
 ok 159 - R: die on invalid option argument
 
 expecting success of 9300.160 'R: ignore non-git options': 
@@ -542285,7 +542382,7 @@
 	test_cmp expect io.marks
 
 fatal: object not found: 0000000000000000000000000000000000000000
-fast-import: dumping crash report to .git/fast_import_crash_968268
+fast-import: dumping crash report to .git/fast_import_crash_2197334
 ok 161 - R: corrupt lines do not mess marks file
 
 expecting success of 9300.162 'R: blob bigger than threshold': 
@@ -544774,7 +544871,7 @@
 
 cruft: progress foo
 cruft: progress bar
-Terminated
+./test-lib.sh: line 1055: wait: pid 2201344 is not a child of this shell
 ok 239 - V: checkpoint helper does not get stuck with extra output
 
 expecting success of 9300.240 'V: checkpoint updates refs after reset': 
@@ -544788,7 +544885,7 @@
 	test "$(git rev-parse --verify V)" = "$(git rev-parse --verify U)" &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1055: wait: pid 2201437 is not a child of this shell
 ok 240 - V: checkpoint updates refs after reset
 
 expecting success of 9300.241 'V: checkpoint updates refs and marks after commit': 
@@ -544809,7 +544906,7 @@
 	test_cmp marks.expected marks.actual &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1055: wait: pid 2201535 is not a child of this shell
 ok 241 - V: checkpoint updates refs and marks after commit
 
 expecting success of 9300.242 'V: checkpoint updates refs and marks after commit (no new objects)': 
@@ -544830,7 +544927,7 @@
 	test_cmp marks.expected marks.actual &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1055: wait: pid 2201687 is not a child of this shell
 ok 242 - V: checkpoint updates refs and marks after commit (no new objects)
 
 expecting success of 9300.243 'V: checkpoint updates tags after tag': 
@@ -544848,7 +544945,7 @@
 
 257d40767a41942fd4cbdd546e6183e743d96bbf refs/tags/Vtag
 114b4ec89664abe96ffe4873754fefc6aff6c1a2 refs/tags/Vtag^{}
-Terminated
+./test-lib.sh: line 1055: wait: pid 2201822 is not a child of this shell
 ok 243 - V: checkpoint updates tags after tag
 
 expecting success of 9300.244 'W: get-mark & empty orphan commit with no newlines': 
@@ -544952,7 +545049,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_973755
+fast-import: dumping crash report to .git/fast_import_crash_2202003
 ok 247 - W: get-mark & empty orphan commit with erroneous third newline
 
 expecting success of 9300.248 'X: handling encoding': 
@@ -545073,225 +545170,335 @@
 1..250
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9501-gitweb-standalone-http-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9501-gitweb-standalone-http-status/.git/
-expecting success of 9501.1 'setup': 
-	test_commit 'SnapshotTests' 'i can has snapshot'
+*** t9603-cvsimport-patchsets.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
 
-[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
+	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
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
+--- expect-main	2025-01-30 02:20:01.779080074 +0000
++++ actual-main	2025-01-30 02:20:01.775080050 +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
 
-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
+# still have 1 known breakage(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9600-cvsimport.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/.git/
+checking prerequisite: NOT_ROOT
 
-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
+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 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
+)
+prerequisite NOT_ROOT ok
+expecting success of 9600.1 'setup cvsroot environment': 
+	CVSROOT=$(pwd)/cvsroot &&
+	export CVSROOT
 
-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
+ok 1 - setup cvsroot environment
 
-grep: gitweb.output: binary file matches
-ok 6 - snapshots: good tree-ish id
+expecting success of 9600.2 'setup cvsroot': $CVS init
+ok 2 - setup cvsroot
 
-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
+expecting success of 9600.3 'setup a cvs module': 
 
-404 - Object does not exist
-ok 7 - snapshots: bad tree-ish id
+	mkdir "$CVSROOT/module" &&
+	$CVS co -d module-cvs module &&
+	(cd module-cvs &&
+	cat <<EOF >o_fortuna &&
+O Fortuna
+velut luna
+statu variabilis,
 
-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
+semper crescis
+aut decrescis;
+vita detestabilis
 
-[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)
+nunc obdurat
+et tunc curat
+ludo mentis aciem,
 
-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
+egestatem,
+potestatem
+dissolvit ut glaciem.
+EOF
+	$CVS add o_fortuna &&
+	cat <<EOF >message &&
+add "O Fortuna" lyrics
 
-grep: gitweb.output: binary file matches
-ok 9 - snapshots: good object id
+These public domain lyrics make an excellent sample text.
+EOF
+	$CVS commit -F message
+	)
 
-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
+cvs checkout: Updating module-cvs
+cvs add: scheduling file `o_fortuna' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs commit: Examining .
+/build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/cvsroot/module/o_fortuna,v  <--  o_fortuna
+initial revision: 1.1
+ok 3 - setup a cvs module
 
-404 - Object does not exist
-ok 10 - snapshots: bad object id
+expecting success of 9600.4 'import a trivial module': 
 
-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
+	git cvsimport -a -R -z 0 -C module-git module &&
+	test_cmp module-cvs/o_fortuna module-git/o_fortuna
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/module-git/.git/
+ok 4 - import a trivial module
 
-Status: 200 OK
-ok 12 - modification: feed if-modified-since (modified)
+expecting success of 9600.5 'pack refs': (cd module-git && git gc)
+ok 5 - pack refs
 
-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
+expecting success of 9600.6 'initial import has correct .git/cvs-revisions': 
 
-Status: 304 Not Modified
-ok 13 - modification: feed if-modified-since (unmodified)
+	(cd module-git &&
+	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+	test_cmp expected module-git/.git/cvs-revisions
 
-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
+ok 6 - initial import has correct .git/cvs-revisions
 
-Status: 200 OK
-Last-modified: Thu, 7 Apr 2005 22:14:13 +0000
-ok 14 - modification: snapshot last-modified
+expecting success of 9600.7 'update cvs module': 
+	(cd module-cvs &&
+	cat <<EOF >o_fortuna &&
+O Fortune,
+like the moon
+you are changeable,
 
-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
+ever waxing
+and waning;
+hateful life
 
-Status: 200 OK
-ok 15 - modification: snapshot if-modified-since (modified)
+first oppresses
+and then soothes
+as fancy takes it;
 
-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
+poverty
+and power
+it melts them like ice.
+EOF
+	cat <<EOF >message &&
+translate to English
 
-Status: 304 Not Modified
-ok 16 - modification: snapshot if-modified-since (unmodified)
+My Latin is terrible.
+EOF
+	$CVS commit -F message
+	)
 
-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
+cvs commit: Examining .
+/build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/cvsroot/module/o_fortuna,v  <--  o_fortuna
+new revision: 1.2; previous revision: 1.1
+ok 7 - update cvs module
 
-Status: 200 OK
-ok 17 - modification: tree snapshot
+expecting success of 9600.8 'update git module': 
 
-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
+	(cd module-git &&
+	git config cvsimport.trackRevisions true &&
+	git cvsimport -a -z 0 module &&
+	git merge origin
+	) &&
+	test_cmp module-cvs/o_fortuna module-git/o_fortuna
 
-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
+Updating 95c5599..443dcc4
+Fast-forward (no commit created; -m option ignored)
+ o_fortuna | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+Already up to date.
+ok 8 - update git module
 
-Status: 400 Bad Request
-400 - Invalid search regexp &#39;*\.git&#39;
-ok 19 - invalid arguments: invalid regexp (in project search)
+expecting success of 9600.9 'update has correct .git/cvs-revisions': 
 
-# passed all 19 test(s)
-1..19
+	(cd module-git &&
+	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+	 git log --format="o_fortuna 1.2 %H" -1 HEAD) > expected &&
+	test_cmp expected module-git/.git/cvs-revisions
+
+ok 9 - update has correct .git/cvs-revisions
+
+expecting success of 9600.10 'update cvs module': 
+
+	(cd module-cvs &&
+		echo 1 >tick &&
+		$CVS add tick &&
+		$CVS commit -m 1
+	)
+
+cvs add: scheduling file `tick' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs commit: Examining .
+/build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/cvsroot/module/tick,v  <--  tick
+initial revision: 1.1
+ok 10 - update cvs module
+
+expecting success of 9600.11 'cvsimport.module config works': 
+
+	(cd module-git &&
+		git config cvsimport.module module &&
+		git config cvsimport.trackRevisions true &&
+		git cvsimport -a -z0 &&
+		git merge origin
+	) &&
+	test_cmp module-cvs/tick module-git/tick
+
+
+Updating 443dcc4..6057808
+Fast-forward (no commit created; -m option ignored)
+ tick | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tick
+Already up to date.
+ok 11 - cvsimport.module config works
+
+expecting success of 9600.12 'second update has correct .git/cvs-revisions': 
+
+	(cd module-git &&
+	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+	 git log --format="o_fortuna 1.2 %H" -1 HEAD^ &&
+	 git log --format="tick 1.1 %H" -1 HEAD) > expected &&
+	test_cmp expected module-git/.git/cvs-revisions
+
+ok 12 - second update has correct .git/cvs-revisions
+
+expecting success of 9600.13 'import from a CVS working tree': 
+
+	$CVS co -d import-from-wt module &&
+	(cd import-from-wt &&
+		git config cvsimport.trackRevisions false &&
+		git cvsimport -a -z0 &&
+		echo 1 >expect &&
+		git log -1 --pretty=format:%s%n >actual &&
+		test_cmp expect actual
+	)
+
+
+cvs checkout: Updating import-from-wt
+U import-from-wt/o_fortuna
+U import-from-wt/tick
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/import-from-wt/.git/
+ok 13 - import from a CVS working tree
+
+expecting success of 9600.14 'no .git/cvs-revisions created by default': 
+
+	! test -e import-from-wt/.git/cvs-revisions
+
+
+ok 14 - no .git/cvs-revisions created by default
+
+expecting success of 9600.15 'test entire HEAD': test_cmp_branch_tree main
+cvs checkout: Updating module-cvs-main
+U module-cvs-main/o_fortuna
+U module-cvs-main/tick
+Already on 'main'
+ok 15 - test entire HEAD
+
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9603-cvsimport-patchsets.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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 &&
+*** t9601-cvsimport-vendor-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9601-cvsimport-vendor-branch/.git/
+expecting success of 9601.1 'import a module with a vendor branch': 
 
-	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
+	git cvsimport -C module-git module
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
---- expect-main	2026-03-04 08:05:20.635352315 +0000
-+++ actual-main	2026-03-04 08:05:20.635352315 +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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/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-01-30 02:20:01.551078706 +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)
-1..1
+# passed all remaining 8 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9200-git-cvsexportcommit.sh ***
@@ -545669,10 +545876,10 @@
 	test_must_fail git cvsexportcommit -c $id
 	)
 
-[master 2a784a8] Update one
+[master 8f70b1a] Update one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8565c5f] Update two
+[master 25d66a8] Update two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Checking if patch will apply
@@ -545705,7 +545912,7 @@
 	! test -x G/off
 	)
 
-[master 960ae55] Execute test
+[master 36f7082] Execute test
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 G/off
@@ -545744,7 +545951,7 @@
 	test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt
 	)
 
-[master 332d046] More updates
+[master db3c227] More updates
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 W/file1.txt
@@ -545790,7 +545997,7 @@
 	test_cmp "$CVSWORK/release-notes" release-notes
 
 
-[master f6daa39] Add release notes
+[master a166c9f] Add release notes
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 release-notes
@@ -545807,14 +546014,14 @@
 /build/reproducible-path/git-2.47.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
 initial revision: 1.1
 Committed successfully to CVS
-[master 2308359] Add two files with the same basename
+[master e104396] 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
@@ -545850,7 +546057,7 @@
 	(cd "$CVSWORK" && cvs -Q update -d) &&
 	test -f "$CVSWORK/attic_gremlin"
 
-[master 6bb486e] Added attic_gremlin
+[master a5c4182] Added attic_gremlin
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 attic_gremlin
@@ -545882,7 +546089,7 @@
 	test_cmp "$CVSWORK/ space" " space"
 
 
-[master 0d11c78] Add a file with a leading space
+[master 4b951ef] Add a file with a leading space
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644  space
@@ -546013,611 +546220,16 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9502-gitweb-standalone-parse-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9502-gitweb-standalone-parse-output/.git/
-expecting success of 9502.1 'setup': 
-	test_commit first foo &&
-	git branch xx/test &&
-	FULL_ID=$(git rev-parse --verify HEAD) &&
-	SHORT_ID=$(git rev-parse --verify --short=7 HEAD)
-
-[main (root-commit) 1005c80] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-ok 1 - setup
-
-expecting success of 9502.2 'snapshot: full sha1': 
-	gitweb_run "p=.git;a=snapshot;h=$FULL_ID;sf=tar" &&
-	check_snapshot ".git-$SHORT_ID"
-
-basename=.git-1005c80
-ok 2 - snapshot: full sha1
-
-expecting success of 9502.3 'snapshot: shortened sha1': 
-	gitweb_run "p=.git;a=snapshot;h=$SHORT_ID;sf=tar" &&
-	check_snapshot ".git-$SHORT_ID"
-
-basename=.git-1005c80
-ok 3 - snapshot: shortened sha1
-
-expecting success of 9502.4 'snapshot: almost full sha1': 
-	ID=$(git rev-parse --short=30 HEAD) &&
-	gitweb_run "p=.git;a=snapshot;h=$ID;sf=tar" &&
-	check_snapshot ".git-$SHORT_ID"
-
-basename=.git-1005c80
-ok 4 - snapshot: almost full sha1
-
-expecting success of 9502.5 'snapshot: HEAD': 
-	gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tar" &&
-	check_snapshot ".git-HEAD-$SHORT_ID"
-
-basename=.git-HEAD-1005c80
-ok 5 - snapshot: HEAD
-
-expecting success of 9502.6 'snapshot: short branch name (main)': 
-	gitweb_run "p=.git;a=snapshot;h=main;sf=tar" &&
-	ID=$(git rev-parse --verify --short=7 main) &&
-	check_snapshot ".git-main-$ID"
-
-basename=.git-main-1005c80
-ok 6 - snapshot: short branch name (main)
-
-expecting success of 9502.7 'snapshot: short tag name (first)': 
-	gitweb_run "p=.git;a=snapshot;h=first;sf=tar" &&
-	ID=$(git rev-parse --verify --short=7 first) &&
-	check_snapshot ".git-first-$ID"
-
-basename=.git-first-1005c80
-ok 7 - snapshot: short tag name (first)
-
-expecting success of 9502.8 'snapshot: full branch name (refs/heads/main)': 
-	gitweb_run "p=.git;a=snapshot;h=refs/heads/main;sf=tar" &&
-	ID=$(git rev-parse --verify --short=7 main) &&
-	check_snapshot ".git-main-$ID"
-
-basename=.git-main-1005c80
-ok 8 - snapshot: full branch name (refs/heads/main)
-
-expecting success of 9502.9 'snapshot: full tag name (refs/tags/first)': 
-	gitweb_run "p=.git;a=snapshot;h=refs/tags/first;sf=tar" &&
-	check_snapshot ".git-first"
-
-basename=.git-first
-ok 9 - snapshot: full tag name (refs/tags/first)
-
-expecting success of 9502.10 'snapshot: hierarchical branch name (xx/test)': 
-	gitweb_run "p=.git;a=snapshot;h=xx/test;sf=tar" &&
-	! grep "filename=.*/" gitweb.headers
-
-ok 10 - snapshot: hierarchical branch name (xx/test)
-
-expecting success of 9502.11 'forks: setup': 
-	git init --bare foo.git &&
-	echo file > file &&
-	git --git-dir=foo.git --work-tree=. add file &&
-	git --git-dir=foo.git --work-tree=. commit -m "Initial commit" &&
-	echo "foo" > foo.git/description &&
-	git clone --bare foo.git foo.bar.git &&
-	echo "foo.bar" > foo.bar.git/description &&
-	git clone --bare foo.git foo_baz.git &&
-	echo "foo_baz" > foo_baz.git/description &&
-	rm -fr   foo &&
-	mkdir -p foo &&
-	(
-		cd foo &&
-		git clone --shared --bare ../foo.git foo-forked.git &&
-		echo "fork of foo" > foo-forked.git/description
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9502-gitweb-standalone-parse-output/foo.git/
-[main (root-commit) d29c088] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into bare repository 'foo.bar.git'...
-done.
-Cloning into bare repository 'foo_baz.git'...
-done.
-Cloning into bare repository 'foo-forked.git'...
-done.
-ok 11 - forks: setup
-
-expecting success of 9502.12 'forks: not skipped unless "forks" feature enabled': 
-	gitweb_run "a=project_list" &&
-	grep -q ">\\.git<"               gitweb.body &&
-	grep -q ">foo\\.git<"            gitweb.body &&
-	grep -q ">foo_baz\\.git<"        gitweb.body &&
-	grep -q ">foo\\.bar\\.git<"      gitweb.body &&
-	grep -q ">foo_baz\\.git<"        gitweb.body &&
-	grep -q ">foo/foo-forked\\.git<" gitweb.body &&
-	grep -q ">fork of .*<"           gitweb.body
-
-ok 12 - forks: not skipped unless "forks" feature enabled
-
-expecting success of 9502.13 'enable forks feature': 
-	cat >>gitweb_config.perl <<-\EOF
-	$feature{"forks"}{"default"} = [1];
-	EOF
-
-ok 13 - enable forks feature
-
-expecting success of 9502.14 'forks: forks skipped if "forks" feature enabled': 
-	gitweb_run "a=project_list" &&
-	grep -q ">\\.git<"               gitweb.body &&
-	grep -q ">foo\\.git<"            gitweb.body &&
-	grep -q ">foo_baz\\.git<"        gitweb.body &&
-	grep -q ">foo\\.bar\\.git<"      gitweb.body &&
-	grep -q ">foo_baz\\.git<"        gitweb.body &&
-	grep -v ">foo/foo-forked\\.git<" gitweb.body &&
-	grep -v ">fork of .*<"           gitweb.body
-
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-]>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
-<!-- git web interface version current, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->
-<!-- git core binaries version 2.47.2 -->
-<head>
-<meta name="generator" content="gitweb/current git/2.47.2"/>
-<meta name="robots" content="index, nofollow"/>
-<title>[localhost]</title>
-<link rel="stylesheet" type="text/css" href="file:////build/reproducible-path/git-2.47.2/gitweb/static/gitweb.css"/>
-<link rel="alternate" title="[localhost] projects list" href="/gitweb.cgi?a=project_index" type="text/plain; charset=utf-8" />
-<link rel="alternate" title="[localhost] projects feeds" href="/gitweb.cgi?a=opml" type="text/x-opml" />
-<link rel="shortcut icon" href="file:////build/reproducible-path/git-2.47.2/gitweb/static/git-favicon.png" type="image/png" />
-</head>
-<body>
-<div class="page_header">
-<a href="https://git-scm.com/" title="git homepage"><img alt="git" class="logo" height="27" src="file:////build/reproducible-path/git-2.47.2/gitweb/static/git-logo.png" width="72" /></a><a href="/gitweb.cgi">projects</a> / </div>
-<div class="projsearch">
-<form method="get" action="/gitweb.cgi" enctype="multipart/form-data"><input type="hidden" name="a" value="project_list"  />
-<input type="text" name="s"  size="60" title="Search project by name and description" />
-<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span>
-<input type="submit" name="btnS" value="Search" />
-</form>
-<a href="/gitweb.cgi">List all projects</a><br />
-</div>
-<table class="project_list">
-<tr>
-<th></th>
-<th>Project</th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=descr">Description</a></th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=owner">Owner</a></th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=age">Last Change</a></th>
-<th></th>
-</tr>
-<tr class="dark">
-<td></td>
-<td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
-<td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
-<td><i></i></td>
-<td class="age2">20 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 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 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 class="link"><a href="/gitweb.cgi?p=foo_baz.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=tree">tree</a></td>
-</tr>
-</table>
-<div class="page_footer">
-<a class="rss_logo" href="/gitweb.cgi?a=opml">OPML</a> <a class="rss_logo" href="/gitweb.cgi?a=project_index">TXT</a>
-</div>
-<script type="text/javascript" src="%2B%2BGITWEB_JS%2B%2B"></script>
-<script type="text/javascript">
-window.onload = function () {
-	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
-	onloadTZSetup('local', tz_cookie, 'datetime');
-};
-</script>
-</body>
-</html>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-]>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
-<!-- git web interface version current, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->
-<!-- git core binaries version 2.47.2 -->
-<head>
-<meta name="generator" content="gitweb/current git/2.47.2"/>
-<meta name="robots" content="index, nofollow"/>
-<title>[localhost]</title>
-<link rel="stylesheet" type="text/css" href="file:////build/reproducible-path/git-2.47.2/gitweb/static/gitweb.css"/>
-<link rel="alternate" title="[localhost] projects list" href="/gitweb.cgi?a=project_index" type="text/plain; charset=utf-8" />
-<link rel="alternate" title="[localhost] projects feeds" href="/gitweb.cgi?a=opml" type="text/x-opml" />
-<link rel="shortcut icon" href="file:////build/reproducible-path/git-2.47.2/gitweb/static/git-favicon.png" type="image/png" />
-</head>
-<body>
-<div class="page_header">
-<a href="https://git-scm.com/" title="git homepage"><img alt="git" class="logo" height="27" src="file:////build/reproducible-path/git-2.47.2/gitweb/static/git-logo.png" width="72" /></a><a href="/gitweb.cgi">projects</a> / </div>
-<div class="projsearch">
-<form method="get" action="/gitweb.cgi" enctype="multipart/form-data"><input type="hidden" name="a" value="project_list"  />
-<input type="text" name="s"  size="60" title="Search project by name and description" />
-<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span>
-<input type="submit" name="btnS" value="Search" />
-</form>
-<a href="/gitweb.cgi">List all projects</a><br />
-</div>
-<table class="project_list">
-<tr>
-<th></th>
-<th>Project</th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=descr">Description</a></th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=owner">Owner</a></th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=age">Last Change</a></th>
-<th></th>
-</tr>
-<tr class="dark">
-<td></td>
-<td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
-<td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
-<td><i></i></td>
-<td class="age2">20 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 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 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 class="link"><a href="/gitweb.cgi?p=foo_baz.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=tree">tree</a></td>
-</tr>
-</table>
-<div class="page_footer">
-<a class="rss_logo" href="/gitweb.cgi?a=opml">OPML</a> <a class="rss_logo" href="/gitweb.cgi?a=project_index">TXT</a>
-</div>
-<script type="text/javascript" src="%2B%2BGITWEB_JS%2B%2B"></script>
-<script type="text/javascript">
-window.onload = function () {
-	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
-	onloadTZSetup('local', tz_cookie, 'datetime');
-};
-</script>
-</body>
-</html>
-ok 14 - forks: forks skipped if "forks" feature enabled
-
-expecting success of 9502.15 'forks: "forks" action for forked repository': 
-	gitweb_run "p=foo.git;a=forks" &&
-	grep -q ">foo/foo-forked\\.git<" gitweb.body &&
-	grep -q ">fork of foo<"          gitweb.body
-
-ok 15 - forks: "forks" action for forked repository
-
-expecting success of 9502.16 'forks: can access forked repository': 
-	gitweb_run "p=foo/foo-forked.git;a=summary" &&
-	grep -q "200 OK"        gitweb.headers &&
-	grep -q ">fork of foo<" gitweb.body
-
-ok 16 - forks: can access forked repository
-
-expecting success of 9502.17 'forks: project_index lists all projects (incl. forks)': 
-	cat >expected <<-\EOF &&
-	.git
-	foo.bar.git
-	foo.git
-	foo/foo-forked.git
-	foo_baz.git
-	EOF
-	gitweb_run "a=project_index" &&
-	sed -e "s/ .*//" <gitweb.body | sort >actual &&
-	test_cmp expected actual
-
-ok 17 - forks: project_index lists all projects (incl. forks)
-
-expecting success of 9502.18 'xss checks': 
-	TAG="<magic-xss-tag>" &&
-	xss "a=rss&p=$TAG" &&
-	xss "a=rss&p=foo.git&f=$TAG" &&
-	xss "" "$TAG+"
-
-Checking a=rss&p=<magic-xss-tag>...
-Checking a=rss&p=foo.git&f=<magic-xss-tag>...
-Checking  <magic-xss-tag>+...
-ok 18 - xss checks
-
-expecting success of 9502.19 'no http-equiv="content-type" in XHTML': 
-	no_http_equiv_content_type &&
-	no_http_equiv_content_type "p=.git" &&
-	no_http_equiv_content_type "p=.git;a=log" &&
-	no_http_equiv_content_type "p=.git;a=tree"
-
-ok 19 - no http-equiv="content-type" in XHTML
-
-expecting success of 9502.20 'Proper DOCTYPE with entity declarations': 
-	proper_doctype &&
-	proper_doctype "p=.git" &&
-	proper_doctype "p=.git;a=log" &&
-	proper_doctype "p=.git;a=tree"
-
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-ok 20 - Proper DOCTYPE with entity declarations
-
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9600-cvsimport.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-expecting success of 9600.1 'setup cvsroot environment': 
-	CVSROOT=$(pwd)/cvsroot &&
-	export CVSROOT
-
-ok 1 - setup cvsroot environment
-
-expecting success of 9600.2 'setup cvsroot': $CVS init
-ok 2 - setup cvsroot
-
-expecting success of 9600.3 'setup a cvs module': 
-
-	mkdir "$CVSROOT/module" &&
-	$CVS co -d module-cvs module &&
-	(cd module-cvs &&
-	cat <<EOF >o_fortuna &&
-O Fortuna
-velut luna
-statu variabilis,
-
-semper crescis
-aut decrescis;
-vita detestabilis
-
-nunc obdurat
-et tunc curat
-ludo mentis aciem,
-
-egestatem,
-potestatem
-dissolvit ut glaciem.
-EOF
-	$CVS add o_fortuna &&
-	cat <<EOF >message &&
-add "O Fortuna" lyrics
-
-These public domain lyrics make an excellent sample text.
-EOF
-	$CVS commit -F message
-	)
-
-cvs checkout: Updating module-cvs
-cvs add: scheduling file `o_fortuna' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs commit: Examining .
-/build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/cvsroot/module/o_fortuna,v  <--  o_fortuna
-initial revision: 1.1
-ok 3 - setup a cvs module
-
-expecting success of 9600.4 'import a trivial module': 
-
-	git cvsimport -a -R -z 0 -C module-git module &&
-	test_cmp module-cvs/o_fortuna module-git/o_fortuna
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/module-git/.git/
-ok 4 - import a trivial module
-
-expecting success of 9600.5 'pack refs': (cd module-git && git gc)
-ok 5 - pack refs
-
-expecting success of 9600.6 'initial import has correct .git/cvs-revisions': 
-
-	(cd module-git &&
-	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
-	test_cmp expected module-git/.git/cvs-revisions
-
-ok 6 - initial import has correct .git/cvs-revisions
-
-expecting success of 9600.7 'update cvs module': 
-	(cd module-cvs &&
-	cat <<EOF >o_fortuna &&
-O Fortune,
-like the moon
-you are changeable,
-
-ever waxing
-and waning;
-hateful life
-
-first oppresses
-and then soothes
-as fancy takes it;
-
-poverty
-and power
-it melts them like ice.
-EOF
-	cat <<EOF >message &&
-translate to English
-
-My Latin is terrible.
-EOF
-	$CVS commit -F message
-	)
-
-cvs commit: Examining .
-/build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/cvsroot/module/o_fortuna,v  <--  o_fortuna
-new revision: 1.2; previous revision: 1.1
-ok 7 - update cvs module
-
-expecting success of 9600.8 'update git module': 
-
-	(cd module-git &&
-	git config cvsimport.trackRevisions true &&
-	git cvsimport -a -z 0 module &&
-	git merge origin
-	) &&
-	test_cmp module-cvs/o_fortuna module-git/o_fortuna
-
-
-Updating 28d0e1b..e847273
-Fast-forward (no commit created; -m option ignored)
- o_fortuna | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-Already up to date.
-ok 8 - update git module
-
-expecting success of 9600.9 'update has correct .git/cvs-revisions': 
-
-	(cd module-git &&
-	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
-	 git log --format="o_fortuna 1.2 %H" -1 HEAD) > expected &&
-	test_cmp expected module-git/.git/cvs-revisions
-
-ok 9 - update has correct .git/cvs-revisions
-
-expecting success of 9600.10 'update cvs module': 
-
-	(cd module-cvs &&
-		echo 1 >tick &&
-		$CVS add tick &&
-		$CVS commit -m 1
-	)
-
-cvs add: scheduling file `tick' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs commit: Examining .
-/build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/cvsroot/module/tick,v  <--  tick
-initial revision: 1.1
-ok 10 - update cvs module
-
-expecting success of 9600.11 'cvsimport.module config works': 
-
-	(cd module-git &&
-		git config cvsimport.module module &&
-		git config cvsimport.trackRevisions true &&
-		git cvsimport -a -z0 &&
-		git merge origin
-	) &&
-	test_cmp module-cvs/tick module-git/tick
-
-
-Updating e847273..25925c2
-Fast-forward (no commit created; -m option ignored)
- tick | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 tick
-Already up to date.
-ok 11 - cvsimport.module config works
-
-expecting success of 9600.12 'second update has correct .git/cvs-revisions': 
-
-	(cd module-git &&
-	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
-	 git log --format="o_fortuna 1.2 %H" -1 HEAD^ &&
-	 git log --format="tick 1.1 %H" -1 HEAD) > expected &&
-	test_cmp expected module-git/.git/cvs-revisions
-
-ok 12 - second update has correct .git/cvs-revisions
-
-expecting success of 9600.13 'import from a CVS working tree': 
-
-	$CVS co -d import-from-wt module &&
-	(cd import-from-wt &&
-		git config cvsimport.trackRevisions false &&
-		git cvsimport -a -z0 &&
-		echo 1 >expect &&
-		git log -1 --pretty=format:%s%n >actual &&
-		test_cmp expect actual
-	)
-
-
-cvs checkout: Updating import-from-wt
-U import-from-wt/o_fortuna
-U import-from-wt/tick
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9600-cvsimport/import-from-wt/.git/
-ok 13 - import from a CVS working tree
-
-expecting success of 9600.14 'no .git/cvs-revisions created by default': 
-
-	! test -e import-from-wt/.git/cvs-revisions
-
-
-ok 14 - no .git/cvs-revisions created by default
-
-expecting success of 9600.15 'test entire HEAD': test_cmp_branch_tree main
-cvs checkout: Updating module-cvs-main
-U module-cvs-main/o_fortuna
-U module-cvs-main/tick
-Already on 'main'
-ok 15 - test entire HEAD
-
-# passed all 15 test(s)
-1..15
+*** 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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9700-perl-git.sh ***
@@ -546752,42 +546364,6 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9806-git-p4-options.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9807-git-p4-submit.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9808-git-p4-chdir.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9809-git-p4-client-view.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9164-git-svn-dcommit-concurrent.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9164-git-svn-dcommit-concurrent/.git/
 expecting success of 9164.1 'setup svn repository': 
@@ -546831,11 +546407,11 @@
 Updating '.':
 U    auto_updated_file
 Updated to revision 3.
---- auto_updated_file	2026-03-04 08:04:41.479352315 +0000
-+++ au_file_saved	2026-03-04 08:04:41.151352315 +0000
+--- auto_updated_file	2025-01-30 02:19:26.110866146 +0000
++++ au_file_saved	2025-01-30 02:19:25.850864587 +0000
 @@ -1,2 +1 @@
  
--945233
+-2176949
 ok 2 - check if post-commit hook creates a concurrent commit
 
 expecting success of 9164.3 'check if pre-commit hook fails': 
@@ -546881,22 +546457,22 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work1.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = b258021b3325afc6d3f4b76558556ad32c972211 (refs/remotes/git-svn)
+r1 = 8073ac72277cf8dd0d30dad036bfb702222e494e (refs/remotes/git-svn)
 	M	file
-r2 = cf3f3a02c040a15ba8c97dbbb844958692c94ada (refs/remotes/git-svn)
+r2 = 8e65519f3119b12946f8993e8c565a7d60c9384f (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = d12d4b3f641147e4ca31bbb771eb4cea7b4f5687 (refs/remotes/git-svn)
+r3 = 92e4323d829051dff2f40b1d8499fac877ba9792 (refs/remotes/git-svn)
 	M	file
-r4 = 5011f21f76cebb903ac3da6c233d75183d24135b (refs/remotes/git-svn)
+r4 = 0a048a1a8014fd94dd2a4a3d95bcc2cc2c9db57a (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r4
-[master 7dcc448] commit change 1.1
+[master 964033a] commit change 1.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 4648896] commit change 1.2
+[master aeb1395] commit change 1.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 5dfcac1] commit change 1.3
+[master 8feeed5] commit change 1.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -546904,14 +546480,14 @@
 	M	file
 Committed r5
 	M	file
-r5 = b89196c227c07b5b63f54f53cb1ad55f55e6d23f (refs/remotes/git-svn)
+r5 = 990655bccf68f2ba5b01595b1aa0cc0d36573807 (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: 5dfcac105e89a974651a8db4f9a5517ec57060d8 and refs/remotes/git-svn differ, using rebase:
+W: 8feeed5f306091c1a34011ae62cae30200cf9bf2 and refs/remotes/git-svn differ, using rebase:
 :100644 100644 fb014dd41485c73acf40cd9548cd4cd812fee4ec e6ac0ef8373861d92d8eecf8d88e592606a70872 M	file
-warning: skipped previously applied commit 7dcc448
+warning: skipped previously applied commit 964033a
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config advice.skippedCherryPicks false"
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
@@ -546942,24 +546518,24 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work2.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = b258021b3325afc6d3f4b76558556ad32c972211 (refs/remotes/git-svn)
+r1 = 8073ac72277cf8dd0d30dad036bfb702222e494e (refs/remotes/git-svn)
 	M	file
-r2 = cf3f3a02c040a15ba8c97dbbb844958692c94ada (refs/remotes/git-svn)
+r2 = 8e65519f3119b12946f8993e8c565a7d60c9384f (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = d12d4b3f641147e4ca31bbb771eb4cea7b4f5687 (refs/remotes/git-svn)
+r3 = 92e4323d829051dff2f40b1d8499fac877ba9792 (refs/remotes/git-svn)
 	M	file
-r4 = 5011f21f76cebb903ac3da6c233d75183d24135b (refs/remotes/git-svn)
+r4 = 0a048a1a8014fd94dd2a4a3d95bcc2cc2c9db57a (refs/remotes/git-svn)
 	M	file
-r5 = b89196c227c07b5b63f54f53cb1ad55f55e6d23f (refs/remotes/git-svn)
+r5 = 990655bccf68f2ba5b01595b1aa0cc0d36573807 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r5
-[master bc7d67d] commit change 2.1
+[master af79509] commit change 2.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 16eb8ad] commit change 2.2
+[master 6eb729d] commit change 2.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 2a4ff4d] commit change 2.3
+[master b77ff40] commit change 2.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -546967,25 +546543,25 @@
 	M	file
 Committed r6
 	M	file
-r6 = 65a96553bac603513fa2e6a7187e718e7251c5ef (refs/remotes/git-svn)
+r6 = 6e50862de06b0d51cd69b876fff2bbf395e3cb15 (refs/remotes/git-svn)
 	M	file
 Committed r7
 	M	file
-r7 = 21d78af46d89eca87d6f190c281f0e1dcdd1aeb1 (refs/remotes/git-svn)
+r7 = 6f87e2233da968a4b140dd5bb8538ab7fb761c48 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = f099da20257bcf3cc7e28779af1257d119b330e4 (refs/remotes/git-svn)
-W: 16eb8ad2fc06245964b5126086dee0d0e92268ac and refs/remotes/git-svn differ, using rebase:
-:100644 100644 eca89a81984554682314212e2debcce945c75091 1e03a57984be382ce98aaccbc624194c75fce0e0 M	auto_updated_file
-warning: skipped previously applied commit bc7d67d
-warning: skipped previously applied commit 16eb8ad
+r8 = 7f84b85108153a1a2e158e85e6c25890f75f9643 (refs/remotes/git-svn)
+W: 6eb729d103a1e647085448e1e80088673007818c and refs/remotes/git-svn differ, using rebase:
+:100644 100644 c90cb4ebebeddb8890f78575cd7a35e9d8080e23 dc9add3e375e9a9a0c49e49d2fff614846598cae M	auto_updated_file
+warning: skipped previously applied commit af79509
+warning: skipped previously applied commit 6eb729d
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config advice.skippedCherryPicks false"
 Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
 	M	file
 Committed r9
 	M	file
-r9 = 7185b8f3d825504caa7c3789ff7e5769eabb1630 (refs/remotes/git-svn)
-No changes between e10bfe95129b43683107811a587cead38cc6309a and refs/remotes/git-svn
+r9 = 3cda43d2a8be719edea033e567bf1876d390d128 (refs/remotes/git-svn)
+No changes between 624d9fef4469e16e331c8496f26984b4b73a13b5 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 U    file
@@ -547017,32 +546593,32 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work3.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = b258021b3325afc6d3f4b76558556ad32c972211 (refs/remotes/git-svn)
+r1 = 8073ac72277cf8dd0d30dad036bfb702222e494e (refs/remotes/git-svn)
 	M	file
-r2 = cf3f3a02c040a15ba8c97dbbb844958692c94ada (refs/remotes/git-svn)
+r2 = 8e65519f3119b12946f8993e8c565a7d60c9384f (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = d12d4b3f641147e4ca31bbb771eb4cea7b4f5687 (refs/remotes/git-svn)
+r3 = 92e4323d829051dff2f40b1d8499fac877ba9792 (refs/remotes/git-svn)
 	M	file
-r4 = 5011f21f76cebb903ac3da6c233d75183d24135b (refs/remotes/git-svn)
+r4 = 0a048a1a8014fd94dd2a4a3d95bcc2cc2c9db57a (refs/remotes/git-svn)
 	M	file
-r5 = b89196c227c07b5b63f54f53cb1ad55f55e6d23f (refs/remotes/git-svn)
+r5 = 990655bccf68f2ba5b01595b1aa0cc0d36573807 (refs/remotes/git-svn)
 	M	file
-r6 = 65a96553bac603513fa2e6a7187e718e7251c5ef (refs/remotes/git-svn)
+r6 = 6e50862de06b0d51cd69b876fff2bbf395e3cb15 (refs/remotes/git-svn)
 	M	file
-r7 = 21d78af46d89eca87d6f190c281f0e1dcdd1aeb1 (refs/remotes/git-svn)
+r7 = 6f87e2233da968a4b140dd5bb8538ab7fb761c48 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = f099da20257bcf3cc7e28779af1257d119b330e4 (refs/remotes/git-svn)
+r8 = 7f84b85108153a1a2e158e85e6c25890f75f9643 (refs/remotes/git-svn)
 	M	file
-r9 = 7185b8f3d825504caa7c3789ff7e5769eabb1630 (refs/remotes/git-svn)
+r9 = 3cda43d2a8be719edea033e567bf1876d390d128 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r9
-[master 5bb23f4] commit change 3.1
+[master c4be6e3] commit change 3.1
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
-[master ef1679e] commit change 3.2
+[master 765efb5] commit change 3.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
-[master 9b8de19] commit change 3.3
+[master 03a681b] commit change 3.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -547050,25 +546626,25 @@
 	M	auto_updated_file
 Committed r10
 	M	auto_updated_file
-r10 = bec55201d22e12cbe0f60e59ae6abf0bd592d9d8 (refs/remotes/git-svn)
+r10 = b895342a821dda5d84e7ef42ce59eee1042f38ce (refs/remotes/git-svn)
 	M	auto_updated_file
 Committed r11
 	M	auto_updated_file
-r11 = 6eebbb42d84ca10098e04b329cfd940ab7b02af7 (refs/remotes/git-svn)
+r11 = 82f7ce14e08d34651aa7193cc2fee5ed05b3aae0 (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = 91f0bd8ee3c2af3e0cc9444535d48d286be8e2d4 (refs/remotes/git-svn)
-W: ef1679eeddee5af6ace809de857b6df47c4c7004 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 575332f37f26d67e7bf763648a6d65dffb414849 0dc1d63871d52a76a86068c5a9d791bc12f7325d M	auto_updated_file
-warning: skipped previously applied commit 5bb23f4
-warning: skipped previously applied commit ef1679e
+r12 = c350d594c083f04bcdb07f3f459275cae82e7d85 (refs/remotes/git-svn)
+W: 765efb55409377f31438d4ae43d2901a3ef81087 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 b0fd2b71baa7928b05188cfab264516db598af37 96dd835addc233198212559de59c7086c42b78ba M	auto_updated_file
+warning: skipped previously applied commit c4be6e3
+warning: skipped previously applied commit 765efb5
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config advice.skippedCherryPicks false"
 Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
 	M	auto_updated_file
 Committed r13
 	M	auto_updated_file
-r13 = 2d437d2695a6d27b0495f8a6e545ed8a627f8e4a (refs/remotes/git-svn)
-No changes between 46ade9ea2fd0abd5c7b35531a2610f0c153eb7d0 and refs/remotes/git-svn
+r13 = c799ddc07a276256b0526cb416e13fa37b30a388 (refs/remotes/git-svn)
+No changes between 91175206f63465f7f5fe4ccbe448737fd2a91e9c and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 U    auto_updated_file
@@ -547098,40 +546674,40 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work4.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = b258021b3325afc6d3f4b76558556ad32c972211 (refs/remotes/git-svn)
+r1 = 8073ac72277cf8dd0d30dad036bfb702222e494e (refs/remotes/git-svn)
 	M	file
-r2 = cf3f3a02c040a15ba8c97dbbb844958692c94ada (refs/remotes/git-svn)
+r2 = 8e65519f3119b12946f8993e8c565a7d60c9384f (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = d12d4b3f641147e4ca31bbb771eb4cea7b4f5687 (refs/remotes/git-svn)
+r3 = 92e4323d829051dff2f40b1d8499fac877ba9792 (refs/remotes/git-svn)
 	M	file
-r4 = 5011f21f76cebb903ac3da6c233d75183d24135b (refs/remotes/git-svn)
+r4 = 0a048a1a8014fd94dd2a4a3d95bcc2cc2c9db57a (refs/remotes/git-svn)
 	M	file
-r5 = b89196c227c07b5b63f54f53cb1ad55f55e6d23f (refs/remotes/git-svn)
+r5 = 990655bccf68f2ba5b01595b1aa0cc0d36573807 (refs/remotes/git-svn)
 	M	file
-r6 = 65a96553bac603513fa2e6a7187e718e7251c5ef (refs/remotes/git-svn)
+r6 = 6e50862de06b0d51cd69b876fff2bbf395e3cb15 (refs/remotes/git-svn)
 	M	file
-r7 = 21d78af46d89eca87d6f190c281f0e1dcdd1aeb1 (refs/remotes/git-svn)
+r7 = 6f87e2233da968a4b140dd5bb8538ab7fb761c48 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = f099da20257bcf3cc7e28779af1257d119b330e4 (refs/remotes/git-svn)
+r8 = 7f84b85108153a1a2e158e85e6c25890f75f9643 (refs/remotes/git-svn)
 	M	file
-r9 = 7185b8f3d825504caa7c3789ff7e5769eabb1630 (refs/remotes/git-svn)
+r9 = 3cda43d2a8be719edea033e567bf1876d390d128 (refs/remotes/git-svn)
 	M	auto_updated_file
-r10 = bec55201d22e12cbe0f60e59ae6abf0bd592d9d8 (refs/remotes/git-svn)
+r10 = b895342a821dda5d84e7ef42ce59eee1042f38ce (refs/remotes/git-svn)
 	M	auto_updated_file
-r11 = 6eebbb42d84ca10098e04b329cfd940ab7b02af7 (refs/remotes/git-svn)
+r11 = 82f7ce14e08d34651aa7193cc2fee5ed05b3aae0 (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = 91f0bd8ee3c2af3e0cc9444535d48d286be8e2d4 (refs/remotes/git-svn)
+r12 = c350d594c083f04bcdb07f3f459275cae82e7d85 (refs/remotes/git-svn)
 	M	auto_updated_file
-r13 = 2d437d2695a6d27b0495f8a6e545ed8a627f8e4a (refs/remotes/git-svn)
+r13 = c799ddc07a276256b0526cb416e13fa37b30a388 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r13
-[master e6c77fa] commit change 4.1
+[master 8ddec87] commit change 4.1
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
-[master 4a47ddf] commit change 4.2
+[master 5e3ff39] commit change 4.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
-[master 610479e] commit change 4.3
+[master cc9fce3] commit change 4.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -547141,13 +546717,13 @@
 	M	auto_updated_file
 Committed r14
 	M	auto_updated_file
-r14 = 208e25b7f50c5a96da0ad51f486751e5dcfb780a (refs/remotes/git-svn)
+r14 = e2208336f51638061836602795915bd39d16052f (refs/remotes/git-svn)
 	M	auto_updated_file
 Committed r15
 	M	auto_updated_file
-r15 = 0cde24584a79aa1907b7f6b3128cd4245d2c4de6 (refs/remotes/git-svn)
+r15 = cb8fa1d08513eb91f11143dc0c3a8d38bf08f890 (refs/remotes/git-svn)
 	M	auto_updated_file
-r16 = d6648883244309f9a623331028176ee97f17b884 (refs/remotes/git-svn)
+r16 = 016e71fb1351eb1046f5f73f084eb6dd0b9b2bf1 (refs/remotes/git-svn)
 
 ERROR from SVN:
 Transaction is out of date: File '/auto_updated_file' is out of date
@@ -547174,46 +546750,46 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work5.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = b258021b3325afc6d3f4b76558556ad32c972211 (refs/remotes/git-svn)
+r1 = 8073ac72277cf8dd0d30dad036bfb702222e494e (refs/remotes/git-svn)
 	M	file
-r2 = cf3f3a02c040a15ba8c97dbbb844958692c94ada (refs/remotes/git-svn)
+r2 = 8e65519f3119b12946f8993e8c565a7d60c9384f (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = d12d4b3f641147e4ca31bbb771eb4cea7b4f5687 (refs/remotes/git-svn)
+r3 = 92e4323d829051dff2f40b1d8499fac877ba9792 (refs/remotes/git-svn)
 	M	file
-r4 = 5011f21f76cebb903ac3da6c233d75183d24135b (refs/remotes/git-svn)
+r4 = 0a048a1a8014fd94dd2a4a3d95bcc2cc2c9db57a (refs/remotes/git-svn)
 	M	file
-r5 = b89196c227c07b5b63f54f53cb1ad55f55e6d23f (refs/remotes/git-svn)
+r5 = 990655bccf68f2ba5b01595b1aa0cc0d36573807 (refs/remotes/git-svn)
 	M	file
-r6 = 65a96553bac603513fa2e6a7187e718e7251c5ef (refs/remotes/git-svn)
+r6 = 6e50862de06b0d51cd69b876fff2bbf395e3cb15 (refs/remotes/git-svn)
 	M	file
-r7 = 21d78af46d89eca87d6f190c281f0e1dcdd1aeb1 (refs/remotes/git-svn)
+r7 = 6f87e2233da968a4b140dd5bb8538ab7fb761c48 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = f099da20257bcf3cc7e28779af1257d119b330e4 (refs/remotes/git-svn)
+r8 = 7f84b85108153a1a2e158e85e6c25890f75f9643 (refs/remotes/git-svn)
 	M	file
-r9 = 7185b8f3d825504caa7c3789ff7e5769eabb1630 (refs/remotes/git-svn)
+r9 = 3cda43d2a8be719edea033e567bf1876d390d128 (refs/remotes/git-svn)
 	M	auto_updated_file
-r10 = bec55201d22e12cbe0f60e59ae6abf0bd592d9d8 (refs/remotes/git-svn)
+r10 = b895342a821dda5d84e7ef42ce59eee1042f38ce (refs/remotes/git-svn)
 	M	auto_updated_file
-r11 = 6eebbb42d84ca10098e04b329cfd940ab7b02af7 (refs/remotes/git-svn)
+r11 = 82f7ce14e08d34651aa7193cc2fee5ed05b3aae0 (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = 91f0bd8ee3c2af3e0cc9444535d48d286be8e2d4 (refs/remotes/git-svn)
+r12 = c350d594c083f04bcdb07f3f459275cae82e7d85 (refs/remotes/git-svn)
 	M	auto_updated_file
-r13 = 2d437d2695a6d27b0495f8a6e545ed8a627f8e4a (refs/remotes/git-svn)
+r13 = c799ddc07a276256b0526cb416e13fa37b30a388 (refs/remotes/git-svn)
 	M	auto_updated_file
-r14 = 208e25b7f50c5a96da0ad51f486751e5dcfb780a (refs/remotes/git-svn)
+r14 = e2208336f51638061836602795915bd39d16052f (refs/remotes/git-svn)
 	M	auto_updated_file
-r15 = 0cde24584a79aa1907b7f6b3128cd4245d2c4de6 (refs/remotes/git-svn)
+r15 = cb8fa1d08513eb91f11143dc0c3a8d38bf08f890 (refs/remotes/git-svn)
 	M	auto_updated_file
-r16 = d6648883244309f9a623331028176ee97f17b884 (refs/remotes/git-svn)
+r16 = 016e71fb1351eb1046f5f73f084eb6dd0b9b2bf1 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r16
-[master 453e7c5] commit change 5.1
+[master a2fc370] commit change 5.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master c0b5df0] commit change 5.2
+[master 51acfbc] commit change 5.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 82c40f3] commit change 5.3
+[master 6376186] commit change 5.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -547221,23 +546797,23 @@
 	M	file
 Committed r17
 	M	file
-r17 = 2f7e703cad10b4cb3b78ca7fd6615512503029f4 (refs/remotes/git-svn)
+r17 = d55d069d7b3c12e7e91388a0febed71b10a7d092 (refs/remotes/git-svn)
 	M	auto_updated_file
-r18 = ce5cc28f8afe562e4468a05e98e7c20851a98136 (refs/remotes/git-svn)
-W: 453e7c5fcd4c572327498f0b4a7b9d971bce01a9 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 f8edc257a258db6511cf3b5e7ab0fee5d7e75488 0b66fb10770563d29d24e05cf7f5b680e622a638 M	auto_updated_file
-warning: skipped previously applied commit 453e7c5
+r18 = b2d5c96430cf6ad961bdb04fd0058fe95beecdee (refs/remotes/git-svn)
+W: a2fc370f4d5ca72363fc7fe22d761051d1c309d1 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 193710386f0b826e9e77014d5c28493d515c07ff 012bc9ab68a8a22caee1aa04254071c63203964a M	auto_updated_file
+warning: skipped previously applied commit a2fc370
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config advice.skippedCherryPicks false"
 Rebasing (1/2)
Auto-merging auto_updated_file
 CONFLICT (content): Merge conflict in auto_updated_file
-error: could not apply c0b5df0... commit change 5.2
+error: could not apply 51acfbc... 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 advice.mergeConflict false"
-Could not apply c0b5df0... commit change 5.2
+Could not apply 51acfbc... commit change 5.2
 rebase refs/remotes/git-svn: command returned error: 1
 
 auto_updated_file: needs merge
@@ -547247,195 +546823,452 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9604-cvsimport-timestamps.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9604-cvsimport-timestamps/.git/
-checking prerequisite: POSIX_TIMEZONE
+*** t9502-gitweb-standalone-parse-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9502-gitweb-standalone-parse-output/.git/
+expecting success of 9502.1 'setup': 
+	test_commit first foo &&
+	git branch xx/test &&
+	FULL_ID=$(git rev-parse --verify HEAD) &&
+	SHORT_ID=$(git rev-parse --verify --short=7 HEAD)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-POSIX_TIMEZONE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-POSIX_TIMEZONE" &&
-	local tz=XST-1XDT,M3.5.0,M11.1.0
-	echo "1711846799 -> 2024-03-31 01:59:59 +0100" >expected &&
-	TZ="$tz" test-tool date show:iso-local 1711846799 >actual &&
-	test_cmp expected actual &&
-	echo "1711846800 -> 2024-03-31 03:00:00 +0200" >expected &&
-	TZ="$tz" test-tool date show:iso-local 1711846800 >actual &&
-	test_cmp expected actual &&
-	echo "1730591999 -> 2024-11-03 01:59:59 +0200" >expected &&
-	TZ="$tz" test-tool date show:iso-local 1730591999 >actual &&
-	test_cmp expected actual &&
-	echo "1730592000 -> 2024-11-03 01:00:00 +0100" >expected &&
-	TZ="$tz" test-tool date show:iso-local 1730592000 >actual &&
-	test_cmp expected actual
+[main (root-commit) 1005c80] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+ok 1 - setup
 
-)
-prerequisite POSIX_TIMEZONE ok
-expecting success of 9604.1 'check timestamps are UTC': 
+expecting success of 9502.2 'snapshot: full sha1': 
+	gitweb_run "p=.git;a=snapshot;h=$FULL_ID;sf=tar" &&
+	check_snapshot ".git-$SHORT_ID"
 
-	TZ=CST6CDT,M4.1.0,M10.5.0 \
-	git cvsimport -p"-x" -C module-1 module &&
-	git cvsimport -p"-x" -C module-1 module &&
+basename=.git-1005c80
+ok 2 - snapshot: full sha1
+
+expecting success of 9502.3 'snapshot: shortened sha1': 
+	gitweb_run "p=.git;a=snapshot;h=$SHORT_ID;sf=tar" &&
+	check_snapshot ".git-$SHORT_ID"
+
+basename=.git-1005c80
+ok 3 - snapshot: shortened sha1
+
+expecting success of 9502.4 'snapshot: almost full sha1': 
+	ID=$(git rev-parse --short=30 HEAD) &&
+	gitweb_run "p=.git;a=snapshot;h=$ID;sf=tar" &&
+	check_snapshot ".git-$SHORT_ID"
+
+basename=.git-1005c80
+ok 4 - snapshot: almost full sha1
+
+expecting success of 9502.5 'snapshot: HEAD': 
+	gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tar" &&
+	check_snapshot ".git-HEAD-$SHORT_ID"
+
+basename=.git-HEAD-1005c80
+ok 5 - snapshot: HEAD
+
+expecting success of 9502.6 'snapshot: short branch name (main)': 
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tar" &&
+	ID=$(git rev-parse --verify --short=7 main) &&
+	check_snapshot ".git-main-$ID"
+
+basename=.git-main-1005c80
+ok 6 - snapshot: short branch name (main)
+
+expecting success of 9502.7 'snapshot: short tag name (first)': 
+	gitweb_run "p=.git;a=snapshot;h=first;sf=tar" &&
+	ID=$(git rev-parse --verify --short=7 first) &&
+	check_snapshot ".git-first-$ID"
+
+basename=.git-first-1005c80
+ok 7 - snapshot: short tag name (first)
+
+expecting success of 9502.8 'snapshot: full branch name (refs/heads/main)': 
+	gitweb_run "p=.git;a=snapshot;h=refs/heads/main;sf=tar" &&
+	ID=$(git rev-parse --verify --short=7 main) &&
+	check_snapshot ".git-main-$ID"
+
+basename=.git-main-1005c80
+ok 8 - snapshot: full branch name (refs/heads/main)
+
+expecting success of 9502.9 'snapshot: full tag name (refs/tags/first)': 
+	gitweb_run "p=.git;a=snapshot;h=refs/tags/first;sf=tar" &&
+	check_snapshot ".git-first"
+
+basename=.git-first
+ok 9 - snapshot: full tag name (refs/tags/first)
+
+expecting success of 9502.10 'snapshot: hierarchical branch name (xx/test)': 
+	gitweb_run "p=.git;a=snapshot;h=xx/test;sf=tar" &&
+	! grep "filename=.*/" gitweb.headers
+
+ok 10 - snapshot: hierarchical branch name (xx/test)
+
+expecting success of 9502.11 'forks: setup': 
+	git init --bare foo.git &&
+	echo file > file &&
+	git --git-dir=foo.git --work-tree=. add file &&
+	git --git-dir=foo.git --work-tree=. commit -m "Initial commit" &&
+	echo "foo" > foo.git/description &&
+	git clone --bare foo.git foo.bar.git &&
+	echo "foo.bar" > foo.bar.git/description &&
+	git clone --bare foo.git foo_baz.git &&
+	echo "foo_baz" > foo_baz.git/description &&
+	rm -fr   foo &&
+	mkdir -p foo &&
 	(
-		cd module-1 &&
-		git log --format="%s %ai"
-	) >actual-1 &&
-	cat >expect-1 <<-EOF &&
-	Rev 16 2006-10-29 07:00:01 +0000
-	Rev 15 2006-10-29 06:59:59 +0000
-	Rev 14 2006-04-02 08:00:01 +0000
-	Rev 13 2006-04-02 07:59:59 +0000
-	Rev 12 2005-12-01 00:00:00 +0000
-	Rev 11 2005-11-01 00:00:00 +0000
-	Rev 10 2005-10-01 00:00:00 +0000
-	Rev  9 2005-09-01 00:00:00 +0000
-	Rev  8 2005-08-01 00:00:00 +0000
-	Rev  7 2005-07-01 00:00:00 +0000
-	Rev  6 2005-06-01 00:00:00 +0000
-	Rev  5 2005-05-01 00:00:00 +0000
-	Rev  4 2005-04-01 00:00:00 +0000
-	Rev  3 2005-03-01 00:00:00 +0000
-	Rev  2 2005-02-01 00:00:00 +0000
-	Rev  1 2005-01-01 00:00:00 +0000
-	EOF
-	test_cmp expect-1 actual-1
+		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.47.2/t/trash directory.t9604-cvsimport-timestamps/module-1/.git/
-Already up to date.
-ok 1 - check timestamps are UTC
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9502-gitweb-standalone-parse-output/foo.git/
+[main (root-commit) d29c088] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into bare repository 'foo.bar.git'...
+done.
+Cloning into bare repository 'foo_baz.git'...
+done.
+Cloning into bare repository 'foo-forked.git'...
+done.
+ok 11 - forks: setup
 
-expecting success of 9604.2 'check timestamps with author-specific timezones': 
+expecting success of 9502.12 'forks: not skipped unless "forks" feature enabled': 
+	gitweb_run "a=project_list" &&
+	grep -q ">\\.git<"               gitweb.body &&
+	grep -q ">foo\\.git<"            gitweb.body &&
+	grep -q ">foo_baz\\.git<"        gitweb.body &&
+	grep -q ">foo\\.bar\\.git<"      gitweb.body &&
+	grep -q ">foo_baz\\.git<"        gitweb.body &&
+	grep -q ">foo/foo-forked\\.git<" gitweb.body &&
+	grep -q ">fork of .*<"           gitweb.body
 
-	cat >cvs-authors <<-EOF &&
-	user1=User One <user1@domain.org>
-	user2=User Two <user2@domain.org> CST6CDT,M4.1.0,M10.5.0
-	user3=User Three <user3@domain.org> EST5EDT,M4.1.0,M10.5.0
-	user4=User Four <user4@domain.org> MST7MDT,M4.1.0,M10.5.0
+ok 12 - forks: not skipped unless "forks" feature enabled
+
+expecting success of 9502.13 'enable forks feature': 
+	cat >>gitweb_config.perl <<-\EOF
+	$feature{"forks"}{"default"} = [1];
 	EOF
-	git cvsimport -p"-x" -A cvs-authors -C module-2 module &&
-	(
-		cd module-2 &&
-		git log --format="%s %ai %an"
-	) >actual-2 &&
-	cat >expect-2 <<-EOF &&
-	Rev 16 2006-10-29 01:00:01 -0600 User Two
-	Rev 15 2006-10-29 01:59:59 -0500 User Two
-	Rev 14 2006-04-02 03:00:01 -0500 User Two
-	Rev 13 2006-04-02 01:59:59 -0600 User Two
-	Rev 12 2005-11-30 17:00:00 -0700 User Four
-	Rev 11 2005-10-31 19:00:00 -0500 User Three
-	Rev 10 2005-09-30 19:00:00 -0500 User Two
-	Rev  9 2005-09-01 00:00:00 +0000 User One
-	Rev  8 2005-07-31 18:00:00 -0600 User Four
-	Rev  7 2005-06-30 20:00:00 -0400 User Three
-	Rev  6 2005-05-31 19:00:00 -0500 User Two
-	Rev  5 2005-05-01 00:00:00 +0000 User One
-	Rev  4 2005-03-31 17:00:00 -0700 User Four
-	Rev  3 2005-02-28 19:00:00 -0500 User Three
-	Rev  2 2005-01-31 18:00:00 -0600 User Two
-	Rev  1 2005-01-01 00:00:00 +0000 User One
+
+ok 13 - enable forks feature
+
+expecting success of 9502.14 'forks: forks skipped if "forks" feature enabled': 
+	gitweb_run "a=project_list" &&
+	grep -q ">\\.git<"               gitweb.body &&
+	grep -q ">foo\\.git<"            gitweb.body &&
+	grep -q ">foo_baz\\.git<"        gitweb.body &&
+	grep -q ">foo\\.bar\\.git<"      gitweb.body &&
+	grep -q ">foo_baz\\.git<"        gitweb.body &&
+	grep -v ">foo/foo-forked\\.git<" gitweb.body &&
+	grep -v ">fork of .*<"           gitweb.body
+
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+]>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
+<!-- git web interface version current, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->
+<!-- git core binaries version 2.47.2 -->
+<head>
+<meta name="generator" content="gitweb/current git/2.47.2"/>
+<meta name="robots" content="index, nofollow"/>
+<title>[localhost]</title>
+<link rel="stylesheet" type="text/css" href="file:////build/reproducible-path/git-2.47.2/gitweb/static/gitweb.css"/>
+<link rel="alternate" title="[localhost] projects list" href="/gitweb.cgi?a=project_index" type="text/plain; charset=utf-8" />
+<link rel="alternate" title="[localhost] projects feeds" href="/gitweb.cgi?a=opml" type="text/x-opml" />
+<link rel="shortcut icon" href="file:////build/reproducible-path/git-2.47.2/gitweb/static/git-favicon.png" type="image/png" />
+</head>
+<body>
+<div class="page_header">
+<a href="https://git-scm.com/" title="git homepage"><img alt="git" class="logo" height="27" src="file:////build/reproducible-path/git-2.47.2/gitweb/static/git-logo.png" width="72" /></a><a href="/gitweb.cgi">projects</a> / </div>
+<div class="projsearch">
+<form method="get" action="/gitweb.cgi" enctype="multipart/form-data"><input type="hidden" name="a" value="project_list"  />
+<input type="text" name="s"  size="60" title="Search project by name and description" />
+<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span>
+<input type="submit" name="btnS" value="Search" />
+</form>
+<a href="/gitweb.cgi">List all projects</a><br />
+</div>
+<table class="project_list">
+<tr>
+<th></th>
+<th>Project</th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=descr">Description</a></th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=owner">Owner</a></th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=age">Last Change</a></th>
+<th></th>
+</tr>
+<tr class="dark">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=.git;a=log">log</a> | <a href="/gitweb.cgi?p=.git;a=tree">tree</a></td>
+</tr>
+<tr class="light">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary">foo.bar.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary" title="foo.bar">foo.bar</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo.bar.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=tree">tree</a></td>
+</tr>
+<tr class="dark">
+<td><a href="/gitweb.cgi?p=foo.git;a=forks" title="1 forks">+</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary">foo.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary" title="foo">foo</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.git;a=tree">tree</a> | <a href="/gitweb.cgi?p=foo.git;a=forks">forks</a></td>
+</tr>
+<tr class="light">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary">foo_baz.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary" title="foo_baz">foo_baz</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo_baz.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=tree">tree</a></td>
+</tr>
+</table>
+<div class="page_footer">
+<a class="rss_logo" href="/gitweb.cgi?a=opml">OPML</a> <a class="rss_logo" href="/gitweb.cgi?a=project_index">TXT</a>
+</div>
+<script type="text/javascript" src="%2B%2BGITWEB_JS%2B%2B"></script>
+<script type="text/javascript">
+window.onload = function () {
+	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
+	onloadTZSetup('local', tz_cookie, 'datetime');
+};
+</script>
+</body>
+</html>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+]>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
+<!-- git web interface version current, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->
+<!-- git core binaries version 2.47.2 -->
+<head>
+<meta name="generator" content="gitweb/current git/2.47.2"/>
+<meta name="robots" content="index, nofollow"/>
+<title>[localhost]</title>
+<link rel="stylesheet" type="text/css" href="file:////build/reproducible-path/git-2.47.2/gitweb/static/gitweb.css"/>
+<link rel="alternate" title="[localhost] projects list" href="/gitweb.cgi?a=project_index" type="text/plain; charset=utf-8" />
+<link rel="alternate" title="[localhost] projects feeds" href="/gitweb.cgi?a=opml" type="text/x-opml" />
+<link rel="shortcut icon" href="file:////build/reproducible-path/git-2.47.2/gitweb/static/git-favicon.png" type="image/png" />
+</head>
+<body>
+<div class="page_header">
+<a href="https://git-scm.com/" title="git homepage"><img alt="git" class="logo" height="27" src="file:////build/reproducible-path/git-2.47.2/gitweb/static/git-logo.png" width="72" /></a><a href="/gitweb.cgi">projects</a> / </div>
+<div class="projsearch">
+<form method="get" action="/gitweb.cgi" enctype="multipart/form-data"><input type="hidden" name="a" value="project_list"  />
+<input type="text" name="s"  size="60" title="Search project by name and description" />
+<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span>
+<input type="submit" name="btnS" value="Search" />
+</form>
+<a href="/gitweb.cgi">List all projects</a><br />
+</div>
+<table class="project_list">
+<tr>
+<th></th>
+<th>Project</th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=descr">Description</a></th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=owner">Owner</a></th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=age">Last Change</a></th>
+<th></th>
+</tr>
+<tr class="dark">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=.git;a=log">log</a> | <a href="/gitweb.cgi?p=.git;a=tree">tree</a></td>
+</tr>
+<tr class="light">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary">foo.bar.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary" title="foo.bar">foo.bar</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo.bar.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=tree">tree</a></td>
+</tr>
+<tr class="dark">
+<td><a href="/gitweb.cgi?p=foo.git;a=forks" title="1 forks">+</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary">foo.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary" title="foo">foo</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.git;a=tree">tree</a> | <a href="/gitweb.cgi?p=foo.git;a=forks">forks</a></td>
+</tr>
+<tr class="light">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary">foo_baz.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary" title="foo_baz">foo_baz</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo_baz.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=tree">tree</a></td>
+</tr>
+</table>
+<div class="page_footer">
+<a class="rss_logo" href="/gitweb.cgi?a=opml">OPML</a> <a class="rss_logo" href="/gitweb.cgi?a=project_index">TXT</a>
+</div>
+<script type="text/javascript" src="%2B%2BGITWEB_JS%2B%2B"></script>
+<script type="text/javascript">
+window.onload = function () {
+	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
+	onloadTZSetup('local', tz_cookie, 'datetime');
+};
+</script>
+</body>
+</html>
+ok 14 - forks: forks skipped if "forks" feature enabled
+
+expecting success of 9502.15 'forks: "forks" action for forked repository': 
+	gitweb_run "p=foo.git;a=forks" &&
+	grep -q ">foo/foo-forked\\.git<" gitweb.body &&
+	grep -q ">fork of foo<"          gitweb.body
+
+ok 15 - forks: "forks" action for forked repository
+
+expecting success of 9502.16 'forks: can access forked repository': 
+	gitweb_run "p=foo/foo-forked.git;a=summary" &&
+	grep -q "200 OK"        gitweb.headers &&
+	grep -q ">fork of foo<" gitweb.body
+
+ok 16 - forks: can access forked repository
+
+expecting success of 9502.17 'forks: project_index lists all projects (incl. forks)': 
+	cat >expected <<-\EOF &&
+	.git
+	foo.bar.git
+	foo.git
+	foo/foo-forked.git
+	foo_baz.git
 	EOF
-	test_cmp expect-2 actual-2
+	gitweb_run "a=project_index" &&
+	sed -e "s/ .*//" <gitweb.body | sort >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9604-cvsimport-timestamps/module-2/.git/
-ok 2 - check timestamps with author-specific timezones
+ok 17 - forks: project_index lists all projects (incl. forks)
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** 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.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9815-git-p4-submit-fail.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9816-git-p4-locked.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9817-git-p4-exclude.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9818-git-p4-block.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
+expecting success of 9502.18 'xss checks': 
+	TAG="<magic-xss-tag>" &&
+	xss "a=rss&p=$TAG" &&
+	xss "a=rss&p=foo.git&f=$TAG" &&
+	xss "" "$TAG+"
+
+Checking a=rss&p=<magic-xss-tag>...
+Checking a=rss&p=foo.git&f=<magic-xss-tag>...
+Checking  <magic-xss-tag>+...
+ok 18 - xss checks
+
+expecting success of 9502.19 'no http-equiv="content-type" in XHTML': 
+	no_http_equiv_content_type &&
+	no_http_equiv_content_type "p=.git" &&
+	no_http_equiv_content_type "p=.git;a=log" &&
+	no_http_equiv_content_type "p=.git;a=tree"
+
+ok 19 - no http-equiv="content-type" in XHTML
+
+expecting success of 9502.20 'Proper DOCTYPE with entity declarations': 
+	proper_doctype &&
+	proper_doctype "p=.git" &&
+	proper_doctype "p=.git;a=log" &&
+	proper_doctype "p=.git;a=tree"
+
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+ok 20 - Proper DOCTYPE with entity declarations
+
+# passed all 20 test(s)
+1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9819-git-p4-case-folding.sh ***
+*** t9804-git-p4-label.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9820-git-p4-editor-handling.sh ***
+*** t9805-git-p4-skip-submit-edit.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9821-git-p4-path-variations.sh ***
+*** t9806-git-p4-options.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9822-git-p4-path-encoding.sh ***
+*** t9807-git-p4-submit.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9824-git-p4-git-lfs.sh ***
+*** t9809-git-p4-client-view.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9823-git-p4-mock-lfs.sh ***
+*** t9808-git-p4-chdir.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9825-git-p4-handle-utf16-without-bom.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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9826-git-p4-keep-empty-commits.sh ***
+*** 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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9827-git-p4-change-filetype.sh ***
+*** 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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9828-git-p4-map-user.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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9829-git-p4-jobs.sh ***
+*** t9813-git-p4-preserve-users.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9830-git-p4-symlink-dir.sh ***
+*** t9815-git-p4-submit-fail.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9831-git-p4-triggers.sh ***
+*** t9816-git-p4-locked.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9832-unshelve.sh ***
+*** t9817-git-p4-exclude.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9833-errors.sh ***
+*** 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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9834-git-p4-file-dir-bug.sh ***
+*** t9818-git-p4-block.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9835-git-p4-metadata-encoding-python2.sh ***
+*** 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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9836-git-p4-metadata-encoding-python3.sh ***
+*** 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.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
@@ -548060,6 +547893,162 @@
 1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9822-git-p4-path-encoding.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9604-cvsimport-timestamps.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9604-cvsimport-timestamps/.git/
+checking prerequisite: POSIX_TIMEZONE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-POSIX_TIMEZONE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-POSIX_TIMEZONE" &&
+	local tz=XST-1XDT,M3.5.0,M11.1.0
+	echo "1711846799 -> 2024-03-31 01:59:59 +0100" >expected &&
+	TZ="$tz" test-tool date show:iso-local 1711846799 >actual &&
+	test_cmp expected actual &&
+	echo "1711846800 -> 2024-03-31 03:00:00 +0200" >expected &&
+	TZ="$tz" test-tool date show:iso-local 1711846800 >actual &&
+	test_cmp expected actual &&
+	echo "1730591999 -> 2024-11-03 01:59:59 +0200" >expected &&
+	TZ="$tz" test-tool date show:iso-local 1730591999 >actual &&
+	test_cmp expected actual &&
+	echo "1730592000 -> 2024-11-03 01:00:00 +0100" >expected &&
+	TZ="$tz" test-tool date show:iso-local 1730592000 >actual &&
+	test_cmp expected actual
+
+)
+prerequisite POSIX_TIMEZONE ok
+expecting success of 9604.1 'check timestamps are UTC': 
+
+	TZ=CST6CDT,M4.1.0,M10.5.0 \
+	git cvsimport -p"-x" -C module-1 module &&
+	git cvsimport -p"-x" -C module-1 module &&
+	(
+		cd module-1 &&
+		git log --format="%s %ai"
+	) >actual-1 &&
+	cat >expect-1 <<-EOF &&
+	Rev 16 2006-10-29 07:00:01 +0000
+	Rev 15 2006-10-29 06:59:59 +0000
+	Rev 14 2006-04-02 08:00:01 +0000
+	Rev 13 2006-04-02 07:59:59 +0000
+	Rev 12 2005-12-01 00:00:00 +0000
+	Rev 11 2005-11-01 00:00:00 +0000
+	Rev 10 2005-10-01 00:00:00 +0000
+	Rev  9 2005-09-01 00:00:00 +0000
+	Rev  8 2005-08-01 00:00:00 +0000
+	Rev  7 2005-07-01 00:00:00 +0000
+	Rev  6 2005-06-01 00:00:00 +0000
+	Rev  5 2005-05-01 00:00:00 +0000
+	Rev  4 2005-04-01 00:00:00 +0000
+	Rev  3 2005-03-01 00:00:00 +0000
+	Rev  2 2005-02-01 00:00:00 +0000
+	Rev  1 2005-01-01 00:00:00 +0000
+	EOF
+	test_cmp expect-1 actual-1
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9604-cvsimport-timestamps/module-1/.git/
+Already up to date.
+ok 1 - check timestamps are UTC
+
+expecting success of 9604.2 'check timestamps with author-specific timezones': 
+
+	cat >cvs-authors <<-EOF &&
+	user1=User One <user1@domain.org>
+	user2=User Two <user2@domain.org> CST6CDT,M4.1.0,M10.5.0
+	user3=User Three <user3@domain.org> EST5EDT,M4.1.0,M10.5.0
+	user4=User Four <user4@domain.org> MST7MDT,M4.1.0,M10.5.0
+	EOF
+	git cvsimport -p"-x" -A cvs-authors -C module-2 module &&
+	(
+		cd module-2 &&
+		git log --format="%s %ai %an"
+	) >actual-2 &&
+	cat >expect-2 <<-EOF &&
+	Rev 16 2006-10-29 01:00:01 -0600 User Two
+	Rev 15 2006-10-29 01:59:59 -0500 User Two
+	Rev 14 2006-04-02 03:00:01 -0500 User Two
+	Rev 13 2006-04-02 01:59:59 -0600 User Two
+	Rev 12 2005-11-30 17:00:00 -0700 User Four
+	Rev 11 2005-10-31 19:00:00 -0500 User Three
+	Rev 10 2005-09-30 19:00:00 -0500 User Two
+	Rev  9 2005-09-01 00:00:00 +0000 User One
+	Rev  8 2005-07-31 18:00:00 -0600 User Four
+	Rev  7 2005-06-30 20:00:00 -0400 User Three
+	Rev  6 2005-05-31 19:00:00 -0500 User Two
+	Rev  5 2005-05-01 00:00:00 +0000 User One
+	Rev  4 2005-03-31 17:00:00 -0700 User Four
+	Rev  3 2005-02-28 19:00:00 -0500 User Three
+	Rev  2 2005-01-31 18:00:00 -0600 User Two
+	Rev  1 2005-01-01 00:00:00 +0000 User One
+	EOF
+	test_cmp expect-2 actual-2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9604-cvsimport-timestamps/module-2/.git/
+ok 2 - check timestamps with author-specific timezones
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9827-git-p4-change-filetype.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9828-git-p4-map-user.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** 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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9830-git-p4-symlink-dir.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9832-unshelve.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9833-errors.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9834-git-p4-file-dir-bug.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9836-git-p4-metadata-encoding-python3.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/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.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9850-shell.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9850-shell/.git/
 expecting success of 9850.1 'shell allows upload-pack': 
@@ -548107,6 +548096,58 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
+*** t9901-git-web--browse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9901-git-web--browse/.git/
+expecting success of 9901.1 'URL with an ampersand in it': 
+	echo http://example.com/foo\&bar >expect &&
+	git config browser.custom.cmd echo &&
+	test_web_browse custom http://example.com/foo\&bar
+
+ok 1 - URL with an ampersand in it
+
+expecting success of 9901.2 'URL with a semi-colon in it': 
+	echo http://example.com/foo\;bar >expect &&
+	git config browser.custom.cmd echo &&
+	test_web_browse custom http://example.com/foo\;bar
+
+ok 2 - URL with a semi-colon in it
+
+expecting success of 9901.3 'URL with a hash in it': 
+	echo http://example.com/foo#bar >expect &&
+	git config browser.custom.cmd echo &&
+	test_web_browse custom http://example.com/foo#bar
+
+ok 3 - URL with a hash in it
+
+expecting success of 9901.4 'browser paths are properly quoted': 
+	echo fake: http://example.com/foo >expect &&
+	cat >"fake browser" <<-\EOF &&
+	#!/bin/sh
+	echo fake: "$@"
+	EOF
+	chmod +x "fake browser" &&
+	git config browser.w3m.path "$(pwd)/fake browser" &&
+	test_web_browse w3m http://example.com/foo
+
+ok 4 - browser paths are properly quoted
+
+expecting success of 9901.5 'browser command allows arbitrary shell code': 
+	echo "arg: http://example.com/foo" >expect &&
+	git config browser.custom.cmd "
+		f() {
+			for i in \"\$@\"; do
+				echo arg: \$i
+			done
+		}
+		f" &&
+	test_web_browse custom http://example.com/foo
+
+ok 5 - browser command allows arbitrary shell code
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9602-cvsimport-branches-tags.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9602-cvsimport-branches-tags/.git/
 expecting success of 9602.1 'import module': 
@@ -548226,7 +548267,7 @@
 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-03-04 08:05:27.047352315 +0000
++++ module-git/./sub3/default	2025-01-30 02:20:08.047117668 +0000
 @@ -3,3 +3,5 @@
  Every directory in the `proj' project has a file named `default'.
  
@@ -548361,7 +548402,7 @@
 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-03-04 08:05:32.031352315 +0000
++++ module-git/./sub2/subsubA/default	2025-01-30 02:20:13.051147681 +0000
 @@ -1,3 +1,5 @@
  This is sub2/subsub2/default.
  
@@ -548375,58 +548416,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
-*** t9901-git-web--browse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9901-git-web--browse/.git/
-expecting success of 9901.1 'URL with an ampersand in it': 
-	echo http://example.com/foo\&bar >expect &&
-	git config browser.custom.cmd echo &&
-	test_web_browse custom http://example.com/foo\&bar
-
-ok 1 - URL with an ampersand in it
-
-expecting success of 9901.2 'URL with a semi-colon in it': 
-	echo http://example.com/foo\;bar >expect &&
-	git config browser.custom.cmd echo &&
-	test_web_browse custom http://example.com/foo\;bar
-
-ok 2 - URL with a semi-colon in it
-
-expecting success of 9901.3 'URL with a hash in it': 
-	echo http://example.com/foo#bar >expect &&
-	git config browser.custom.cmd echo &&
-	test_web_browse custom http://example.com/foo#bar
-
-ok 3 - URL with a hash in it
-
-expecting success of 9901.4 'browser paths are properly quoted': 
-	echo fake: http://example.com/foo >expect &&
-	cat >"fake browser" <<-\EOF &&
-	#!/bin/sh
-	echo fake: "$@"
-	EOF
-	chmod +x "fake browser" &&
-	git config browser.w3m.path "$(pwd)/fake browser" &&
-	test_web_browse w3m http://example.com/foo
-
-ok 4 - browser paths are properly quoted
-
-expecting success of 9901.5 'browser command allows arbitrary shell code': 
-	echo "arg: http://example.com/foo" >expect &&
-	git config browser.custom.cmd "
-		f() {
-			for i in \"\$@\"; do
-				echo arg: \$i
-			done
-		}
-		f" &&
-	test_web_browse custom http://example.com/foo
-
-ok 5 - browser command allows arbitrary shell code
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.47.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 *** t9401-git-cvsserver-crlf.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9401-git-cvsserver-crlf/.git/
 expecting success of 9401.1 'setup': 
@@ -554559,8 +554548,8 @@
 	test_completion "git add ~/tmp/" "~/tmp/file"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.47.2/t/trash directory.t9902-completion/tmp/.git/
---- expected	2026-03-04 08:06:09.399352315 +0000
-+++ out_sorted	2026-03-04 08:06:09.475352315 +0000
+--- expected	2025-01-30 02:20:42.167322313 +0000
++++ out_sorted	2025-01-30 02:20:42.175322361 +0000
 @@ -1 +1 @@
 -~/tmp/file
 +
@@ -554604,8 +554593,8 @@
 		) &&
 		test_cmp expected out
 	
---- expected	2026-03-04 08:06:09.795352315 +0000
-+++ out	2026-03-04 08:06:09.839352315 +0000
+--- expected	2025-01-30 02:20:42.383323608 +0000
++++ out	2025-01-30 02:20:42.431323896 +0000
 @@ -1 +1 @@
 -main-in-other 
 +main 
@@ -554639,8 +554628,8 @@
 		) &&
 		test_cmp expected out
 	
---- expected	2026-03-04 08:06:09.983352315 +0000
-+++ out	2026-03-04 08:06:10.043352315 +0000
+--- expected	2025-01-30 02:20:42.619325024 +0000
++++ out	2025-01-30 02:20:42.663325288 +0000
 @@ -1 +1 @@
 -main-in-other 
 +main 
@@ -554985,10 +554974,10 @@
 /usr/bin/make aggregate-results
 make[5]: Entering directory '/build/reproducible-path/git-2.47.2/t'
 
-missing prereq: !LONG_IS_64BIT !PCRE !PTHREADS AUTOIDENT BUILTIN_TXT_CHECKOUT__WORKER BUILTIN_TXT_MERGE_OURS BUILTIN_TXT_MERGE_RECURSIVE BUILTIN_TXT_MERGE_RECURSIVE_OURS BUILTIN_TXT_MERGE_RECURSIVE_THEIRS BUILTIN_TXT_MERGE_SUBTREE BUILTIN_TXT_PICKAXE BUILTIN_TXT_SUBMODULE__HELPER BUILTIN_TXT_UPLOAD_ARCHIVE__WRITER CASE_INSENSITIVE_FS EXPENSIVE FSMONITOR_DAEMON GETTEXT_ISO_LOCALE GPG GPG2 GPGSM GPGSSH GPGSSH_VERIFYTIME HIGHLIGHT JGIT MINGW NATIVE_CRLF PERLJSON RFC1991 RUNTIME_PREFIX SETFACL SIGNED_CHAR_BY_DEFAULT SYMLINKS_WINDOWS TAR_NEEDS_PAX_FALLBACK USR_BIN_TIME UTF8_NFD_TO_NFC WINDOWS
+missing prereq: !AUTOIDENT !LONG_IS_64BIT !PCRE !PTHREADS BUILTIN_TXT_CHECKOUT__WORKER BUILTIN_TXT_MERGE_OURS BUILTIN_TXT_MERGE_RECURSIVE BUILTIN_TXT_MERGE_RECURSIVE_OURS BUILTIN_TXT_MERGE_RECURSIVE_THEIRS BUILTIN_TXT_MERGE_SUBTREE BUILTIN_TXT_PICKAXE BUILTIN_TXT_SUBMODULE__HELPER BUILTIN_TXT_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 30216
+success 30215
 failed  0
 broken  275
 total   31009
@@ -555049,9 +555038,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = 16776d706bbab324316727c661ff0af4416537a0 (refs/remotes/origin/trunk)
+r1 = 28c06e585992df153e0bbdcb5367eac419c0dcb0 (refs/remotes/origin/trunk)
 	M	foo
-r2 = 995f972475d0392338a48e43352e636ee1e6e976 (refs/remotes/origin/trunk)
+r2 = 25d98968b6cf95e8e3a9f304ae6ccf067b7e4e6c (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project r2
 Note: switching to 'remotes/origin/trunk'.
@@ -555071,7 +555060,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 995f972 updated trunk
+HEAD is now at 25d9896 updated trunk
 ok 2 - import into git
 
 expecting success of 9167.3 'git svn branch tests': 
@@ -555090,40 +555079,40 @@
 Creating parent folder file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a ...
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project, 2
-Found branch parent: (refs/remotes/origin/a) 995f972475d0392338a48e43352e636ee1e6e976
+Found branch parent: (refs/remotes/origin/a) 25d98968b6cf95e8e3a9f304ae6ccf067b7e4e6c
 Following parent with do_switch
 Successfully followed parent
-r4 = 0eb5fd23b37d816edace8d400404604e1cd3f685 (refs/remotes/origin/a)
+r4 = f07976f600c25cda0a0adad91d20e4df47f067ca (refs/remotes/origin/a)
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.47.2/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.47.2/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1 ...
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) 995f972475d0392338a48e43352e636ee1e6e976
+Found branch parent: (refs/remotes/origin/tags/tag1) 25d98968b6cf95e8e3a9f304ae6ccf067b7e4e6c
 Following parent with do_switch
 Successfully followed parent
-r6 = 15a6e11a3881ba1c1e37f378648040af4181ef39 (refs/remotes/origin/tags/tag1)
+r6 = b6e4d8f4727420f8b8051de7d3b48ec979bea9a2 (refs/remotes/origin/tags/tag1)
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.47.2/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.47.2/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2 ...
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) 995f972475d0392338a48e43352e636ee1e6e976
+Found branch parent: (refs/remotes/origin/tags/tag2) 25d98968b6cf95e8e3a9f304ae6ccf067b7e4e6c
 Following parent with do_switch
 Successfully followed parent
-r8 = b5f306461c06651e3af284271c310fa4c6997ece (refs/remotes/origin/tags/tag2)
+r8 = d70f6cf4cf66dd15617e10c4e764d1e282f6d15d (refs/remotes/origin/tags/tag2)
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.47.2/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.47.2/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3 ...
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) 995f972475d0392338a48e43352e636ee1e6e976
+Found branch parent: (refs/remotes/origin/tags/tag3) 25d98968b6cf95e8e3a9f304ae6ccf067b7e4e6c
 Following parent with do_switch
 Successfully followed parent
-r10 = df0e1ad7cf371de53145e7d1a4f27a055db340bd (refs/remotes/origin/tags/tag3)
+r10 = 41537d17746fa29301171e836fc2f8017fde107a (refs/remotes/origin/tags/tag3)
 ok 3 - git svn branch tests
 
 # passed all 3 test(s)
@@ -555165,9 +555154,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = ec96e03fcf638a2cb866a716bfb37b42b60bd7af (refs/remotes/origin/trunk)
+r1 = dd9418475e37830b9465c8a7c37eef96ee7c9758 (refs/remotes/origin/trunk)
 	M	foo
-r2 = cae050bbb53f5037af63ce9ec5515ce54a6f6680 (refs/remotes/origin/trunk)
+r2 = dccc28bef80fde72701f261077462cfef0d4f78f (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk r2
 Note: switching to 'remotes/origin/trunk'.
@@ -555187,7 +555176,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at cae050b updated trunk
+HEAD is now at dccc28b updated trunk
 ok 2 - import into git
 
 expecting success of 9128.3 'git svn branch tests': 
@@ -555215,16 +555204,16 @@
 
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a, 2
-Found branch parent: (refs/remotes/origin/a) cae050bbb53f5037af63ce9ec5515ce54a6f6680
+Found branch parent: (refs/remotes/origin/a) dccc28bef80fde72701f261077462cfef0d4f78f
 Following parent with do_switch
 Successfully followed parent
-r3 = b0a2e207c6e63ed161c2ba235879cc80c9421401 (refs/remotes/origin/a)
+r3 = 5080c8560ddb307107027ee382dde9f7678f4c17 (refs/remotes/origin/a)
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b, 2
-Found branch parent: (refs/remotes/origin/b) cae050bbb53f5037af63ce9ec5515ce54a6f6680
+Found branch parent: (refs/remotes/origin/b) dccc28bef80fde72701f261077462cfef0d4f78f
 Following parent with do_switch
 Successfully followed parent
-r4 = 4b1dec313ca434b2ce60d90dd9f1767720d065ff (refs/remotes/origin/b)
+r4 = 03d8d6c7e5b117f2cbf2fe00323af874cac594b6 (refs/remotes/origin/b)
 fatal: cannot rename the current branch while not on any
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.47.2/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.
@@ -555235,28 +555224,28 @@
 
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) cae050bbb53f5037af63ce9ec5515ce54a6f6680
+Found branch parent: (refs/remotes/origin/tags/tag1) dccc28bef80fde72701f261077462cfef0d4f78f
 Following parent with do_switch
 Successfully followed parent
-r5 = 702ec60fffa7f5eb414bf2a6911719860e6f8958 (refs/remotes/origin/tags/tag1)
+r5 = 775a09d23dca0d89ad363b569351fa237417cd37 (refs/remotes/origin/tags/tag1)
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) cae050bbb53f5037af63ce9ec5515ce54a6f6680
+Found branch parent: (refs/remotes/origin/tags/tag2) dccc28bef80fde72701f261077462cfef0d4f78f
 Following parent with do_switch
 Successfully followed parent
-r6 = 595288d413d501bb718e23495f4cb581b6c27685 (refs/remotes/origin/tags/tag2)
+r6 = 3c72dd04efe31e4cb6a0df1093badf38901dcb4d (refs/remotes/origin/tags/tag2)
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) cae050bbb53f5037af63ce9ec5515ce54a6f6680
+Found branch parent: (refs/remotes/origin/tags/tag3) dccc28bef80fde72701f261077462cfef0d4f78f
 Following parent with do_switch
 Successfully followed parent
-r7 = 573048af6669063c3efb8111ccb0fb9559e8587a (refs/remotes/origin/tags/tag3)
+r7 = 9c6101e9e2db82054eb2db85fdacfdbfe62139f6 (refs/remotes/origin/tags/tag3)
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4, 2
-Found branch parent: (refs/remotes/origin/tags/tag4) cae050bbb53f5037af63ce9ec5515ce54a6f6680
+Found branch parent: (refs/remotes/origin/tags/tag4) dccc28bef80fde72701f261077462cfef0d4f78f
 Following parent with do_switch
 Successfully followed parent
-r8 = 4214017090e3ea303a9b901bbaddfd9bd58e3827 (refs/remotes/origin/tags/tag4)
+r8 = 61ec3145bd57472ce02f405bd853113ca9247582 (refs/remotes/origin/tags/tag4)
 tag name required
 
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag5...
@@ -555314,55 +555303,55 @@
 Committing transaction...
 Committed revision 9.
 Using higher level of URL: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo
-branch_from: /tags => /tags/tag1
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
-Found branch parent: (refs/remotes/mirror/tags/tag1) 702ec60fffa7f5eb414bf2a6911719860e6f8958
-Following parent with do_switch
-Successfully followed parent
-r9 = e1a91171c87fb4d9164e65773e3b25a15cdce1a8 (refs/remotes/mirror/tags/tag1)
 branch_from: /branches => /branches/b
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
-Found branch parent: (refs/remotes/mirror/b) 4b1dec313ca434b2ce60d90dd9f1767720d065ff
+Found branch parent: (refs/remotes/mirror/b) 03d8d6c7e5b117f2cbf2fe00323af874cac594b6
 Following parent with do_switch
 Successfully followed parent
-r9 = 797f563839eacdaf842c9f90ada8550c4465ab2e (refs/remotes/mirror/b)
-branch_from: /tags => /tags/tag3
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
-Found branch parent: (refs/remotes/mirror/tags/tag3) 573048af6669063c3efb8111ccb0fb9559e8587a
+r9 = d50ce8bc517617a43f797da491f0543845103912 (refs/remotes/mirror/b)
+branch_from: /branches => /branches/a
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/a, 8
+Found branch parent: (refs/remotes/mirror/a) 5080c8560ddb307107027ee382dde9f7678f4c17
 Following parent with do_switch
 Successfully followed parent
-r9 = 08a5fb9923f87a615cd30036774c0244fdad5a75 (refs/remotes/mirror/tags/tag3)
+r9 = b050dbd8ebcda5a2feb9f8c467e665fbe437f9eb (refs/remotes/mirror/a)
 branch_from: /tags => /tags/tag2
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag2, 8
-Found branch parent: (refs/remotes/mirror/tags/tag2) 595288d413d501bb718e23495f4cb581b6c27685
+Found branch parent: (refs/remotes/mirror/tags/tag2) 3c72dd04efe31e4cb6a0df1093badf38901dcb4d
 Following parent with do_switch
 Successfully followed parent
-r9 = 3d66b6c08ba419b50dcf17101dd04c84b910efe7 (refs/remotes/mirror/tags/tag2)
-branch_from: /tags => /tags/tag4
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag4, 8
-Found branch parent: (refs/remotes/mirror/tags/tag4) 4214017090e3ea303a9b901bbaddfd9bd58e3827
+r9 = 9c67170fd2aa68c65eb1e724bcb26bd4ee50abcf (refs/remotes/mirror/tags/tag2)
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk, 8
+Found branch parent: (refs/remotes/mirror/trunk) dccc28bef80fde72701f261077462cfef0d4f78f
 Following parent with do_switch
 Successfully followed parent
-r9 = 3fc4ad89c5d216d138f2e1aea5e92d634ea283d7 (refs/remotes/mirror/tags/tag4)
-branch_from: /branches => /branches/a
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/a, 8
-Found branch parent: (refs/remotes/mirror/a) b0a2e207c6e63ed161c2ba235879cc80c9421401
+r9 = c73199d9c532263a227f37447703e0b3fa02d774 (refs/remotes/mirror/trunk)
+branch_from: /tags => /tags/tag3
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
+Found branch parent: (refs/remotes/mirror/tags/tag3) 9c6101e9e2db82054eb2db85fdacfdbfe62139f6
 Following parent with do_switch
 Successfully followed parent
-r9 = 68ba2f6551c7ba8ac36dfb684cbbb870aed4bb98 (refs/remotes/mirror/a)
-Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk, 8
-Found branch parent: (refs/remotes/mirror/trunk) cae050bbb53f5037af63ce9ec5515ce54a6f6680
+r9 = f8836fa6c9cd696d21d1c5b08c8886308bb10420 (refs/remotes/mirror/tags/tag3)
+branch_from: /tags => /tags/tag1
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
+Found branch parent: (refs/remotes/mirror/tags/tag1) 775a09d23dca0d89ad363b569351fa237417cd37
+Following parent with do_switch
+Successfully followed parent
+r9 = af30c8c281d45994b08e4cbd5ec5bd59880c9516 (refs/remotes/mirror/tags/tag1)
+branch_from: /tags => /tags/tag4
+Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4 => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag4, 8
+Found branch parent: (refs/remotes/mirror/tags/tag4) 61ec3145bd57472ce02f405bd853113ca9247582
 Following parent with do_switch
 Successfully followed parent
-r9 = fe319c1c2f8621ff68ccbfff4a4c1086618de99d (refs/remotes/mirror/trunk)
-Previous HEAD position was cae050b updated trunk
-HEAD is now at fe319c1 made mirror
+r9 = 4384351de858a7a0a976fbe769869c5d66aace36 (refs/remotes/mirror/tags/tag4)
+Previous HEAD position was dccc28b updated trunk
+HEAD is now at c73199d made mirror
 Copying file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk at r9 to file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d...
 Found possible branch point: file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk => file:///build/reproducible-path/git-2.47.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d, 9
-Found branch parent: (refs/remotes/mirror/d) fe319c1c2f8621ff68ccbfff4a4c1086618de99d
+Found branch parent: (refs/remotes/mirror/d) c73199d9c532263a227f37447703e0b3fa02d774
 Following parent with do_switch
 Successfully followed parent
-r10 = bf824e802c145e48eba45ac2de4b82885c1dc54c (refs/remotes/mirror/d)
+r10 = 5bacba4d6dcc8c396cfcfea6216fd8eb0d8be106 (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>...]'
@@ -558907,9 +558896,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.47.2/g' \
-    git-cvsimport.perl >git-cvsimport+ && \
-chmod +x git-cvsimport+ && \
-mv git-cvsimport+ git-cvsimport
+    git-send-email.perl >git-send-email+ && \
+chmod +x git-send-email+ && \
+mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 \
@@ -558931,9 +558920,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.47.2/g' \
-    git-send-email.perl >git-send-email+ && \
-chmod +x git-send-email+ && \
-mv git-send-email+ git-send-email
+    git-cvsimport.perl >git-cvsimport+ && \
+chmod +x git-cvsimport+ && \
+mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 \
@@ -559101,10 +559090,10 @@
 make[3]: git: No such file or directory
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 /usr/bin/make -C ../  GIT-VERSION-FILE
-/usr/bin/make -C git-gui  gitexecdir='/usr/lib/git-core' all
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 /usr/bin/perl ./build-docdep.perl >doc.dep 
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+/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.47.2/templates'
@@ -559128,6 +559117,11 @@
 (cd blt && tar cf - .) | \
 (cd '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-core/templates' && umask 022 && tar xof -)
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/templates'
+make[4]: 'GIT-VERSION-FILE' is up to date.
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: git: No such file or directory
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+/usr/bin/make -C ../  GIT-VERSION-FILE
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
 install -d -m 755 '/build/reproducible-path/git-2.47.2/debian/tmp/usr/lib/git-core/mergetools'
 install -m 644 mergetools/* '/build/reproducible-path/git-2.47.2/debian/tmp/usr/lib/git-core/mergetools'
@@ -559148,9 +559142,8 @@
 /usr/bin/make -C git-gui gitexecdir='/usr/lib/git-core' install
 make[4]: 'GIT-VERSION-FILE' is up to date.
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: git: No such file or directory
+    * new asciidoc flags
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-/usr/bin/make -C ../  GIT-VERSION-FILE
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/git-gui'
 install -d -m 755 '/build/reproducible-path/git-2.47.2/debian/tmp/usr/lib/git-core' 
 install -m 755 git-gui  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/lib/git-core'
@@ -559162,99 +559155,43 @@
 install -d -m 755 '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' 
 install -m 644 po/bg.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/de.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/el.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/fr.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/hu.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/it.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/ja.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/nb.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/pt_br.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/pt_pt.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/ru.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/sv.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/vi.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/zh_cn.msg  '/build/reproducible-path/git-2.47.2/debian/tmp/usr/share/git-gui/lib/msgs' && true
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/git-gui'
-make[4]: 'GIT-VERSION-FILE' is up to date.
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    * new asciidoc flags
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
-bindir=$(cd '/build/reproducible-path/git-2.47.2/debian/tmp/usr/bin' && pwd) && \
-execdir=$(cd '/build/reproducible-path/git-2.47.2/debian/tmp/usr/lib/git-core' && pwd) && \
-destdir_from_execdir_SQ=$(echo 'lib/git-core' | sed -e 's|[^/][^/]*|..|g') && \
-{ test "$bindir/" = "$execdir/" || \
-  for p in git scalar git-shell git-cvsserver; do \
-	rm -f "$execdir/$p" && \
-	test -n "" && \
-	ln -s "$destdir_from_execdir_SQ/bin/$p" "$execdir/$p" || \
-	{ test -z "11" && \
-	  ln "$bindir/$p" "$execdir/$p" 2>/dev/null || \
-	  cp "$bindir/$p" "$execdir/$p" || exit; } \
-  done; \
-} && \
-for p in git-receive-pack git-upload-archive git-upload-pack; do \
-	rm -f "$bindir/$p" && \
-	test -n "" && \
-	ln -s "git" "$bindir/$p" || \
-	{ test -z "1" && \
-	  ln "$bindir/git" "$bindir/$p" 2>/dev/null || \
-	  ln -s "git" "$bindir/$p" 2>/dev/null || \
-	  cp "$bindir/git" "$bindir/$p" || exit; }; \
-done && \
-for p in git-add git-am git-annotate git-apply git-archive git-bisect git-blame git-branch git-bugreport git-bundle git-cat-file git-check-attr git-check-ignore git-check-mailmap git-check-ref-format git-checkout--worker git-checkout-index git-checkout git-clean git-clone git-column git-commit-graph git-commit-tree git-commit git-config git-count-objects git-credential-cache--daemon git-credential-cache git-credential-store git-credential git-describe git-diagnose git-diff-files git-diff-index git-diff-tree git-diff git-difftool git-fast-export git-fast-import git-fetch-pack git-fetch git-fmt-merge-msg git-for-each-ref git-for-each-repo git-fsck git-fsmonitor--daemon git-gc git-get-tar-commit-id git-grep git-hash-object git-help git-hook git-index-pack git-init-db git-interpret-trailers git-log git-ls-files git-ls-remote git-ls-tree git-mailinfo git-mailsplit git-merge-base git-merge-file git-merge-index git-merge-ours git-merge-recursive git-merge-tree git-merge git-mktag git-mktree git-multi-pack-index git-mv git-name-rev git-notes git-pack-objects git-pack-redundant git-pack-refs git-patch-id git-prune-packed git-prune git-pull git-push git-range-diff git-read-tree git-rebase git-receive-pack git-reflog git-refs git-remote-ext git-remote-fd git-remote git-repack git-replace git-replay git-rerere git-reset git-rev-list git-rev-parse git-revert git-rm git-send-pack git-shortlog git-show-branch git-show-index git-show-ref git-sparse-checkout git-stash git-stripspace git-submodule--helper git-symbolic-ref git-tag git-unpack-file git-unpack-objects git-update-index git-update-ref git-update-server-info git-upload-archive git-upload-pack git-var git-verify-commit git-verify-pack git-verify-tag git-worktree git-write-tree git-cherry git-cherry-pick git-format-patch git-fsck-objects git-init git-maintenance git-merge-subtree git-restore git-show git-stage git-status git-switch git-version git-whatchanged; do \
-	rm -f "$execdir/$p" && \
-	if test -z ""; \
-	then \
-		test -n "" && \
-		ln -s "$destdir_from_execdir_SQ/bin/git" "$execdir/$p" || \
-		{ test -z "1" && \
-		  ln "$execdir/git" "$execdir/$p" 2>/dev/null || \
-		  ln -s "git" "$execdir/$p" 2>/dev/null || \
-		  cp "$execdir/git" "$execdir/$p" || exit; }; \
-	fi \
-done && \
-remote_curl_aliases="git-remote-https git-remote-ftp git-remote-ftps" && \
-for p in $remote_curl_aliases; do \
-	rm -f "$execdir/$p" && \
-	test -n "" && \
-	ln -s "git-remote-http" "$execdir/$p" || \
-	{ test -z "1" && \
-	  ln "$execdir/git-remote-http" "$execdir/$p" 2>/dev/null || \
-	  ln -s "git-remote-http" "$execdir/$p" 2>/dev/null || \
-	  cp "$execdir/git-remote-http" "$execdir/$p" || exit; } \
-done
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-archimport.xml git-archimport.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bugreport.xml git-bugreport.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-add.xml git-add.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-archive.xml git-archive.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-am.xml git-am.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-annotate.xml git-annotate.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-apply.xml git-apply.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-archimport.xml git-archimport.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bisect.xml git-bisect.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-apply.xml git-apply.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bundle.xml git-bundle.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-archive.xml git-archive.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-am.xml git-am.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bisect.xml git-bisect.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-add.xml git-add.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-branch.xml git-branch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-blame.xml git-blame.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-branch.xml git-branch.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bugreport.xml git-bugreport.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-bundle.xml git-bundle.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-attr.xml git-check-attr.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-citool.xml git-citool.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -559264,73 +559201,122 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cherry.xml git-cherry.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-clean.xml git-clean.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-checkout.xml git-checkout.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-checkout.xml git-checkout.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-clone.xml git-clone.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-clean.xml git-clean.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-column.xml git-column.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-citool.xml git-citool.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2'
+bindir=$(cd '/build/reproducible-path/git-2.47.2/debian/tmp/usr/bin' && pwd) && \
+execdir=$(cd '/build/reproducible-path/git-2.47.2/debian/tmp/usr/lib/git-core' && pwd) && \
+destdir_from_execdir_SQ=$(echo 'lib/git-core' | sed -e 's|[^/][^/]*|..|g') && \
+{ test "$bindir/" = "$execdir/" || \
+  for p in git scalar git-shell git-cvsserver; do \
+	rm -f "$execdir/$p" && \
+	test -n "" && \
+	ln -s "$destdir_from_execdir_SQ/bin/$p" "$execdir/$p" || \
+	{ test -z "11" && \
+	  ln "$bindir/$p" "$execdir/$p" 2>/dev/null || \
+	  cp "$bindir/$p" "$execdir/$p" || exit; } \
+  done; \
+} && \
+for p in git-receive-pack git-upload-archive git-upload-pack; do \
+	rm -f "$bindir/$p" && \
+	test -n "" && \
+	ln -s "git" "$bindir/$p" || \
+	{ test -z "1" && \
+	  ln "$bindir/git" "$bindir/$p" 2>/dev/null || \
+	  ln -s "git" "$bindir/$p" 2>/dev/null || \
+	  cp "$bindir/git" "$bindir/$p" || exit; }; \
+done && \
+for p in git-add git-am git-annotate git-apply git-archive git-bisect git-blame git-branch git-bugreport git-bundle git-cat-file git-check-attr git-check-ignore git-check-mailmap git-check-ref-format git-checkout--worker git-checkout-index git-checkout git-clean git-clone git-column git-commit-graph git-commit-tree git-commit git-config git-count-objects git-credential-cache--daemon git-credential-cache git-credential-store git-credential git-describe git-diagnose git-diff-files git-diff-index git-diff-tree git-diff git-difftool git-fast-export git-fast-import git-fetch-pack git-fetch git-fmt-merge-msg git-for-each-ref git-for-each-repo git-fsck git-fsmonitor--daemon git-gc git-get-tar-commit-id git-grep git-hash-object git-help git-hook git-index-pack git-init-db git-interpret-trailers git-log git-ls-files git-ls-remote git-ls-tree git-mailinfo git-mailsplit git-merge-base git-merge-file git-merge-index git-merge-ours git-merge-recursive git-merge-tree git-merge git-mktag git-mktree git-multi-pack-index git-mv git-name-rev git-notes git-pack-objects git-pack-redundant git-pack-refs git-patch-id git-prune-packed git-prune git-pull git-push git-range-diff git-read-tree git-rebase git-receive-pack git-reflog git-refs git-remote-ext git-remote-fd git-remote git-repack git-replace git-replay git-rerere git-reset git-rev-list git-rev-parse git-revert git-rm git-send-pack git-shortlog git-show-branch git-show-index git-show-ref git-sparse-checkout git-stash git-stripspace git-submodule--helper git-symbolic-ref git-tag git-unpack-file git-unpack-objects git-update-index git-update-ref git-update-server-info git-upload-archive git-upload-pack git-var git-verify-commit git-verify-pack git-verify-tag git-worktree git-write-tree git-cherry git-cherry-pick git-format-patch git-fsck-objects git-init git-maintenance git-merge-subtree git-restore git-show git-stage git-status git-switch git-version git-whatchanged; do \
+	rm -f "$execdir/$p" && \
+	if test -z ""; \
+	then \
+		test -n "" && \
+		ln -s "$destdir_from_execdir_SQ/bin/git" "$execdir/$p" || \
+		{ test -z "1" && \
+		  ln "$execdir/git" "$execdir/$p" 2>/dev/null || \
+		  ln -s "git" "$execdir/$p" 2>/dev/null || \
+		  cp "$execdir/git" "$execdir/$p" || exit; }; \
+	fi \
+done && \
+remote_curl_aliases="git-remote-https git-remote-ftp git-remote-ftps" && \
+for p in $remote_curl_aliases; do \
+	rm -f "$execdir/$p" && \
+	test -n "" && \
+	ln -s "git-remote-http" "$execdir/$p" || \
+	{ test -z "1" && \
+	  ln "$execdir/git-remote-http" "$execdir/$p" 2>/dev/null || \
+	  ln -s "git-remote-http" "$execdir/$p" 2>/dev/null || \
+	  cp "$execdir/git-remote-http" "$execdir/$p" || exit; } \
+done
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-count-objects.xml git-count-objects.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-store.xml git-credential-store.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-column.xml git-column.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-count-objects.xml git-count-objects.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential.xml git-credential.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential.xml git-credential.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-credential-store.xml git-credential-store.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-clone.xml git-clone.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-commit.xml git-commit.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diagnose.xml git-diagnose.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-describe.xml git-describe.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-daemon.xml git-daemon.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-difftool.xml git-difftool.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-difftool.xml git-difftool.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff-files.xml git-diff-files.txt
@@ -559339,16 +559325,13 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff.xml git-diff.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-config.xml git-config.txt
@@ -559357,16 +559340,16 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.txt
@@ -559375,43 +559358,49 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fsck.xml git-fsck.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fetch.xml git-fetch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-gc.xml git-gc.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-gui.xml git-gui.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-grep.xml git-grep.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-gui.xml git-gui.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-gc.xml git-gc.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-hook.xml git-hook.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-help.xml git-help.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-http-push.xml git-http-push.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-help.xml git-help.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-http-push.xml git-http-push.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-imap-send.xml git-imap-send.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-imap-send.xml git-imap-send.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-grep.xml git-grep.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
@@ -559420,9 +559409,6 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-init-db.xml git-init-db.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-init.xml git-init.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-instaweb.xml git-instaweb.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -559438,10 +559424,10 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-ls-files.xml git-ls-files.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-init.xml git-init.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.txt
@@ -559453,10 +559439,10 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-log.xml git-log.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-file.xml git-merge-file.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-index.xml git-merge-index.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-file.xml git-merge-file.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.txt
@@ -559465,6 +559451,9 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-index.xml git-merge-index.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -559477,25 +559466,16 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mktree.xml git-mktree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mv.xml git-mv.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-merge.xml git-merge.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-name-rev.xml git-name-rev.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-notes.xml git-notes.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-p4.xml git-p4.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-mv.xml git-mv.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-name-rev.xml git-name-rev.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.txt
@@ -559513,10 +559493,16 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-prune.xml git-prune.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-p4.xml git-p4.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-range-diff.xml git-range-diff.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-notes.xml git-notes.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-push.xml git-push.txt
@@ -559525,19 +559511,22 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-pull.xml git-pull.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-range-diff.xml git-range-diff.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-refs.xml git-refs.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-refs.xml git-refs.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-reflog.xml git-reflog.txt
@@ -559546,73 +559535,73 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-remote.xml git-remote.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rebase.xml git-rebase.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-repack.xml git-repack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-replace.xml git-replace.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rebase.xml git-rebase.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-replay.xml git-replay.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-request-pull.xml git-request-pull.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-replay.xml git-replay.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rerere.xml git-rerere.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-restore.xml git-restore.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-reset.xml git-reset.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rm.xml git-rm.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-revert.xml git-revert.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-send-pack.xml git-send-pack.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rm.xml git-rm.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-reset.xml git-reset.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rev-list.xml git-rev-list.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-restore.xml git-restore.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-send-email.xml git-send-email.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-revert.xml git-revert.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-send-email.xml git-send-email.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-send-pack.xml git-send-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-rev-list.xml git-rev-list.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-shell.xml git-shell.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-stage.xml git-stage.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show-index.xml git-show-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show-index.xml git-show-index.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show-branch.xml git-show-branch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-stripspace.xml git-stripspace.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show-ref.xml git-show-ref.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show-branch.xml git-show-branch.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show-ref.xml git-show-ref.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-stage.xml git-stage.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.txt
@@ -559624,16 +559613,13 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-stash.xml git-stash.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-show.xml git-show.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-submodule.xml git-submodule.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-stripspace.xml git-stripspace.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-svn.xml git-svn.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-submodule.xml git-submodule.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.txt
@@ -559648,34 +559634,34 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-tag.xml git-tag.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-svn.xml git-svn.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-index.xml git-update-index.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-index.xml git-update-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-var.xml git-var.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-version.xml git-version.txt
@@ -559684,6 +559670,9 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-web--browse.xml git-web--browse.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -559699,19 +559688,16 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o scalar.xml scalar.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitweb.xml gitweb.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o git.xml git.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitattributes.xml gitattributes.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitweb.xml gitweb.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-commit-graph.xml gitformat-commit-graph.txt
@@ -559720,6 +559706,9 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-index.xml gitformat-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitattributes.xml gitattributes.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -559744,22 +559733,22 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitcli.xml gitcli.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitcli.xml gitcli.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.txt
@@ -559777,19 +559766,13 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o giteveryday.xml giteveryday.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitfaq.xml gitfaq.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitpacking.xml gitpacking.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitfaq.xml gitfaq.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitglossary.xml gitglossary.txt
@@ -559798,25 +559781,34 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitrevisions.xml gitrevisions.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gittutorial.xml gittutorial.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.47.2' -arevdate='' -b docbook -d manpage -o gitworkflows.xml gitworkflows.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-archimport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-bisect.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-annotate.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -559825,46 +559817,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-archive.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bugreport.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-blame.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-branch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-blame.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bundle.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-bugreport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-check-ignore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ref-format.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry-pick.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-check-ref-format.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-checkout.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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
+xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -559876,25 +559865,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-clone.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-column.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-graph.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-column.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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--daemon.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-credential-cache.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-commit.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -559909,10 +559901,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-cvsimport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-diagnose.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -559921,34 +559910,34 @@
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-cvsserver.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-files.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-files.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-difftool.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-fast-export.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-fast-import.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -559957,7 +559946,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-fsck-objects.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-fetch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -559966,43 +559955,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-for-each-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-grep.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-gc.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-gc.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-hook.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-grep.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-backend.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-hash-object.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-gui.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-init-db.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-instaweb.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-push.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -560011,34 +560006,31 @@
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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
+xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-merge-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailinfo.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-log.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailinfo.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-ls-remote.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailsplit.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -560047,10 +560039,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-merge-base.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -560059,52 +560048,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-mergetool--lib.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-multi-pack-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-multi-pack-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-name-rev.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mv.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-p4.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-name-rev.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-patch-id.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-redundant.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-prune.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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
@@ -560113,72 +560102,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 git-range-diff.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-push.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-read-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-repack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reflog.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-ext.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-refs.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-repack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-request-pull.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-replay.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-rev-list.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-rm.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-revert.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-i18n.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-send-email.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rm.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-i18n--envsubst.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+xmlto -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.47.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -560188,184 +560186,175 @@
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-shortlog.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-stage.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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
+xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-stage.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-stash.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-symbolic-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-status.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-stripspace.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-svn.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-status.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-switch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-symbolic-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-unpack-objects.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-unpack-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-update-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-update-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-commit.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-server-info.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-server-info.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-archive.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-var.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-archive.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-commit.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-web--browse.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-version.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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-whatchanged.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-worktree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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-write-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-bundle.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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 gitk.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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 gitweb.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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-bundle.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-chunk.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitattributes.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -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 gitformat-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitignore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 githooks.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmodules.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmailmap.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitmodules.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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-common.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-http.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitrepository-layout.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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.47.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitweb.conf.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcvs-migration.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcli.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitcvs-migration.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitdiffcore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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
@@ -560374,13 +560363,13 @@
 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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitpacking.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitworkflows.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitsubmodules.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 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
@@ -560389,16 +560378,16 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial-2.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitworkflows.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitrevisions.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitremote-helpers.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-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 gitremote-helpers.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 install -d -m 755 /build/reproducible-path/git-2.47.2/debian/tmp/usr/share/man/man1
@@ -560454,31 +560443,31 @@
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-archimport.html
+    ASCIIDOC git-add.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-bugreport.html
+    ASCIIDOC git-am.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-archive.html
+    ASCIIDOC git-archimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-am.html
+    ASCIIDOC git-apply.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-annotate.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-bisect.html
+    ASCIIDOC git-archive.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-bundle.html
+    ASCIIDOC git-bisect.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-add.html
+    ASCIIDOC git-bugreport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-apply.html
+    ASCIIDOC git-bundle.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-cat-file.html
@@ -560490,34 +560479,34 @@
     ASCIIDOC git-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-citool.html
+    ASCIIDOC git-check-ignore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-check-ignore.html
+    ASCIIDOC git-check-attr.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-checkout-index.html
+    ASCIIDOC git-check-ref-format.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-check-mailmap.html
+    ASCIIDOC git-cherry.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-check-attr.html
+    ASCIIDOC git-check-mailmap.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-check-ref-format.html
+    ASCIIDOC git-checkout-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-cherry-pick.html
+    ASCIIDOC git-citool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-cherry.html
+    ASCIIDOC git-column.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-clean.html
+    ASCIIDOC git-cherry-pick.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-column.html
+    ASCIIDOC git-clean.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-checkout.html
@@ -560526,55 +560515,55 @@
     ASCIIDOC git-clone.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-credential-cache--daemon.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-count-objects.html
+    ASCIIDOC git-commit-graph.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-credential-cache.html
+    ASCIIDOC git-commit-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-commit-graph.html
+    ASCIIDOC git-count-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-credential-store.html
+    ASCIIDOC git-credential-cache--daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-commit-tree.html
+    ASCIIDOC git-credential-cache.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-cvsexportcommit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-cvsimport.html
+    ASCIIDOC git-credential-store.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-credential.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+    ASCIIDOC git-cvsimport.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-cvsserver.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-commit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-diagnose.html
+    ASCIIDOC git-describe.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-describe.html
+    ASCIIDOC git-daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-fetch-pack.html
+    ASCIIDOC git-diagnose.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-daemon.html
+    ASCIIDOC git-difftool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-fast-export.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-difftool.html
+    ASCIIDOC git-fetch-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-diff-files.html
@@ -560595,52 +560584,52 @@
     ASCIIDOC git-config.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-fsck-objects.html
+    ASCIIDOC git-filter-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-for-each-repo.html
+    ASCIIDOC git-fetch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-fmt-merge-msg.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-filter-branch.html
+    ASCIIDOC git-for-each-repo.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-fsmonitor--daemon.html
+    ASCIIDOC git-for-each-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-for-each-ref.html
+    ASCIIDOC git-format-patch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-get-tar-commit-id.html
+    ASCIIDOC git-fsck-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-gc.html
+    ASCIIDOC git-fsmonitor--daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-fsck.html
+    ASCIIDOC git-get-tar-commit-id.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-format-patch.html
+    ASCIIDOC git-gc.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-fetch.html
+    ASCIIDOC git-fsck.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-gui.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-hook.html
+    ASCIIDOC git-grep.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-hash-object.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-http-fetch.html
+    ASCIIDOC git-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-init-db.html
+    ASCIIDOC git-http-fetch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-http-push.html
@@ -560658,40 +560647,40 @@
     ASCIIDOC git-index-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-grep.html
+    ASCIIDOC git-init-db.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-init.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-ls-remote.html
+    ASCIIDOC git-instaweb.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-ls-tree.html
+    ASCIIDOC git-interpret-trailers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-mailsplit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-instaweb.html
+    ASCIIDOC git-ls-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-merge-file.html
+    ASCIIDOC git-merge-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-merge-index.html
+    ASCIIDOC git-ls-files.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-mailinfo.html
+    ASCIIDOC git-ls-remote.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-merge-base.html
+    ASCIIDOC git-mailinfo.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-interpret-trailers.html
+    ASCIIDOC git-merge-base.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-ls-files.html
+    ASCIIDOC git-merge-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-maintenance.html
@@ -560703,12 +560692,18 @@
     ASCIIDOC git-merge-one-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-mktag.html
+    ASCIIDOC git-merge-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-mergetool--lib.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+    ASCIIDOC git-mktag.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+    ASCIIDOC git-mergetool.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-mktree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -560718,31 +560713,28 @@
     ASCIIDOC git-mv.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-merge-tree.html
+    ASCIIDOC git-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-name-rev.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-mergetool.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-notes.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-merge.html
+    ASCIIDOC git-p4.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-p4.html
+    ASCIIDOC git-pack-redundant.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-pack-refs.html
+    ASCIIDOC git-pack-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-prune-packed.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-pack-redundant.html
+    ASCIIDOC git-pack-refs.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-patch-id.html
@@ -560754,127 +560746,127 @@
     ASCIIDOC git-quiltimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-pack-objects.html
+    ASCIIDOC git-push.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-range-diff.html
+    ASCIIDOC git-pull.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-read-tree.html
+    ASCIIDOC git-range-diff.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-push.html
+    ASCIIDOC git-read-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-pull.html
+    ASCIIDOC git-rebase.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-reflog.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-rebase.html
+    ASCIIDOC git-receive-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-remote-fd.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-refs.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-replace.html
+    ASCIIDOC git-remote-ext.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-request-pull.html
+    ASCIIDOC git-refs.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-receive-pack.html
+    ASCIIDOC git-remote.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-remote-ext.html
+    ASCIIDOC git-replace.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-rerere.html
+    ASCIIDOC git-repack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-remote.html
+    ASCIIDOC git-replay.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-repack.html
+    ASCIIDOC git-request-pull.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-replay.html
+    ASCIIDOC git-rerere.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-sh-i18n--envsubst.html
+    ASCIIDOC git-reset.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-sh-i18n.html
+    ASCIIDOC git-restore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-shell.html
+    ASCIIDOC git-rev-list.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-sh-setup.html
+    ASCIIDOC git-rm.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-send-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-restore.html
+    ASCIIDOC git-rev-parse.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-revert.html
+    ASCIIDOC git-sh-i18n--envsubst.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-rm.html
+    ASCIIDOC git-sh-i18n.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-reset.html
+    ASCIIDOC git-revert.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-send-email.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-rev-parse.html
+    ASCIIDOC git-sh-setup.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-rev-list.html
+    ASCIIDOC git-shell.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-show-index.html
+    ASCIIDOC git-shortlog.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-stage.html
+    ASCIIDOC git-show-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-stripspace.html
+    ASCIIDOC git-show-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-show-branch.html
+    ASCIIDOC git-stage.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-show-ref.html
+    ASCIIDOC git-show-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-sparse-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-stash.html
+    ASCIIDOC git-stripspace.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-status.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+    ASCIIDOC git-stash.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-submodule.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-shortlog.html
+    ASCIIDOC git-show.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-svn.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-show.html
+    ASCIIDOC git-switch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-symbolic-ref.html
@@ -560886,31 +560878,28 @@
     ASCIIDOC git-unpack-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-update-server-info.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-upload-archive.html
+    ASCIIDOC git-update-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-upload-pack.html
+    ASCIIDOC git-tag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-var.html
+    ASCIIDOC git-update-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-verify-commit.html
+    ASCIIDOC git-update-server-info.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-switch.html
+    ASCIIDOC git-upload-archive.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-tag.html
+    ASCIIDOC git-upload-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-update-ref.html
+    ASCIIDOC git-var.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-update-index.html
+    ASCIIDOC git-verify-commit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-verify-pack.html
@@ -560922,16 +560911,19 @@
     ASCIIDOC git-version.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+    ASCIIDOC git-web--browse.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-whatchanged.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-web--browse.html
+    ASCIIDOC git-worktree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC git-write-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-worktree.html
+    ASCIIDOC gitweb.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC gitk.html
@@ -560940,40 +560932,34 @@
     ASCIIDOC scalar.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitweb.html
+    ASCIIDOC git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC gitattributes.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC gitformat-bundle.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitignore.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC gitformat-chunk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitformat-commit-graph.html
+    ASCIIDOC gitformat-signature.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitformat-signature.html
+    ASCIIDOC gitformat-commit-graph.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC gitmailmap.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitmodules.html
+    ASCIIDOC gitformat-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitformat-index.html
+    ASCIIDOC gitignore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitprotocol-capabilities.html
+    ASCIIDOC gitmodules.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC gitformat-pack.html
@@ -560982,37 +560968,37 @@
     ASCIIDOC githooks.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitprotocol-common.html
+    ASCIIDOC gitprotocol-capabilities.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitcli.html
+    ASCIIDOC gitprotocol-common.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitcvs-migration.html
+    ASCIIDOC gitprotocol-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitcredentials.html
+    ASCIIDOC gitprotocol-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitdiffcore.html
+    ASCIIDOC gitcvs-migration.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitfaq.html
+    ASCIIDOC gitcli.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitprotocol-http.html
+    ASCIIDOC gitprotocol-v2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC gitrepository-layout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC giteveryday.html
+    ASCIIDOC gitcredentials.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitprotocol-pack.html
+    ASCIIDOC gitdiffcore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitprotocol-v2.html
+    ASCIIDOC giteveryday.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC gitweb.conf.html
@@ -561021,42 +561007,45 @@
     ASCIIDOC gitcore-tutorial.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitnamespaces.html
+    ASCIIDOC gitfaq.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC howto/new-command.html
+    ASCIIDOC gitpacking.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC howto/revert-branch-rebase.html
+    ASCIIDOC gitglossary.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitpacking.html
+    ASCIIDOC gitnamespaces.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitremote-helpers.html
+    ASCIIDOC gitrevisions.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitrevisions.html
+    ASCIIDOC gitremote-helpers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC gitsubmodules.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gittutorial-2.html
+    ASCIIDOC howto/new-command.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitworkflows.html
+    ASCIIDOC gittutorial-2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gitglossary.html
+    ASCIIDOC gittutorial.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC gittutorial.html
+    ASCIIDOC gitworkflows.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC user-manual.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+    ASCIIDOC howto/revert-branch-rebase.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC howto/using-merge-subtree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
@@ -561066,16 +561055,16 @@
     ASCIIDOC howto/update-hook-example.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC howto/setup-git-server-over-http.html
+    ASCIIDOC howto/use-git-daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC howto/rebuild-from-update-hook.html
+    ASCIIDOC howto/setup-git-server-over-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC howto/use-git-daemon.html
+    ASCIIDOC howto/separating-topic-branches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC howto/separating-topic-branches.html
+    ASCIIDOC howto/rebuild-from-update-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC howto/revert-a-faulty-merge.html
@@ -561084,97 +561073,94 @@
     ASCIIDOC howto/recover-corrupted-blob-object.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC howto/rebase-from-internal-branch.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC howto/recover-corrupted-object-harder.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC howto/keep-canonical-history-correct.html
+    ASCIIDOC howto/rebase-from-internal-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC howto/coordinate-embargoed-releases.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/api-merge.html
+    ASCIIDOC howto/keep-canonical-history-correct.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC howto/maintain-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC DecisionMaking.html
+    ASCIIDOC technical/api-error-handling.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/api-error-handling.html
+    ASCIIDOC technical/api-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC technical/api-simple-ipc.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC ReviewingGuidelines.html
+    ASCIIDOC DecisionMaking.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC technical/api-parse-options.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/api-trace2.html
+    ASCIIDOC ReviewingGuidelines.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC MyFirstObjectWalk.html
+    ASCIIDOC technical/api-trace2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC MyFirstContribution.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC SubmittingPatches.html
+    ASCIIDOC MyFirstObjectWalk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/long-running-process-protocol.html
+    ASCIIDOC technical/bitmap-format.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC ToolsForGit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/bitmap-format.html
+    ASCIIDOC SubmittingPatches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/bundle-uri.html
+    ASCIIDOC technical/long-running-process-protocol.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC technical/multi-pack-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/parallel-checkout.html
+    ASCIIDOC technical/bundle-uri.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/platform-support.html
+    ASCIIDOC technical/pack-heuristics.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/racy-git.html
+    ASCIIDOC technical/parallel-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/pack-heuristics.html
+    ASCIIDOC technical/partial-clone.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/partial-clone.html
+    ASCIIDOC technical/platform-support.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC technical/hash-function-transition.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/reftable.html
+    ASCIIDOC technical/racy-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/scalar.html
+    ASCIIDOC technical/send-pack-pipeline.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC git-remote-helpers.html
+    ASCIIDOC technical/scalar.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/send-pack-pipeline.html
+    ASCIIDOC technical/reftable.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC everyday.html
+    ASCIIDOC git-remote-helpers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
     ASCIIDOC technical/api-index.html
@@ -561183,13 +561169,16 @@
     ASCIIDOC technical/shallow.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/trivial-merge.html
+    ASCIIDOC everyday.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    ASCIIDOC technical/unit-tests.html
+    XSLTPROC user-manual.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
-    XSLTPROC user-manual.html
+    ASCIIDOC technical/trivial-merge.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
+    ASCIIDOC technical/unit-tests.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.47.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.47.2/Documentation'
 '/bin/sh' ./install-webdoc.sh /build/reproducible-path/git-2.47.2/debian/tmp/html
@@ -561268,24 +561257,24 @@
    dh_perl
    dh_link
    dh_strip_nondeterminism
-	Normalized debian/git/usr/share/locale/id/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/is/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/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/pl/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/pt_PT/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/tr/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/uk/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/bg/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/ca/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/es/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/fr/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/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/ru/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/sv/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/it/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/ko/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/id/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/is/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/pl/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/pt_PT/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/zh_TW/LC_MESSAGES/git.mo
    debian/rules override_dh_compress
 make[1]: Entering directory '/build/reproducible-path/git-2.47.2'
@@ -561305,23 +561294,23 @@
 dpkg-gencontrol: warning: package git-email: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git-mediawiki: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git-cvs: substitution variable ${perl:Depends} unused, but is defined
-dpkg-gencontrol: warning: package git-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-svn: 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-gui' in '../git-gui_2.47.2-0.1_all.deb'.
-dpkg-deb: building package 'git-doc' in '../git-doc_2.47.2-0.1_all.deb'.
+dpkg-deb: building package 'git' in '../git_2.47.2-0.1_arm64.deb'.
 dpkg-deb: building package 'git-dbgsym' in '../git-dbgsym_2.47.2-0.1_arm64.deb'.
-dpkg-deb: building package 'git-cvs' in '../git-cvs_2.47.2-0.1_all.deb'.
 dpkg-deb: building package 'git-man' in '../git-man_2.47.2-0.1_all.deb'.
-dpkg-deb: building package 'git-email' in '../git-email_2.47.2-0.1_all.deb'.
+dpkg-deb: building package 'git-doc' in '../git-doc_2.47.2-0.1_all.deb'.
+dpkg-deb: building package 'git-gui' in '../git-gui_2.47.2-0.1_all.deb'.
 dpkg-deb: building package 'git-all' in '../git-all_2.47.2-0.1_all.deb'.
-dpkg-deb: building package 'gitk' in '../gitk_2.47.2-0.1_all.deb'.
 dpkg-deb: building package 'git-svn' in '../git-svn_2.47.2-0.1_all.deb'.
+dpkg-deb: building package 'git-email' in '../git-email_2.47.2-0.1_all.deb'.
 dpkg-deb: building package 'git-mediawiki' in '../git-mediawiki_2.47.2-0.1_all.deb'.
+dpkg-deb: building package 'git-cvs' in '../git-cvs_2.47.2-0.1_all.deb'.
+dpkg-deb: building package 'gitk' in '../gitk_2.47.2-0.1_all.deb'.
 dpkg-deb: building package 'gitweb' in '../gitweb_2.47.2-0.1_all.deb'.
-dpkg-deb: building package 'git' in '../git_2.47.2-0.1_arm64.deb'.
  dpkg-genbuildinfo --build=binary -O../git_2.47.2-0.1_arm64.buildinfo
  dpkg-genchanges --build=binary -O../git_2.47.2-0.1_arm64.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -561329,12 +561318,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/1572123/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/1572123/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/256515 and its subdirectories
-I: Current time: Tue Mar  3 20:25:12 -12 2026
-I: pbuilder-time-stamp: 1772612712
+I: removing directory /srv/workspace/pbuilder/1572123 and its subdirectories
+I: Current time: Thu Jan 30 16:31:19 +14 2025
+I: pbuilder-time-stamp: 1738204279